--- mqtt/src/mqtt_subs.c 2012/04/24 13:54:50 1.2.2.2 +++ mqtt/src/mqtt_subs.c 2012/05/08 11:45:57 1.2.2.6 @@ -17,10 +17,10 @@ Usage(void) { printf( " -= MQTT Subscriber Client =- Subscriber from ELWIX\n" "=== %s@%s === Compiled: %s ===\n\n" - " Syntax: mqtt_subs [options] [exec_script ]\n\n" + " Syntax: mqtt_subs [options] [exec_script ]\n\n" "\t-l \t\tSave received values to file\n" + "\t-u\t\tUnsubscribe given topic(s)\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\n" "\t-C\t\t\tNot clear before connect!\n" "\t-p \t\tDifferent port for connect (default: 1883)\n" @@ -39,6 +39,7 @@ static void cleanArgs(struct tagArgs * __restrict args) { mqtt_msgFree(&args->msg, 42); + mqtt_subFree(&args->subscr); AIT_FREE_VAL(&args->Will.Msg); AIT_FREE_VAL(&args->Will.Topic); AIT_FREE_VAL(&args->User); @@ -46,24 +47,60 @@ cleanArgs(struct tagArgs * __restrict args) AIT_FREE_VAL(&args->Publish); AIT_FREE_VAL(&args->Value); AIT_FREE_VAL(&args->ConnID); - io_freeVars(&args->Subscribes); } static int Subscribe(int sock, FILE *lf) { + u_char *qoses, *qos; + u_short mid; + mqtt_subscr_t *sub; + + srandomdev(); + mid = random() % USHRT_MAX; + + printf(" > Execute SUBSCRIBE request #%d ... ", mid); + qoses = mqtt_cli_Subscribe(args->cli, args->subscr, mid, args->Dup, MQTT_QOS_ACK); + if (!qoses) { + printf("Error:: Subscribe #%d - %s\n", mqtt_GetErrno(), mqtt_GetError()); + return -1; + } else + printf("OK\n"); + + for (sub = args->subscr, qos = qoses; sub->sub_topic.msg_base; sub++, qos++) + printf(" + Topic %s with QoS %d subscribed %s\n", (char*) + sub->sub_topic.msg_base, sub->sub_ret, *qos ? "done" : "failed"); + + free(qoses); return 0; } +static int +Unsubscribe(int sock) +{ + u_short mid; + srandomdev(); + mid = random() % USHRT_MAX; + + if (mqtt_cli_Unsubscribe(args->cli, args->subscr, mid, args->Dup, MQTT_QOS_ACK)) { + printf("Error:: Unsubscribe #%d - %s\n", mqtt_GetErrno(), mqtt_GetError()); + return -1; + } + + return 0; +} + + int main(int argc, char **argv) { - char ch, batch = 1; - ait_val_t *v, val; + char ch, un = 0, idx = 0, batch = 1; + ait_val_t val; u_short port = atoi(MQTT_PORT); - int sock, ret = 0; - char szLogName[MAXPATHLEN] = { 0 }; + mqtt_subscr_t *sub; + int ret = 0; + char *str, szStr[STRSIZ], szLogName[MAXPATHLEN] = { 0 }; FILE *lf; if (!(args = malloc(sizeof(struct tagArgs)))) { @@ -71,8 +108,8 @@ main(int argc, char **argv) return 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()); + if (!(args->subscr = mqtt_subAlloc(idx))) { + printf("Error:: in subscribes array #%d - %s\n", mqtt_GetErrno(), mqtt_GetError()); free(args); return 1; } else @@ -90,7 +127,7 @@ main(int argc, char **argv) AIT_SET_STR(&args->Pass, ""); args->ka = MQTT_KEEPALIVE; - while ((ch = getopt(argc, argv, "T:U:P:p:s:q:dl:W:M:CDvh")) != -1) + while ((ch = getopt(argc, argv, "T:U:P:p:s:q:dl:W:M:CDvuh")) != -1) switch (ch) { case 'T': args->ka = (u_short) strtol(optarg, NULL, 0); @@ -115,15 +152,27 @@ main(int argc, char **argv) port = (u_short) strtol(optarg, NULL, 0); break; case 's': - v = io_allocVar(); - if (!v) { - printf("Error:: not enough memory #%d - %s\n", errno, strerror(errno)); + sub = mqtt_subRealloc(&args->subscr, idx + 1); + if (!sub) { + printf("Error:: #%d - %s\n", mqtt_GetErrno(), mqtt_GetError()); args->free(args); free(args); return 1; } else - AIT_SET_STR(v, optarg); - io_arrayElem(args->Subscribes, io_arraySize(args->Subscribes), v); + sub += idx++; + + strlcpy(szStr, optarg, sizeof szStr); + if ((str = strchr(szStr, '|'))) { + *str++ = 0; + *str -= 0x30; + if (*str < 0 || *str > MQTT_QOS_RESERVED) + sub->sub_ret = (u_char) args->QoS; + else + sub->sub_ret = (u_char) *str; + } else + sub->sub_ret = (u_char) args->QoS; + sub->sub_topic.msg_base = strdup(szStr); + sub->sub_topic.msg_len = strlen(szStr); break; case 'q': args->QoS = (char) strtol(optarg, NULL, 0); @@ -149,6 +198,9 @@ main(int argc, char **argv) case 'v': io_incDebug; break; + case 'u': + un = 1; + break; case 'h': default: args->free(args); @@ -158,7 +210,7 @@ main(int argc, char **argv) } argc -= optind; argv += optind; - if (argc < 3) { + if (argc < 2) { printf("Error:: host for connect not found, connection id or topic not supplied!\n\n"); args->free(args); free(args); @@ -167,12 +219,10 @@ main(int argc, char **argv) } else { AIT_FREE_VAL(&args->ConnID); AIT_SET_STR(&args->ConnID, argv[1]); - AIT_FREE_VAL(&args->Publish); - AIT_SET_STR(&args->Publish, argv[2]); } - if (argc > 3) { + if (argc > 2) { AIT_FREE_VAL(&args->Value); - AIT_SET_STR(&args->Value, argv[3]); + AIT_SET_STR(&args->Value, argv[2]); } if (!io_gethostbyname(*argv, port, &args->addr)) { printf("Error:: host not valid #%d - %s\n", io_GetErrno(), io_GetError()); @@ -184,13 +234,13 @@ main(int argc, char **argv) printf("Connecting to %s:%d ... ", io_n2addr(&args->addr, &val), io_n2port(&args->addr)); AIT_FREE_VAL(&val); - if ((sock = InitClient()) == -1) { + if (!(args->cli = mqtt_cli_Open(&args->addr.sa, args->ka))) { args->free(args); free(args); return 2; } - switch ((ret = ConnectClient(sock))) { + switch ((ret = ConnectClient(args->cli->sock))) { case -1: printf(">> FAILED!\n"); break; @@ -220,15 +270,14 @@ main(int argc, char **argv) else lf = stdout; if (lf) { - ret = Subscribe(sock, lf); + ret = un ? Unsubscribe(args->cli->sock) : Subscribe(args->cli->sock, lf); fclose(lf); } else printf("Error:: in subscribe file #%d - %s\n", errno, strerror(errno)); - CloseClient(sock); - } else { - close(sock); + } else ret = 3; - } + + mqtt_cli_Close(&args->cli); args->free(args); free(args);