diff --git a/antd-tunnel-publisher.service b/antd-tunnel-publisher.service index 777c1cd..41e03fc 100644 --- a/antd-tunnel-publisher.service +++ b/antd-tunnel-publisher.service @@ -1,12 +1,13 @@ [Unit] Description=Antd Publisher Service -After=antd.target +After=antd.service [Service] Type=simple User=root WorkingDirectory=/opt/www ExecStart=/opt/www/bin/runnerd +Restart=always [Install] WantedBy=multi-user.target \ No newline at end of file diff --git a/dist/antd-publishers-0.1.0a.tar.gz b/dist/antd-publishers-0.1.0a.tar.gz index 3ec2397..3a7c4fc 100644 Binary files a/dist/antd-publishers-0.1.0a.tar.gz and b/dist/antd-publishers-0.1.0a.tar.gz differ diff --git a/runner.c b/runner.c index 821cb89..bcc3f27 100644 --- a/runner.c +++ b/runner.c @@ -8,6 +8,7 @@ #include #include #include +#include #include "log.h" #define MODULE_NAME "runner" diff --git a/vterm/vterm b/vterm/vterm deleted file mode 100755 index 52a1a57..0000000 Binary files a/vterm/vterm and /dev/null differ diff --git a/vterm/vterm.c b/vterm/vterm.c index cf6d144..b7b1b04 100644 --- a/vterm/vterm.c +++ b/vterm/vterm.c @@ -13,6 +13,7 @@ #include #include +#include #include "../tunnel.h" @@ -368,8 +369,6 @@ int main(int argc, char** argv) // now read data while(running) { - timeout.tv_sec = 0; - timeout.tv_usec = 500; FD_ZERO(&fd_in); FD_SET(fd, &fd_in); maxfd = fd; @@ -388,7 +387,7 @@ int main(int argc, char** argv) } list_free(&list); - status = select(maxfd + 1, &fd_in, NULL, NULL, &timeout); + status = select(maxfd + 1, &fd_in, NULL, NULL, NULL); switch (status) { @@ -397,9 +396,6 @@ int main(int argc, char** argv) running = 0; break; case 0: - timeout.tv_sec = 0; - timeout.tv_usec = 10000; // 5 ms - select(0, NULL, NULL, NULL, &timeout); break; // we have data default: diff --git a/wfifo/wfifo b/wfifo/wfifo deleted file mode 100755 index 0f3a8a8..0000000 Binary files a/wfifo/wfifo and /dev/null differ diff --git a/wfifo/wfifo.c b/wfifo/wfifo.c index 1972054..b87c248 100644 --- a/wfifo/wfifo.c +++ b/wfifo/wfifo.c @@ -8,75 +8,78 @@ #include #include #include +#include +#include #include #include +#include #include "../tunnel.h" -#define MODULE_NAME "wfifo" +#define MODULE_NAME "wfifo" -static bst_node_t* clients = NULL; +static bst_node_t *clients = NULL; static volatile int running = 1; -static void int_handler(int dummy) { - (void) dummy; +static void int_handler(int dummy) +{ + (void)dummy; running = 0; } -static void send_data(bst_node_t* node, void** argv, int argc) +static void send_data(bst_node_t *node, void **argv, int argc) { (void)argc; - tunnel_msg_t* msg = (tunnel_msg_t*) argv[0]; - int *fd = (int*) argv[1]; + tunnel_msg_t *msg = (tunnel_msg_t *)argv[0]; + int *fd = (int *)argv[1]; msg->header.client_id = node->key; - if(msg_write(*fd, msg) == -1) + if (msg_write(*fd, msg) == -1) { M_ERROR(MODULE_NAME, "Unable to write data message to client %d", node->key); } } -static void unsubscribe(bst_node_t* node, void** args, int argc) +static void unsubscribe(bst_node_t *node, void **args, int argc) { - (void) argc; + (void)argc; tunnel_msg_t msg; - int* ufd = (int*) args[0]; + int *ufd = (int *)args[0]; msg.header.type = CHANNEL_UNSUBSCRIBE; msg.header.client_id = node->key; msg.header.size = 0; - if(msg_write(*ufd, &msg) == -1) + if (msg_write(*ufd, &msg) == -1) { M_ERROR(MODULE_NAME, "Unable to request unsubscribe to client %d", node->key); } } -int main(int argc, char** argv) +int main(int argc, char **argv) { int fd, fifo_fd; tunnel_msg_t msg; fd_set fd_in; int status, maxfd; - struct timeval timeout; - char buff[BUFFLEN+1]; - void* fargv[2]; - uint8_t* tmp; + char buff[BUFFLEN + 1]; + void *fargv[2]; + uint8_t *tmp; LOG_INIT(MODULE_NAME); - if(argc != 5) + if (argc != 5) { printf("Usage: %s path/to/hotline/socket channel_name input_file\n", argv[0]); return -1; } signal(SIGPIPE, SIG_IGN); - signal(SIGABRT, SIG_IGN); + signal(SIGABRT, SIG_IGN); signal(SIGINT, int_handler); // create the fifo first - (void) unlink(argv[3]); - if(mkfifo(argv[3], 0666) == -1) + (void)unlink(argv[3]); + if (mkfifo(argv[3], 0666) == -1) { M_ERROR(MODULE_NAME, "Unable to create FIFO %s: %s", argv[3], strerror(errno)); return -1; } fifo_fd = open(argv[3], O_RDWR); - if(fifo_fd == -1) + if (fifo_fd == -1) { M_ERROR(MODULE_NAME, "Unable to open FIFO %s: %s", argv[3], strerror(errno)); return -1; @@ -86,160 +89,153 @@ int main(int argc, char** argv) M_LOG(MODULE_NAME, "Hotline is: %s", argv[1]); // now try to request new channel from hotline fd = open_unix_socket(argv[1]); - if(fd == -1) + if (fd == -1) { M_ERROR(MODULE_NAME, "Unable to open the hotline: %s", argv[1]); - (void) close(fifo_fd); + (void)close(fifo_fd); return -1; } msg.header.type = CHANNEL_OPEN; msg.header.channel_id = 0; msg.header.client_id = 0; M_LOG(MODULE_NAME, "Request to open the channel %s", argv[2]); - (void)strncpy(buff, argv[2],MAX_CHANNEL_NAME); + (void)strncpy(buff, argv[2], MAX_CHANNEL_NAME); msg.header.size = strlen(buff); - msg.data = (uint8_t*) buff; - if(msg_write(fd, &msg) == -1) + msg.data = (uint8_t *)buff; + if (msg_write(fd, &msg) == -1) { M_ERROR(MODULE_NAME, "Unable to write message to hotline"); - (void) close(fd); - (void) close(fifo_fd); + (void)close(fd); + (void)close(fifo_fd); return -1; } M_LOG(MODULE_NAME, "Wait for comfirm creation of %s", argv[2]); // now wait for message - if(msg_read(fd, &msg) == -1) + if (msg_read(fd, &msg) == -1) { M_ERROR(MODULE_NAME, "Unable to read message from hotline"); - (void) close(fd); - (void) close(fifo_fd); + (void)close(fd); + (void)close(fifo_fd); return -1; } - if(msg.header.type == CHANNEL_OK) + if (msg.header.type == CHANNEL_OK) { M_LOG(MODULE_NAME, "Channel created: %s", argv[2]); - if(msg.data) + if (msg.data) free(msg.data); } else { M_ERROR(MODULE_NAME, "Channel is not created: %s. Tunnel service responds with msg of type %d", argv[2], msg.header.type); - if(msg.data) + if (msg.data) free(msg.data); running = 0; } - // now read data - while(running) + while (running) { - timeout.tv_sec = 0; - timeout.tv_usec = 500; FD_ZERO(&fd_in); FD_SET(fd, &fd_in); FD_SET(fifo_fd, &fd_in); - maxfd = fd > fifo_fd? fd: fifo_fd; - - status = select(maxfd + 1, &fd_in, NULL, NULL, &timeout); - - switch (status) - { - case -1: - M_LOG(MODULE_NAME, "Error %d on select()\n", errno); - running = 0; - break; - case 0: - timeout.tv_sec = 0; - timeout.tv_usec = 10000; // 5 ms - select(0, NULL, NULL, NULL, &timeout); - break; - // we have data - default: - if (FD_ISSET(fd, &fd_in)) - { - if(msg_read(fd, &msg) == -1) - { - M_ERROR(MODULE_NAME, "Unable to read message from channel. quit"); - running = 0; - } - else - { - switch (msg.header.type) - { - case CHANNEL_SUBSCRIBE: - M_LOG(MODULE_NAME, "Client %d subscribes to the chanel", msg.header.client_id); - clients = bst_insert(clients,msg.header.client_id, NULL); - break; - - case CHANNEL_UNSUBSCRIBE: - M_LOG(MODULE_NAME, "Client %d unsubscribes to the chanel", msg.header.client_id); - clients = bst_delete(clients,msg.header.client_id); - break; + maxfd = fd > fifo_fd ? fd : fifo_fd; - case CHANNEL_DATA: - if(argv[4][0] == 'w') + status = select(maxfd + 1, &fd_in, NULL, NULL, NULL); + + switch (status) + { + case -1: + M_LOG(MODULE_NAME, "Error %d on select()\n", errno); + running = 0; + break; + case 0: + break; + // we have data + default: + if (FD_ISSET(fd, &fd_in)) + { + if (msg_read(fd, &msg) == -1) + { + M_ERROR(MODULE_NAME, "Unable to read message from channel. quit"); + running = 0; + } + else + { + switch (msg.header.type) + { + case CHANNEL_SUBSCRIBE: + M_LOG(MODULE_NAME, "Client %d subscribes to the chanel", msg.header.client_id); + clients = bst_insert(clients, msg.header.client_id, NULL); + break; + + case CHANNEL_UNSUBSCRIBE: + M_LOG(MODULE_NAME, "Client %d unsubscribes to the chanel", msg.header.client_id); + clients = bst_delete(clients, msg.header.client_id); + break; + + case CHANNEL_DATA: + if (argv[4][0] == 'w') + { + // write data to the FIFO + if (msg.header.size > 0) { - // write data to the FIFO - if(msg.header.size >0) + if (write(fifo_fd, msg.data, msg.header.size) == -1) { - if( write(fifo_fd, msg.data, msg.header.size) == -1) - { - M_ERROR(MODULE_NAME, "Unable to write data to the FIFO %s from client %d: %s", argv[3], msg.header.client_id, strerror(errno)); - running = 0; - } - } - } - else - { - (void)snprintf(buff, BUFFLEN, "Channel is read only"); - msg.header.type = CHANNEL_ERROR; - msg.header.size = strlen(buff); - tmp = msg.data; - msg.data = (uint8_t*)buff; - if(msg_write(fd, &msg) == -1) - { - M_ERROR(MODULE_NAME, "Unable to write message to hotline"); + M_ERROR(MODULE_NAME, "Unable to write data to the FIFO %s from client %d: %s", argv[3], msg.header.client_id, strerror(errno)); running = 0; } - msg.data = tmp; - M_ERROR(MODULE_NAME, "Channel is read only %s(%d)", argv[3], msg.header.client_id); } - break; - - default: - M_LOG(MODULE_NAME, "Client %d send message of type %d", - msg.header.client_id, msg.header.type); - break; } - if(msg.data) + else { - free(msg.data); + (void)snprintf(buff, BUFFLEN, "Channel is read only"); + msg.header.type = CHANNEL_ERROR; + msg.header.size = strlen(buff); + tmp = msg.data; + msg.data = (uint8_t *)buff; + if (msg_write(fd, &msg) == -1) + { + M_ERROR(MODULE_NAME, "Unable to write message to hotline"); + running = 0; + } + msg.data = tmp; + M_ERROR(MODULE_NAME, "Channel is read only %s(%d)", argv[3], msg.header.client_id); } + break; + + default: + M_LOG(MODULE_NAME, "Client %d send message of type %d", + msg.header.client_id, msg.header.type); + break; + } + if (msg.data) + { + free(msg.data); } } - else if(FD_ISSET(fifo_fd, &fd_in) && argv[4][0] == 'r') + } + else if (FD_ISSET(fifo_fd, &fd_in) && argv[4][0] == 'r') + { + // on the fifo side + if ((status = read(fifo_fd, buff, BUFFLEN)) == -1) { - // on the fifo side - if((status = read(fifo_fd,buff, BUFFLEN)) == -1) - { - M_ERROR(MODULE_NAME, "Unable to read data from the FIFO %s: %s", argv[3], strerror(errno)); - running = 0; - } - else - { - msg.header.type = CHANNEL_DATA; - msg.header.size = status; - msg.data = (uint8_t*)buff; - fargv[0] = (void*) &msg; - fargv[1] = (void*) &fd; - bst_for_each(clients, send_data, fargv, 2); - } + M_ERROR(MODULE_NAME, "Unable to read data from the FIFO %s: %s", argv[3], strerror(errno)); + running = 0; } - + else + { + msg.header.type = CHANNEL_DATA; + msg.header.size = status; + msg.data = (uint8_t *)buff; + fargv[0] = (void *)&msg; + fargv[1] = (void *)&fd; + bst_for_each(clients, send_data, fargv, 2); + } + } } } // unsubscribe all client - fargv[0] = (void*) &fd; + fargv[0] = (void *)&fd; bst_for_each(clients, unsubscribe, fargv, 1); // close the channel @@ -247,14 +243,14 @@ int main(int argc, char** argv) msg.header.type = CHANNEL_CLOSE; msg.header.size = 0; msg.data = NULL; - if( msg_write(fd, &msg) == -1) + if (msg_write(fd, &msg) == -1) { M_ERROR(MODULE_NAME, "Unable to request channel close"); } // close all opened terminal - + (void)msg_read(fd, &msg); - (void) close(fd); - (void) close(fifo_fd); + (void)close(fd); + (void)close(fifo_fd); return 0; } \ No newline at end of file