Use new RSTP library.

[people/ms/rstp.git] / ctl_socket.c

diff --git a/ctl_socket.c b/ctl_socket.c
index f37e8b151f7bbff0a344d958f079e86a8681c500..d918861bf8293fc01f49ed940eeafef6947d41b1 100644 (file)
--- a/ctl_socket.c
+++ b/ctl_socket.c
@@ -31,6 +31,8 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <fcntl.h>
+#include <stdarg.h>
+#include <string.h>
 
 #include "epoll_loop.h"
 #include "log.h"
@@ -59,14 +61,15 @@ int server_socket(void)
        return s;
 }
 
-int handle_message(int cmd, void *inbuf, int lin, void *outbuf, int *lout)
+int handle_message(int cmd, void *inbuf, int lin, void *outbuf, int lout)
 {
        switch (cmd) {
                SERVER_MESSAGE_CASE(enable_bridge_rstp);
-               SERVER_MESSAGE_CASE(get_bridge_state);
+               SERVER_MESSAGE_CASE(get_bridge_status);
                SERVER_MESSAGE_CASE(set_bridge_config);
-               SERVER_MESSAGE_CASE(get_port_state);
+               SERVER_MESSAGE_CASE(get_port_status);
                SERVER_MESSAGE_CASE(set_port_config);
+               SERVER_MESSAGE_CASE(port_mcheck);
                SERVER_MESSAGE_CASE(set_debug_level);
 
        default:
@@ -75,28 +78,52 @@ int handle_message(int cmd, void *inbuf, int lin, void *outbuf, int *lout)
        }
 }
 
+int ctl_in_handler = 0;
+static unsigned char msg_logbuf[1024];
+static unsigned int msg_log_offset;
+void _ctl_err_log(char *fmt, ...)
+{
+       if (msg_log_offset >= sizeof(msg_logbuf) - 1)
+               return;
+       int r;
+       va_list ap;
+       va_start(ap, fmt);
+       r = vsnprintf((char *)msg_logbuf + msg_log_offset,
+                     sizeof(msg_logbuf) - msg_log_offset,
+                     fmt, ap);
+       va_end(ap);
+       msg_log_offset += r;
+       if (msg_log_offset == sizeof(msg_logbuf)) {
+               msg_log_offset = sizeof(msg_logbuf) - 1;
+               msg_logbuf[sizeof(msg_logbuf) - 1] = 0;
+       }
+}
+
+
 #define msg_buf_len 1024
-unsigned char msg_inbuf[1024];
-unsigned char msg_outbuf[1024];
+static unsigned char msg_inbuf[1024];
+static unsigned char msg_outbuf[1024];
 
 void ctl_rcv_handler(uint32_t events, struct epoll_event_handler *p)
 {
        struct ctl_msg_hdr mhdr;
        struct msghdr msg;
        struct sockaddr_un sa;
-       struct iovec iov[2];
+       struct iovec iov[3];
        int l;
 
        msg.msg_name = &sa;
        msg.msg_namelen = sizeof(sa);
        msg.msg_iov = iov;
-       msg.msg_iovlen = 2;
+       msg.msg_iovlen = 3;
        msg.msg_control = NULL;
        msg.msg_controllen = 0;
        iov[0].iov_base = &mhdr;
        iov[0].iov_len = sizeof(mhdr);
        iov[1].iov_base = msg_inbuf;
        iov[1].iov_len = msg_buf_len;
+       iov[2].iov_base = NULL;
+       iov[2].iov_len = 0;
        l = recvmsg(p->fd, &msg, MSG_NOSIGNAL | MSG_DONTWAIT);
        TST(l > 0,);
        if (msg.msg_flags != 0 || l < sizeof(mhdr) ||
@@ -106,17 +133,22 @@ void ctl_rcv_handler(uint32_t events, struct epoll_event_handler *p)
                return;
        }
 
-       if (mhdr.lout)
-               mhdr.res = handle_message(mhdr.cmd, msg_inbuf, mhdr.lin,
-                                         msg_outbuf, &mhdr.lout);
-       else
-               mhdr.res = handle_message(mhdr.cmd, msg_inbuf, mhdr.lin,
-                                         NULL, NULL);
+       msg_log_offset = 0;
+       ctl_in_handler = 1;
+
+       mhdr.res = handle_message(mhdr.cmd, msg_inbuf, mhdr.lin,
+                                 msg_outbuf, mhdr.lout);
 
+       ctl_in_handler = 0;
        if (mhdr.res < 0)
-               mhdr.lout = 0;
+               memset(msg_outbuf, 0, mhdr.lout);
+       if (msg_log_offset < mhdr.llog)
+               mhdr.llog = msg_log_offset;
+       
        iov[1].iov_base = msg_outbuf;
        iov[1].iov_len = mhdr.lout;
+       iov[2].iov_base = msg_logbuf;
+       iov[2].iov_len = mhdr.llog;
        l = sendmsg(p->fd, &msg, MSG_NOSIGNAL);
        if (l < 0)
                ERROR("CTL: Couldn't send response: %m");