From a49ab300966aa7fa58c75662dfce16b409b17751 Mon Sep 17 00:00:00 2001 From: Kozlov Dmitry Date: Sat, 13 Nov 2010 15:22:11 +0300 Subject: cli: implemented tcp frontend to send batch commands --- accel-pptpd/accel-pptp.conf | 4 +- accel-pptpd/cli/cli_p.h | 22 +++ accel-pptpd/cli/tcp.c | 364 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 388 insertions(+), 2 deletions(-) create mode 100644 accel-pptpd/cli/cli_p.h create mode 100644 accel-pptpd/cli/tcp.c (limited to 'accel-pptpd') diff --git a/accel-pptpd/accel-pptp.conf b/accel-pptpd/accel-pptp.conf index 5b4d430..17f497b 100644 --- a/accel-pptpd/accel-pptp.conf +++ b/accel-pptpd/accel-pptp.conf @@ -105,6 +105,6 @@ verbose=1 #latency=50 [cli] -bind=127.0.0.1 -port=2000 +telnet=127.0.0.1:2000 +tcp=127.0.0.1:2001 #passwd=123 diff --git a/accel-pptpd/cli/cli_p.h b/accel-pptpd/cli/cli_p.h new file mode 100644 index 0000000..9e3e6cf --- /dev/null +++ b/accel-pptpd/cli/cli_p.h @@ -0,0 +1,22 @@ +#ifndef __CLI_P_H +#define __CLI_P_H + +#include + +#include "triton.h" + +struct cli_client_t +{ + uint8_t *cmdline; + int (*send)(struct cli_client_t *, const void *buf, int size); + int (*sendv)(struct cli_client_t *, const char *fmt, va_list ap); + void (*disconnect)(struct cli_client_t *); +}; + +int cli_process_cmd(struct cli_client_t *cln); + +extern char *conf_cli_passwd; +extern const char *conf_cli_prompt; + +#endif + diff --git a/accel-pptpd/cli/tcp.c b/accel-pptpd/cli/tcp.c new file mode 100644 index 0000000..7b44da7 --- /dev/null +++ b/accel-pptpd/cli/tcp.c @@ -0,0 +1,364 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "triton.h" +#include "log.h" +#include "list.h" +#include "memdebug.h" + +#include "cli_p.h" + +#define RECV_BUF_SIZE 1024 + +struct tcp_client_t +{ + struct cli_client_t cli_client; + struct list_head entry; + struct triton_md_handler_t hnd; + struct list_head xmit_queue; + struct buffer_t *xmit_buf; + uint8_t *cmdline; + int xmit_pos; + int recv_pos; + int auth:1; + int disconnect:1; +}; + +struct buffer_t +{ + struct list_head entry; + int size; + uint8_t buf[0]; +}; + +static struct triton_context_t serv_ctx; +static struct triton_md_handler_t serv_hnd; +static LIST_HEAD(clients); + +static uint8_t *temp_buf; + +static void disconnect(struct tcp_client_t *cln) +{ + struct buffer_t *b; + + log_debug("cli: disconnect\n"); + + list_del(&cln->entry); + + triton_md_unregister_handler(&cln->hnd); + close(cln->hnd.fd); + + if (cln->xmit_buf) + _free(cln->xmit_buf); + + while (!list_empty(&cln->xmit_queue)) { + b = list_entry(cln->xmit_queue.next, typeof(*b), entry); + list_del(&b->entry); + _free(b); + } + + _free(cln->cmdline); + _free(cln); +} + +static void cli_client_disconnect(struct cli_client_t *tcln) +{ + struct tcp_client_t *cln = container_of(tcln, typeof(*cln), cli_client); + disconnect(cln); +} + +static void queue_buffer(struct tcp_client_t *cln, struct buffer_t *b) +{ + if (cln->xmit_buf) + list_add_tail(&b->entry, &cln->xmit_queue); + else + cln->xmit_buf = b; +} + +static int cli_client_send(struct cli_client_t *tcln, const void *_buf, int size) +{ + struct tcp_client_t *cln = container_of(tcln, typeof(*cln), cli_client); + int n, k; + struct buffer_t *b; + const uint8_t *buf = (const uint8_t *)_buf; + + if (cln->disconnect) + return -1; + + if (!list_empty(&cln->xmit_queue)) { + b = _malloc(sizeof(*b) + size); + b->size = size; + memcpy(b->buf, buf, size); + queue_buffer(cln, b); + return 0; + } + + for (n = 0; n < size; n += k) { + k = write(cln->hnd.fd, buf + n, size - n); + if (k < 0) { + if (errno == EAGAIN) { + b = _malloc(sizeof(*b) + size - n); + b->size = size - n; + memcpy(b->buf, buf, size - n); + queue_buffer(cln, b); + + triton_md_enable_handler(&cln->hnd, MD_MODE_WRITE); + break; + } + if (errno != EPIPE) + log_error("cli: write: %s\n", strerror(errno)); + //disconnect(cln); + cln->disconnect = 1; + return -1; + } + } + return 0; +} + +static int cli_client_sendv(struct cli_client_t *tcln, const char *fmt, va_list ap) +{ + struct tcp_client_t *cln = container_of(tcln, typeof(*cln), cli_client); + int r = vsnprintf((char *)temp_buf, RECV_BUF_SIZE, fmt, ap); + + if (r >= RECV_BUF_SIZE) { + strcpy((char *)temp_buf + RECV_BUF_SIZE - 5, "...\n"); + r = RECV_BUF_SIZE; + } + + return cli_client_send(tcln, temp_buf, r); +} + +static int cln_read(struct triton_md_handler_t *h) +{ + struct tcp_client_t *cln = container_of(h, typeof(*cln), hnd); + int n; + char *d; + + while (1) { + n = read(h->fd, cln->cmdline + cln->recv_pos, RECV_BUF_SIZE - cln->recv_pos); + if (n == 0) + break; + if (n < 0) { + if (errno != EAGAIN) + log_error("cli: read: %s\n", strerror(errno)); + return 0; + } + + cln->recv_pos += n; + + d = strchr((char *)cln->cmdline, '\n'); + if (!d) { + if (cln->recv_pos == RECV_BUF_SIZE) { + log_warn("cli: tcp: recv buffer overflow\n"); + break; + } + continue; + } + + *d = 0; + + if (!cln->auth) { + if (strcmp((char *)cln->cmdline, conf_cli_passwd)) + break; + cln->auth = 1; + } else + cli_process_cmd(&cln->cli_client); + + if (cln->disconnect) + break; + + memmove(cln->cmdline, d + 1, cln->recv_pos - ((uint8_t *)d + 1 - cln->cmdline)); + } + + disconnect(cln); + return 0; +} + +static int cln_write(struct triton_md_handler_t *h) +{ + struct tcp_client_t *cln = container_of(h, typeof(*cln), hnd); + int k; + + while (1) { + for (; cln->xmit_pos < cln->xmit_buf->size; cln->xmit_pos += k) { + k = write(cln->hnd.fd, cln->xmit_buf->buf + cln->xmit_pos, cln->xmit_buf->size - cln->xmit_pos); + if (k < 0) { + if (errno == EAGAIN) + return 0; + if (errno != EPIPE) + log_error("cli: tcp: write: %s\n", strerror(errno)); + disconnect(cln); + return -1; + } + } + + _free(cln->xmit_buf); + cln->xmit_pos = 0; + + if (list_empty(&cln->xmit_queue)) + break; + + cln->xmit_buf = list_entry(cln->xmit_queue.next, typeof(*cln->xmit_buf), entry); + list_del(&cln->xmit_buf->entry); + } + + triton_md_disable_handler(&cln->hnd, MD_MODE_WRITE); + + return 0; +} + +static int serv_read(struct triton_md_handler_t *h) +{ + struct sockaddr_in addr; + socklen_t size = sizeof(addr); + int sock; + struct tcp_client_t *conn; + + while(1) { + sock = accept(h->fd, (struct sockaddr *)&addr, &size); + if (sock < 0) { + if (errno == EAGAIN) + return 0; + log_error("cli: tcp: accept failed: %s\n", strerror(errno)); + continue; + } + + log_info("cli: tcp: new connection from %s\n", inet_ntoa(addr.sin_addr)); + + if (fcntl(sock, F_SETFL, O_NONBLOCK)) { + log_error("cli: tcp: failed to set nonblocking mode: %s, closing connection...\n", strerror(errno)); + close(sock); + continue; + } + + conn = _malloc(sizeof(*conn)); + memset(conn, 0, sizeof(*conn)); + conn->hnd.fd = sock; + conn->hnd.read = cln_read; + conn->hnd.write = cln_write; + conn->cmdline = _malloc(RECV_BUF_SIZE); + INIT_LIST_HEAD(&conn->xmit_queue); + + conn->cli_client.cmdline = conn->cmdline; + conn->cli_client.send = cli_client_send; + conn->cli_client.sendv = cli_client_sendv; + conn->cli_client.disconnect = cli_client_disconnect; + + triton_md_register_handler(&serv_ctx, &conn->hnd); + triton_md_enable_handler(&conn->hnd,MD_MODE_READ); + + list_add_tail(&conn->entry, &clients); + + if (!conf_cli_passwd) + conn->auth = 1; + } + return 0; +} + +static void serv_close(struct triton_context_t *ctx) +{ + struct tcp_client_t *cln; + + while (!list_empty(&clients)) { + cln = list_entry(clients.next, typeof(*cln), entry); + disconnect(cln); + } + + triton_md_unregister_handler(&serv_hnd); + close(serv_hnd.fd); + triton_context_unregister(ctx); +} + +static struct triton_context_t serv_ctx = { + .close = serv_close, +}; + +static struct triton_md_handler_t serv_hnd = { + .read = serv_read, +}; + +static void start_server(const char *host, int port) +{ + struct sockaddr_in addr; + + serv_hnd.fd = socket(PF_INET, SOCK_STREAM, 0); + if (serv_hnd.fd < 0) { + log_emerg("cli: tcp: failed to create server socket: %s\n", strerror(errno)); + return; + } + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_port = htons(port); + if (host) + addr.sin_addr.s_addr = inet_addr(host); + else + addr.sin_addr.s_addr = htonl(INADDR_ANY); + + setsockopt(serv_hnd.fd, SOL_SOCKET, SO_REUSEADDR, &serv_hnd.fd, 4); + if (bind (serv_hnd.fd, (struct sockaddr *) &addr, sizeof (addr)) < 0) { + log_emerg("cli: tcp: failed to bind socket: %s\n", strerror(errno)); + close(serv_hnd.fd); + return; + } + + if (listen (serv_hnd.fd, 1) < 0) { + log_emerg("cli: tcp: failed to listen socket: %s\n", strerror(errno)); + close(serv_hnd.fd); + return; + } + + if (fcntl(serv_hnd.fd, F_SETFL, O_NONBLOCK)) { + log_emerg("cli: tcp: failed to set nonblocking mode: %s\n", strerror(errno)); + close(serv_hnd.fd); + return; + } + + addr.sin_family = AF_INET; + addr.sin_port = htons(port); + addr.sin_addr.s_addr = inet_addr(host); + + triton_context_register(&serv_ctx, NULL); + triton_md_register_handler(&serv_ctx, &serv_hnd); + triton_md_enable_handler(&serv_hnd, MD_MODE_READ); + triton_context_wakeup(&serv_ctx); +} + +static void __init init(void) +{ + const char *opt; + char *host, *d; + int port; + + opt = conf_get_opt("cli", "tcp"); + if (opt) { + host = strdup(opt); + d = strstr(host, ":"); + if (!d) { + return; + } + *d = 0; + port = atoi(d + 1); + if (port <= 0) + goto err_fmt; + } + + temp_buf = malloc(RECV_BUF_SIZE); + + start_server(host, port); + + return; +err_fmt: + log_emerg("cli: tcp: invalid format\n"); + free(host); +} + -- cgit v1.2.3