allow - in filter names; include in "show session" output

[l2tpns.git] / ppp.c

diff --git a/ppp.c b/ppp.c
index 1207b3c..d44ed25 100644 (file)
--- a/ppp.c
+++ b/ppp.c
@@ -1,6 +1,6 @@
 // L2TPNS PPP Stuff
 
 // L2TPNS PPP Stuff
 

-char const *cvs_id_ppp = "$Id: ppp.c,v 1.29 2004-11-25 12:41:35 bodea Exp $";
+char const *cvs_id_ppp = "$Id: ppp.c,v 1.31 2004-11-27 05:19:53 bodea Exp $";

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


@@ -21,7 +21,7 @@ extern int tunfd;
 extern char hostname[];
 extern u32 eth_tx;
 extern time_t time_now;
 extern char hostname[];
 extern u32 eth_tx;
 extern time_t time_now;

-extern struct configt *config;
+extern configt *config;

 
 static void initccp(tunnelidt t, sessionidt s);
 
 
 static void initccp(tunnelidt t, sessionidt s);
 


@@ -824,7 +824,7 @@ void processccp(tunnelidt t, sessionidt s, u8 *p, u16 l)
 
                // send CCP request for no compression for our end if not negotiated
                if (!(session[s].flags & SF_CCP_ACKED))
 
                // send CCP request for no compression for our end if not negotiated
                if (!(session[s].flags & SF_CCP_ACKED))

-                       initccp();
+                       initccp(t, s);

 
                break;
 
 
                break;
 


@@ -962,7 +962,7 @@ void initlcp(tunnelidt t, sessionidt s)
 }
 
 // Send CCP request for no compression
 }
 
 // Send CCP request for no compression

-static void sendccp(tunnelidt t, sessionidt s)
+static void initccp(tunnelidt t, sessionidt s)

 {
        char b[500], *q;
 
 {
        char b[500], *q;