--- mqtt/src/Attic/mqtt.c 2011/12/13 08:43:51 1.1.1.1.2.22 +++ mqtt/src/Attic/mqtt.c 2011/12/14 15:09:31 1.1.1.1.2.29 @@ -4,12 +4,14 @@ #include "client.h" +io_enableDEBUG; + sl_config cfg; sqlite3 *acc, *pub; FILE *logg; extern char compiled[], compiledby[], compilehost[]; static char szCfgName[MAXPATHLEN]; -int Verbose, Kill; +intptr_t Kill; struct tagArgs *args; @@ -19,15 +21,21 @@ 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" + " Syntax: mqtt [options] [value_for_publish]\n\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\t\tNot clear before connect!\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-T \t\tKeep alive timeout in seconds\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,8 +45,14 @@ 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); + AIT_FREE_VAL(&args->ConnID); io_freeVars(&args->Subscribes); } @@ -46,7 +60,7 @@ cleanArgs(struct tagArgs * __restrict args) int main(int argc, char **argv) { - char ch, batch = 1, szStr[STRSIZ] = { 0 }; + char ch, batch = 1; ait_val_t *v, val; u_short port = atoi(MQTT_PORT); int sock; @@ -54,25 +68,58 @@ 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; + } + + AIT_SET_STR(&args->ConnID, ""); + AIT_SET_STR(&args->User, ""); + AIT_SET_STR(&args->Pass, ""); + + args->ka = MQTT_KEEPALIVE; strlcpy(szCfgName, DEFAULT_CONFIG, sizeof szCfgName); - while ((ch = getopt(argc, argv, "P:p:s:q:drc:fDvh")) != -1) + while ((ch = getopt(argc, argv, "T:U:P:p:t:s:q:drc:W:M:fDvh")) != -1) switch (ch) { + case 'T': + args->ka = (u_short) strtol(optarg, NULL, 0); + break; + 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; case 's': - v = malloc(sizeof(ait_val_t)); + v = io_allocVar(); if (!v) { printf("Error:: not enough memory #%d - %s\n", errno, strerror(errno)); args->free(args); @@ -80,11 +127,11 @@ 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); - if (args->QoS < MQTT_QOS_ONCE || args->QoS > MQTT_QOS_EXACTLY) { + if (args->QoS > MQTT_QOS_EXACTLY) { printf("Error:: invalid QoS level %d\n", args->QoS); args->free(args); free(args); @@ -97,6 +144,9 @@ main(int argc, char **argv) case 'r': args->Retain++; break; + case 'C': + args->notClear++; + break; case 'f': args->isFile++; break; @@ -107,7 +157,7 @@ main(int argc, char **argv) batch = 0; break; case 'v': - Verbose++; + io_incDebug; break; case 'h': default: @@ -118,15 +168,18 @@ main(int argc, char **argv) } argc -= optind; argv += optind; - if (!argc) { - printf("Error:: host for connect not found!\n"); + if (argc < 2) { + printf("Error:: host for connect not found or connection id not supplied!\n"); args->free(args); free(args); Usage(); return 1; + } else { + AIT_FREE_VAL(&args->ConnID); + AIT_SET_STR(&args->ConnID, argv[1]); } - if (argc > 1) - AIT_SET_STR(&args->Value, argv[1]); + if (argc > 2) + AIT_SET_STR(&args->Value, argv[2]); if (!io_gethostbyname(*argv, port, &args->addr)) { printf("Error:: host not connect #%d - %s\n", io_GetErrno(), io_GetError()); args->free(args); @@ -134,7 +187,7 @@ main(int argc, char **argv) Usage(); return 1; } - VERB(1) printf("Connecting to %s:%d ...\n", io_n2addr(&args->addr, &val), io_n2port(&args->addr)); + ioVERBOSE(1) printf("Connecting to %s:%d ...\n", io_n2addr(&args->addr, &val), io_n2port(&args->addr)); if (LoadConfig(szCfgName, &cfg)) { printf("Error:: can't load #%d - %s\n", cfg_GetErrno(), cfg_GetError()); @@ -144,9 +197,39 @@ main(int argc, char **argv) } if ((sock = InitClient()) == -1) { + UnloadConfig(&cfg); args->free(args); free(args); return 2; + } + + printf("Connected ... "); + switch (try2Connect(sock)) { + case -1: + printf("FAILED!\n"); + close(sock); + UnloadConfig(&cfg); + args->free(args); + free(args); + return 3; + case MQTT_RETCODE_ACCEPTED: + printf("OK\n"); + break; + case MQTT_RETCODE_REFUSE_VER: + printf("Incorrect version\n"); + break; + case MQTT_RETCODE_REFUSE_ID: + printf("Incorrect connectID\n"); + break; + case MQTT_RETCODE_REFUSE_UNAVAIL: + printf("Service unavailable\n"); + break; + case MQTT_RETCODE_REFUSE_USERPASS: + printf("Refuse user/pass\n"); + break; + case MQTT_RETCODE_DENIED: + printf("DENIED.\n"); + break; } shutdown(sock, SHUT_RDWR);