Merge from Master

[l2tpns.git] / nsctl.c

diff --git a/nsctl.c b/nsctl.c
index 2ad6a7a..bfe3a69 100644 (file)
--- a/nsctl.c
+++ b/nsctl.c
@@ -7,7 +7,10 @@
 #include <string.h>
 #include <netdb.h>
 #include <signal.h>
 #include <string.h>
 #include <netdb.h>
 #include <signal.h>

+#include <sys/socket.h>
+#include <linux/rtnetlink.h>

 
 

+#include "dhcp6.h"

 #include "l2tpns.h"
 #include "control.h"
 
 #include "l2tpns.h"
 #include "control.h"
 


@@ -16,13 +19,12 @@ struct {
     char *usage;
     int action;
 } builtins[] = {
     char *usage;
     int action;
 } builtins[] = {

-    { "load_plugin", " PLUGIN    Load named plugin",           NSCTL_REQ_LOAD },
-    { "unload_plugin", " PLUGIN  Unload named plugin",         NSCTL_REQ_UNLOAD },
-    { "help", "                  List available commands",     NSCTL_REQ_HELP },
+    { "load_plugin", " PLUGIN                          Load named plugin",             NSCTL_REQ_LOAD },
+    { "unload_plugin", " PLUGIN                        Unload named plugin",           NSCTL_REQ_UNLOAD },
+    { "help", "                                        List available commands",       NSCTL_REQ_HELP },

     { 0 }
 };
 
     { 0 }
 };
 

-

 static int debug = 0;
 static int timeout = 2; // 2 seconds
 static char *me;
 static int debug = 0;
 static int timeout = 2; // 2 seconds
 static char *me;


@@ -142,7 +144,7 @@ static struct nsctl *request(char *host, int port, int type, int argc, char *arg
     socklen_t len = sizeof(peer);
     struct hostent *h = gethostbyname(host);
     int fd;
     socklen_t len = sizeof(peer);
     struct hostent *h = gethostbyname(host);
     int fd;

-    char buf[NSCTL_MAX_PKT_SZ];
+    uint8_t buf[NSCTL_MAX_PKT_SZ];

     int sz;
     char *err;
 
     int sz;
     char *err;