--- mqtt/src/Attic/mqtt.c 2011/12/13 08:43:51 1.1.1.1.2.22 +++ mqtt/src/Attic/mqtt.c 2011/12/13 10:12:36 1.1.1.1.2.25 @@ -20,14 +20,18 @@ Usage(void) printf( " -= MQTT Client =- Publisher/Subscriber from ELWIX\n" "=== %s@%s === Compiled: %s ===\n\n" " Syntax: mqtt [options] [value_for_publish]\n\n" - "\t-p \t\tPublish topic\n" + "\t-t \t\tPublish topic\n" "\t-s \tSubscribe for this topic, if wish add different |QoS to topic\n" "\t-q \t\tQoS level (0-at most 1, 1-at least 1, 2-exactly 1)\n" "\t-d\t\t\tSend duplicate message\n" "\t-r\t\t\tRetain message from broker\n" "\t-c \t\tService config\n" "\t-f\t\t\t'value_for_publish' is file instead text\n" - "\t-P \t\tDifferent port for connect (default: 1883)\n" + "\t-p \t\tDifferent port for connect (default: 1883)\n" + "\t-U \t\tUsername\n" + "\t-P \t\tPassword\n" + "\t-W \t\tWill Topic\n" + "\t-M \t\tWill Message\n" "\t-D\t\t\tDaemon mode\n" "\t-v\t\t\tVerbose (more -vvv, more verbose)\n" "\t-h\t\t\tHelp! This screen\n\n", @@ -37,6 +41,11 @@ Usage(void) static void cleanArgs(struct tagArgs * __restrict args) { + mqtt_msgFree(&args->msg, 42); + AIT_FREE_VAL(&args->Will.Msg); + AIT_FREE_VAL(&args->Will.Topic); + AIT_FREE_VAL(&args->User); + AIT_FREE_VAL(&args->Pass); AIT_FREE_VAL(&args->Publish); AIT_FREE_VAL(&args->Value); io_freeVars(&args->Subscribes); @@ -54,20 +63,45 @@ main(int argc, char **argv) if (!(args = malloc(sizeof(struct tagArgs)))) { printf("Error:: in arguments #%d - %s\n", errno, strerror(errno)); return 1; - } else if (!(args->Subscribes = io_allocVars(1))) { + } else + memset(args, 0, sizeof(struct tagArgs)); + if (!(args->Subscribes = io_allocVars(1))) { printf("Error:: in subscribes array #%d - %s\n", io_GetErrno(), io_GetError()); free(args); return 1; } else args->free = cleanArgs; + if (!(args->msg = mqtt_msgAlloc(USHRT_MAX))) { + printf("Error:: in mqtt buffer #%d - %s\n", mqtt_GetErrno(), mqtt_GetError()); + args->free(args); + free(args); + return 1; + } + strlcpy(szCfgName, DEFAULT_CONFIG, sizeof szCfgName); - while ((ch = getopt(argc, argv, "P:p:s:q:drc:fDvh")) != -1) + while ((ch = getopt(argc, argv, "U:P:p:t:s:q:drc:W:M:fDvh")) != -1) switch (ch) { + case 'M': + AIT_FREE_VAL(&args->Will.Msg); + AIT_SET_STR(&args->Will.Msg, optarg); + break; + case 'W': + AIT_FREE_VAL(&args->Will.Topic); + AIT_SET_STR(&args->Will.Topic, optarg); + break; + case 'U': + AIT_FREE_VAL(&args->User); + AIT_SET_STR(&args->User, optarg); + break; case 'P': - port = (u_short) strtol(optarg, NULL, 0); + AIT_FREE_VAL(&args->Pass); + AIT_SET_STR(&args->Pass, optarg); break; case 'p': + port = (u_short) strtol(optarg, NULL, 0); + break; + case 't': AIT_FREE_VAL(&args->Publish); AIT_SET_STR(&args->Publish, optarg); break; @@ -80,7 +114,7 @@ main(int argc, char **argv) return 1; } else AIT_SET_STR(v, optarg); - io_arrayElem(args->Subscribes, io_arraySize(args->Subscribes), (void**) &v); + io_arrayElem(args->Subscribes, io_arraySize(args->Subscribes), v); break; case 'q': args->QoS = (char) strtol(optarg, NULL, 0); @@ -144,9 +178,18 @@ main(int argc, char **argv) } if ((sock = InitClient()) == -1) { + UnloadConfig(&cfg); args->free(args); free(args); return 2; + } + + if (SendConnect(sock) == -1) { + close(sock); + UnloadConfig(&cfg); + args->free(args); + free(args); + return 3; } shutdown(sock, SHUT_RDWR);