--- mqtt/src/mqtt_subs.c 2012/05/08 11:45:57 1.2.2.6 +++ mqtt/src/mqtt_subs.c 2012/07/03 09:02:50 1.3 @@ -8,6 +8,7 @@ io_enableDEBUG; extern char compiled[], compiledby[], compilehost[]; volatile intptr_t Kill; +sched_root_task_t *root; struct tagArgs *args; @@ -19,7 +20,7 @@ Usage(void) "=== %s@%s === Compiled: %s ===\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-u\t\t\tUnsubscribe given topic(s)\n" "\t-s \tSubscribe for this topic, if wish add different |QoS to topic\n" "\t-d\t\t\tSend duplicate message\n\n" "\t-C\t\t\tNot clear before connect!\n" @@ -56,7 +57,11 @@ Subscribe(int sock, FILE *lf) 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); @@ -68,7 +73,7 @@ Subscribe(int sock, FILE *lf) 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*) + printf(" + Topic %s with QoS %d subscribe %s\n", (char*) sub->sub_topic.msg_base, sub->sub_ret, *qos ? "done" : "failed"); free(qoses); @@ -80,18 +85,139 @@ 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), (u_int) 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; + struct mqtthdr *hdr; + + rlen = RecvFrom(TASK_FD(task)); + if (rlen == -1) + goto end; + if (!rlen) { + Kill++; + return NULL; + } + + while (rlen > 0) { + hdr = (struct mqtthdr*) args->msg->msg_base; + + switch (hdr->mqtt_msg.type) { + case MQTT_TYPE_PUBLISH: + siz = mqtt_readPUBLISH(args->msg, szTopic, sizeof szTopic, &mid, &data); + if (siz == -1) + goto end; + else { + siz = mqtt_pktLen(hdr); + rlen -= siz; + ioVERBOSE(4) printf("Remains %d bytes, packet %d bytes\n", + rlen, siz); + } + + /* 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: %04hu, QoS: %hhu, " + "Length: %u, Topic: %s\n", szTime, mid, hdr->mqtt_msg.qos, + 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); + + memmove(args->msg->msg_base, args->msg->msg_base + siz, rlen); + break; + case MQTT_TYPE_PINGREQ: + siz = mqtt_msgPINGRESP(args->msg); + if (siz == -1) + goto end; + else + rlen -= siz; + + /* send ping reply */ + if (SendTo(TASK_FD(task), siz) == -1) + goto end; + + memmove(args->msg->msg_base, args->msg->msg_base + siz, rlen); + break; + default: + ioVERBOSE(1) printf("Unwanted message type #%d ...\n", hdr->mqtt_msg.type); + goto end; + } + } +end: + schedReadSelf(task); + return NULL; +} + + int main(int argc, char **argv) { @@ -102,15 +228,16 @@ main(int argc, char **argv) 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->subscr = mqtt_subAlloc(idx))) { printf("Error:: in subscribes array #%d - %s\n", mqtt_GetErrno(), mqtt_GetError()); - free(args); + io_free(args); return 1; } else args->free = cleanArgs; @@ -118,7 +245,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; } @@ -156,7 +283,7 @@ main(int argc, char **argv) if (!sub) { printf("Error:: #%d - %s\n", mqtt_GetErrno(), mqtt_GetError()); args->free(args); - free(args); + io_free(args); return 1; } else sub += idx++; @@ -179,7 +306,7 @@ main(int argc, char **argv) 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; @@ -204,7 +331,7 @@ main(int argc, char **argv) case 'h': default: args->free(args); - free(args); + io_free(args); Usage(); return 1; } @@ -213,7 +340,7 @@ main(int argc, char **argv) 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 { @@ -227,17 +354,45 @@ main(int argc, char **argv) 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); + 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))) { - args->free(args); - free(args); - return 2; + ret = 2; + goto end; } switch ((ret = ConnectClient(args->cli->sock))) { @@ -270,16 +425,26 @@ main(int argc, char **argv) else lf = stdout; if (lf) { - ret = un ? Unsubscribe(args->cli->sock) : Subscribe(args->cli->sock, lf); + ret = Subscribe(args->cli->sock, lf); + + root = schedBegin(); + + schedRead(root, pubRX, lf, args->cli->sock, NULL, 0); + schedRun(root, &Kill); + + schedEnd(&root); + + if (un) + Unsubscribe(args->cli->sock); fclose(lf); } else - printf("Error:: in subscribe file #%d - %s\n", errno, strerror(errno)); + 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; }