-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Client support for adding properties.
- Loading branch information
Showing
30 changed files
with
1,101 additions
and
75 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,185 @@ | ||
| /* | ||
| Copyright (c) 2018 Roger Light <[email protected]> | ||
| All rights reserved. This program and the accompanying materials | ||
| are made available under the terms of the Eclipse Public License v1.0 | ||
| and Eclipse Distribution License v1.0 which accompany this distribution. | ||
| The Eclipse Public License is available at | ||
| http:https://www.eclipse.org/legal/epl-v10.html | ||
| and the Eclipse Distribution License is available at | ||
| http:https://www.eclipse.org/org/documents/edl-v10.php. | ||
| Contributors: | ||
| Roger Light - initial implementation and documentation. | ||
| */ | ||
|
|
||
| #include "config.h" | ||
|
|
||
| #include <errno.h> | ||
| #include <fcntl.h> | ||
| #include <stdio.h> | ||
| #include <stdlib.h> | ||
| #include <string.h> | ||
| #ifndef WIN32 | ||
| #include <unistd.h> | ||
| #include <strings.h> | ||
| #else | ||
| #include <process.h> | ||
| #include <winsock2.h> | ||
| #define snprintf sprintf_s | ||
| #define strncasecmp _strnicmp | ||
| #endif | ||
|
|
||
| #include "mosquitto.h" | ||
| #include "mqtt_protocol.h" | ||
| #include "client_shared.h" | ||
|
|
||
| enum prop_type | ||
| { | ||
| PROP_TYPE_BYTE, | ||
| PROP_TYPE_INT16, | ||
| PROP_TYPE_INT32, | ||
| PROP_TYPE_BINARY, | ||
| PROP_TYPE_STRING, | ||
| PROP_TYPE_STRING_PAIR | ||
| }; | ||
|
|
||
| /* This parses property inputs. It should work for any command type, but is limited at the moment. | ||
| * | ||
| * Format: | ||
| * | ||
| * command property value | ||
| * command property key value | ||
| * | ||
| * Example: | ||
| * | ||
| * publish message-expiry-interval 32 | ||
| * connect user-property key value | ||
| */ | ||
|
|
||
| int cfg_parse_property(struct mosq_config *cfg, int argc, char *argv[], int *idx) | ||
| { | ||
| char *cmdname = NULL, *propname = NULL; | ||
| char *key = NULL, *value = NULL; | ||
| int cmd, identifier, type; | ||
| mosquitto_property **proplist; | ||
| int rc; | ||
|
|
||
| /* idx now points to "command" */ | ||
| if((*idx)+2 > argc-1){ | ||
| /* Not enough args */ | ||
| fprintf(stderr, "Error: --property argument given but not enough arguments specified.\n\n"); | ||
| return MOSQ_ERR_INVAL; | ||
| } | ||
|
|
||
| cmdname = argv[*idx]; | ||
| if(mosquitto_string_to_command(cmdname, &cmd)){ | ||
| fprintf(stderr, "Error: Invalid command given in --property argument.\n\n"); | ||
| return MOSQ_ERR_INVAL; | ||
| } | ||
|
|
||
| propname = argv[(*idx)+1]; | ||
| if(mosquitto_string_to_property_info(propname, &identifier, &type)){ | ||
| fprintf(stderr, "Error: Invalid property name given in --property argument.\n\n"); | ||
| return MOSQ_ERR_INVAL; | ||
| } | ||
|
|
||
| if(identifier == MQTT_PROP_USER_PROPERTY){ | ||
| if((*idx)+3 > argc-1){ | ||
| /* Not enough args */ | ||
| fprintf(stderr, "Error: --property argument given but not enough arguments specified.\n\n"); | ||
| return MOSQ_ERR_INVAL; | ||
| } | ||
|
|
||
| key = argv[(*idx)+2]; | ||
| value = argv[(*idx)+3]; | ||
| (*idx) += 3; | ||
| }else{ | ||
| value = argv[(*idx)+2]; | ||
| (*idx) += 2; | ||
| } | ||
|
|
||
|
|
||
| switch(cmd){ | ||
| case CMD_CONNECT: | ||
| proplist = &cfg->connect_props; | ||
| break; | ||
|
|
||
| case CMD_PUBLISH: | ||
| if(identifier == MQTT_PROP_SUBSCRIPTION_IDENTIFIER){ | ||
| fprintf(stderr, "Error: %s property not supported for %s in --property argument.\n\n", propname, cmdname); | ||
| return MOSQ_ERR_INVAL; | ||
| } | ||
| proplist = &cfg->publish_props; | ||
| break; | ||
|
|
||
| case CMD_SUBSCRIBE: | ||
| if(identifier != MQTT_PROP_USER_PROPERTY){ | ||
| fprintf(stderr, "Error: %s property not supported for %s in --property argument.\n\n", propname, cmdname); | ||
| return MOSQ_ERR_NOT_SUPPORTED; | ||
| } | ||
| proplist = &cfg->subscribe_props; | ||
| break; | ||
|
|
||
| case CMD_UNSUBSCRIBE: | ||
| proplist = &cfg->subscribe_props; | ||
| break; | ||
|
|
||
| case CMD_DISCONNECT: | ||
| proplist = &cfg->disconnect_props; | ||
| break; | ||
|
|
||
| case CMD_AUTH: | ||
| fprintf(stderr, "Error: %s property not supported for %s in --property argument.\n\n", propname, cmdname); | ||
| return MOSQ_ERR_NOT_SUPPORTED; | ||
|
|
||
| case CMD_WILL: | ||
| proplist = &cfg->will_props; | ||
| break; | ||
|
|
||
| case CMD_PUBACK: | ||
| case CMD_PUBREC: | ||
| case CMD_PUBREL: | ||
| case CMD_PUBCOMP: | ||
| case CMD_SUBACK: | ||
| case CMD_UNSUBACK: | ||
| fprintf(stderr, "Error: %s property not supported for %s in --property argument.\n\n", propname, cmdname); | ||
| return MOSQ_ERR_NOT_SUPPORTED; | ||
|
|
||
| default: | ||
| return MOSQ_ERR_INVAL; | ||
| } | ||
|
|
||
| switch(type){ | ||
| case MQTT_PROP_TYPE_BYTE: | ||
| rc = mosquitto_property_add_byte(proplist, identifier, atoi(value)); | ||
| break; | ||
| case MQTT_PROP_TYPE_INT16: | ||
| rc = mosquitto_property_add_int16(proplist, identifier, atoi(value)); | ||
| break; | ||
| case MQTT_PROP_TYPE_INT32: | ||
| rc = mosquitto_property_add_int32(proplist, identifier, atoi(value)); | ||
| break; | ||
| case MQTT_PROP_TYPE_VARINT: | ||
| rc = mosquitto_property_add_varint(proplist, identifier, atoi(value)); | ||
| break; | ||
| case MQTT_PROP_TYPE_BINARY: | ||
| rc = mosquitto_property_add_binary(proplist, identifier, value, strlen(value)); | ||
| break; | ||
| case MQTT_PROP_TYPE_STRING: | ||
| rc = mosquitto_property_add_string(proplist, identifier, value); | ||
| break; | ||
| case MQTT_PROP_TYPE_STRING_PAIR: | ||
| rc = mosquitto_property_add_string_pair(proplist, identifier, key, value); | ||
| break; | ||
| default: | ||
| return MOSQ_ERR_INVAL; | ||
| } | ||
| if(rc){ | ||
| fprintf(stderr, "Error adding property %s %d\n", propname, type); | ||
| return rc; | ||
| } | ||
| return MOSQ_ERR_SUCCESS; | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.