any traffic on a tunnel resets lastrec, not just control messages

[l2tpns.git] / control.c

diff --git a/control.c b/control.c
index 45657d8..805a90b 100644 (file)
--- a/control.c
+++ b/control.c
@@ -1,12 +1,12 @@
 // L2TPNS: control
 
 // L2TPNS: control
 

-char const *cvs_id_control = "$Id: control.c,v 1.3 2004-11-17 08:23:34 bodea Exp $";
+char const *cvs_id_control = "$Id: control.c,v 1.5 2005-07-31 10:04:10 bodea Exp $";

 
 #include <string.h>
 #include "l2tpns.h"
 #include "control.h"
 
 
 #include <string.h>
 #include "l2tpns.h"
 #include "control.h"
 

-int pack_control(char *data, int len, u8 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 +62,7 @@ int pack_control(char *data, int len, u8 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;


@@ -102,7 +102,7 @@ int unpack_control(struct nsctl *control, char *data, int len)
        if (len < sz + 1)
            return NSCTL_ERR_SHORT;
 
        if (len < sz + 1)
            return NSCTL_ERR_SHORT;
 

-       s = (u8) *p;
+       s = (uint8_t) *p;

        *p++ = 0; // null terminate previous arg
        sz++;
 
        *p++ = 0; // null terminate previous arg
        sz++;