Merge from master

[l2tpns.git] / control.c

diff --git a/control.c b/control.c
index bd65de5..092ab8e 100644 (file)
--- a/control.c
+++ b/control.c
@@ -1,12 +1,13 @@
 // L2TPNS: control
 
 // L2TPNS: control
 

-char const *cvs_id_control = "$Id: control.c,v 1.4 2004-12-16 08:49:53 bodea Exp $";
-

 #include <string.h>
 #include <string.h>

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

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

-int pack_control(char *data, int len, uint8_t type, int argc, char *argv[])
+int pack_control(uint8_t *data, int len, uint8_t type, int argc, char *argv[])

 {
     struct nsctl_packet pkt;
     struct nsctl_args arg;
 {
     struct nsctl_packet pkt;
     struct nsctl_args arg;


@@ -62,7 +63,7 @@ int pack_control(char *data, int len, uint8_t type, int argc, char *argv[])
     return sz;
 }
 
     return sz;
 }
 

-int unpack_control(struct nsctl *control, char *data, int len)
+int unpack_control(struct nsctl *control, uint8_t *data, int len)

 {
     struct nsctl_packet pkt;
     char *p = pkt.argv;
 {
     struct nsctl_packet pkt;
     char *p = pkt.argv;