--- mqtt/src/mqtt_subs.c 2012/02/01 16:18:04 1.2.2.1 +++ mqtt/src/mqtt_subs.c 2012/06/20 12:43:41 1.2.2.14 @@ -7,7 +7,8 @@ io_enableDEBUG; extern char compiled[], compiledby[], compilehost[]; -intptr_t Kill; +volatile intptr_t Kill; +sched_root_task_t *root; struct tagArgs *args; @@ -17,10 +18,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\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 +40,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,34 +48,161 @@ 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; + +#ifdef __NetBSD__ + srandom(getpid() ^ time(NULL)); +#else + srandomdev(); +#endif + 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; +#ifdef __NetBSD__ + srandom(getpid() ^ time(NULL)); +#else + srandomdev(); +#endif + mid = random() % USHRT_MAX; + + printf(" > Execute UNSUBSCRIBE request #%d ... ", mid); + 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; + } else + printf("OK\n"); + + return 0; +} + +static void +sigz(int sig) +{ + int stat; + + switch (sig) { + case SIGINT: + case SIGTERM: + Kill++; + break; + case SIGCHLD: + while (waitpid(-1, &stat, WNOHANG) > 0); + break; + } +} + + +static void * +execProc(sched_task_t *task) +{ + FILE *f; + char szLine[MAXPATHLEN + BUFSIZ] = { 0 }; + + snprintf(szLine, sizeof szLine, "%s '%s' %hu %u", AIT_GET_STR(&args->Value), + (char*) TASK_ARG(task), (u_short) TASK_VAL(task), TASK_DATLEN(task)); + if (TASK_ARG(task)) + io_free(TASK_ARG(task)); + + f = popen(szLine, "w"); + if (!f) { + ioSYSERR(0); + return NULL; + } else + fputs(TASK_DATA(task), f); + pclose(f); + return NULL; +} + +static void * +pubRX(sched_task_t *task) +{ + int siz, rlen; + char szTime[STRSIZ] = { 0 }, szTopic[STRSIZ] = { 0 }; + void *data = NULL; + u_short mid; + time_t tim; + + rlen = RecvFrom(TASK_FD(task)); + if (rlen == -1) + goto end; + if (!rlen) { + Kill++; + return NULL; + } + siz = mqtt_readPUBLISH(args->msg, szTopic, sizeof szTopic, &mid, &data); + if (siz == -1) + goto end; + + /* send to output */ + tim = time(NULL); + strftime(szTime, sizeof szTime, "%Y-%m-%d %H:%M:%S", localtime(&tim)); + fprintf(TASK_ARG(task), "\n[%s] Message ID: 0x%04hu, Length: %u, Topic: %s\n", + szTime, mid, siz, szTopic); + + if (data) { + fputs((const char*) data, TASK_ARG(task)); + free(data); + } + + fprintf(TASK_ARG(task), "\n"); + fflush(TASK_ARG(task)); + + /* if exists exec script */ + if (!AIT_ISEMPTY(&args->Value)) + schedEvent(root, execProc, io_strdup(szTopic), mid, data, siz); +end: + schedReadSelf(task); + return NULL; +} + + 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; + struct sigaction sa; - if (!(args = malloc(sizeof(struct tagArgs)))) { + if (!(args = io_malloc(sizeof(struct tagArgs)))) { printf("Error:: in arguments #%d - %s\n", errno, strerror(errno)); 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()); - free(args); + if (!(args->subscr = mqtt_subAlloc(idx))) { + printf("Error:: in subscribes array #%d - %s\n", mqtt_GetErrno(), mqtt_GetError()); + io_free(args); return 1; } else args->free = cleanArgs; @@ -81,7 +210,7 @@ main(int argc, char **argv) if (!(args->msg = mqtt_msgAlloc(USHRT_MAX))) { printf("Error:: in mqtt buffer #%d - %s\n", mqtt_GetErrno(), mqtt_GetError()); args->free(args); - free(args); + io_free(args); return 1; } @@ -90,7 +219,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,22 +244,34 @@ 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); + io_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); if (args->QoS > MQTT_QOS_EXACTLY) { printf("Error:: invalid QoS level %d\n", args->QoS); args->free(args); - free(args); + io_free(args); return 1; } break; @@ -149,48 +290,77 @@ main(int argc, char **argv) case 'v': io_incDebug; break; + case 'u': + un = 1; + break; case 'h': default: args->free(args); - free(args); + io_free(args); Usage(); return 1; } 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); + io_free(args); Usage(); return 1; } 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()); args->free(args); - free(args); + io_free(args); Usage(); return 1; } printf("Connecting to %s:%d ... ", io_n2addr(&args->addr, &val), io_n2port(&args->addr)); AIT_FREE_VAL(&val); - if ((sock = InitClient()) == -1) { - args->free(args); - free(args); - return 2; + sa.sa_handler = sigz; + sigemptyset(&sa.sa_mask); + sigaction(SIGTERM, &sa, NULL); + sigaction(SIGINT, &sa, NULL); + sigaction(SIGCHLD, &sa, NULL); + + if (!batch) + switch (fork()) { + case -1: /* error */ + printf("Error:: in fork() #%d - %s\n", errno, strerror(errno)); + ret = 2; + goto end; + case 0: /* child */ + setsid(); + + ret = open("/dev/null", O_RDWR); + if (ret != -1) { + dup2(ret, STDIN_FILENO); + dup2(ret, STDOUT_FILENO); + dup2(ret, STDERR_FILENO); + close(ret); + } + break; + default: /* parent */ + printf(">> Service started\n"); + ret = 0; + goto end; + } + + if (!(args->cli = mqtt_cli_Open(&args->addr.sa, args->ka))) { + ret = 2; + goto end; } - switch ((ret = ConnectClient(sock))) { + switch ((ret = ConnectClient(args->cli->sock))) { case -1: printf(">> FAILED!\n"); break; @@ -220,17 +390,26 @@ main(int argc, char **argv) else lf = stdout; if (lf) { - ret = Subscribe(sock, lf); + root = schedBegin(); + + ret = Subscribe(args->cli->sock, lf); + + schedRead(root, pubRX, lf, args->cli->sock, NULL, 0); + schedRun(root, &Kill); + + if (un) + Unsubscribe(args->cli->sock); fclose(lf); + + schedEnd(&root); } else - printf("Error:: in subscribe file #%d - %s\n", errno, strerror(errno)); - CloseClient(sock); - } else { - close(sock); + printf("Error:: in output file #%d - %s\n", errno, strerror(errno)); + } else ret = 3; - } + mqtt_cli_Close(&args->cli); +end: args->free(args); - free(args); + io_free(args); return ret; }