normalise session, tunnel args

diff --git a/icmp.c b/icmp.c
index a8f5ba7..f98e401 100644 (file)
--- a/icmp.c
+++ b/icmp.c
@@ -1,6 +1,6 @@
 // L2TPNS: icmp
 
-char const *cvs_id_icmp = "$Id: icmp.c,v 1.9 2005/07/31 10:04:10 bodea Exp $";
+char const *cvs_id_icmp = "$Id: icmp.c,v 1.10 2005/08/10 11:25:56 bodea Exp $";
 
 #include <arpa/inet.h>
 #include <netdb.h>
@@ -102,7 +102,7 @@ static uint16_t _checksum(uint8_t *addr, int count)
        return htons((uint16_t) sum);
 }
 
-void send_ipv6_ra(tunnelidt t, sessionidt s, struct in6_addr *ip)
+void send_ipv6_ra(sessionidt s, tunnelidt t, struct in6_addr *ip)
 {
        struct nd_opt_prefix_info *pinfo;
        struct ipv6_pseudo_hdr *phdr;
@@ -114,7 +114,7 @@ void send_ipv6_ra(tunnelidt t, sessionidt s, struct in6_addr *ip)
        LOG(3, s, t, "Sending IPv6 RA\n");
                
        memset(b, 0, sizeof(b));
-       o = makeppp(b, sizeof(b), 0, 0, t, s, PPPIPV6);
+       o = makeppp(b, sizeof(b), 0, 0, s, t, PPPIPV6);
 
        if (!o)
        {

diff --git a/l2tpns.c b/l2tpns.c
index 981372c..10c3821 100644 (file)
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -4,7 +4,7 @@
 // Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced
 // vim: sw=8 ts=8
 
-char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.118 2005/08/10 08:36:48 bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.119 2005/08/10 11:25:56 bodea Exp $";
 
 #include <arpa/inet.h>
 #include <assert.h>
@@ -1104,7 +1104,7 @@ static void processipout(uint8_t *buf, int len)
 
        // Add on L2TP header
        {
-               uint8_t *p = makeppp(b, sizeof(b), buf, len, t, s, PPPIP);
+               uint8_t *p = makeppp(b, sizeof(b), buf, len, s, t, PPPIP);
                if (!p) return;
                tunnelsend(b, len + (p-b), t); // send it...
        }
@@ -1215,7 +1215,7 @@ static void processipv6out(uint8_t * buf, int len)
 
        // Add on L2TP header
        {
-               uint8_t *p = makeppp(b, sizeof(b), buf, len, t, s, PPPIPV6);
+               uint8_t *p = makeppp(b, sizeof(b), buf, len, s, t, PPPIPV6);
                if (!p) return;
                tunnelsend(b, len + (p-b), t); // send it...
        }
@@ -1267,7 +1267,7 @@ static void send_ipout(sessionidt s, uint8_t *buf, int len)
 
        // Add on L2TP header
        {
-               uint8_t *p = makeppp(b, sizeof(b),  buf, len, t, s, PPPIP);
+               uint8_t *p = makeppp(b, sizeof(b), buf, len, s, t, PPPIP);
                if (!p) return;
                tunnelsend(b, len + (p-b), t); // send it...
        }
@@ -1366,7 +1366,7 @@ static void controlnull(tunnelidt t)
 }
 
 // add a control message to a tunnel, and send if within window
-static void controladd(controlt * c, tunnelidt t, sessionidt far)
+static void controladd(controlt *c, sessionidt far, tunnelidt t)
 {
        *(uint16_t *) (c->buf + 2) = htons(c->length); // length
        *(uint16_t *) (c->buf + 4) = htons(tunnel[t].far); // tunnel
@@ -1558,7 +1558,7 @@ void sessionshutdown(sessionidt s, char *reason, int result, int error)
                        control16(c, 1, result, 1);
 
                control16(c, 14, s, 1);   // assigned session (our end)
-               controladd(c, session[s].tunnel, session[s].far); // send the message
+               controladd(c, session[s].far, session[s].tunnel); // send the message
        }
 
        if (!session[s].die)
@@ -1578,7 +1578,7 @@ void sessionshutdown(sessionidt s, char *reason, int result, int error)
        cluster_send_session(s);
 }
 
-void sendipcp(tunnelidt t, sessionidt s)
+void sendipcp(sessionidt s, tunnelidt t)
 {
        uint8_t buf[MAXCONTROL];
        uint8_t *q;
@@ -1591,7 +1591,7 @@ void sendipcp(tunnelidt t, sessionidt s)
                session[s].unique_id = last_id;
        }
 
-       q = makeppp(buf,sizeof(buf), 0, 0, t, s, PPPIPCP);
+       q = makeppp(buf,sizeof(buf), 0, 0, s, t, PPPIPCP);
        if (!q) return;
 
        *q = ConfigReq;
@@ -1606,14 +1606,14 @@ void sendipcp(tunnelidt t, sessionidt s)
        tunnelsend(buf, 10 + (q - buf), t); // send it
 }
 
-void sendipv6cp(tunnelidt t, sessionidt s)
+void sendipv6cp(sessionidt s, tunnelidt t)
 {
        uint8_t buf[MAXCONTROL];
        uint8_t *q;
 
        CSTAT(sendipv6cp);
 
-       q = makeppp(buf,sizeof(buf), 0, 0, t, s, PPPIPV6CP);
+       q = makeppp(buf,sizeof(buf), 0, 0, s, t, PPPIPV6CP);
        if (!q) return;
 
        *q = ConfigReq;
@@ -1753,7 +1753,7 @@ static void tunnelshutdown(tunnelidt t, char *reason, int result, int error, cha
                        control16(c, 1, result, 1);
 
                control16(c, 9, t, 1);          // assigned tunnel (our end)
-               controladd(c, t, 0);            // send the message
+               controladd(c, 0, t);            // send the message
        }
 }
 
@@ -2305,7 +2305,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                                                controls(c, 7, tunnel[t].hostname, 1); // host name (TBA)
                                                if (chapresponse) controlb(c, 13, chapresponse, 16, 1); // Challenge response
                                                control16(c, 9, t, 1); // assigned tunnel
-                                               controladd(c, t, 0); // send the resply
+                                               controladd(c, 0, t); // send the resply
                                        }
                                        else
                                        {
@@ -2353,7 +2353,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                                                session[s].last_packet = time_now;
                                                LOG(3, s, t, "New session (%d/%d)\n", tunnel[t].far, session[s].far);
                                                control16(c, 14, s, 1); // assigned session
-                                               controladd(c, t, asession); // send the reply
+                                               controladd(c, asession, t); // send the reply
 
                                                strncpy(session[s].called, called, sizeof(session[s].called) - 1);
                                                strncpy(session[s].calling, calling, sizeof(session[s].calling) - 1);
@@ -2376,7 +2376,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                                                else
                                                        control16(c, 1, 2, 7); // shutting down, try another
 
-                                               controladd(c, t, asession); // send the message
+                                               controladd(c, asession, t); // send the message
                                        }
                                        return;
                                case 11:      // ICRP
@@ -2394,7 +2394,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                                                authtype = config->radius_authprefer;
 
                                        // start LCP
-                                       sendlcp(t, s, authtype);
+                                       sendlcp(s, t, authtype);
                                        sess_local[s].lcp.restart = time_now + config->ppp_restart_time;
                                        sess_local[s].lcp.conf_sent = 1;
                                        sess_local[s].lcp.nak_sent = 0;
@@ -2472,37 +2472,37 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                {
                        session[s].last_packet = time_now;
                        if (!config->cluster_iam_master) { master_forward_packet(buf, len, addr->sin_addr.s_addr, addr->sin_port); return; }
-                       processpap(t, s, p, l);
+                       processpap(s, t, p, l);
                }
                else if (prot == PPPCHAP)
                {
                        session[s].last_packet = time_now;
                        if (!config->cluster_iam_master) { master_forward_packet(buf, len, addr->sin_addr.s_addr, addr->sin_port); return; }
-                       processchap(t, s, p, l);
+                       processchap(s, t, p, l);
                }
                else if (prot == PPPLCP)
                {
                        session[s].last_packet = time_now;
                        if (!config->cluster_iam_master) { master_forward_packet(buf, len, addr->sin_addr.s_addr, addr->sin_port); return; }
-                       processlcp(t, s, p, l);
+                       processlcp(s, t, p, l);
                }
                else if (prot == PPPIPCP)
                {
                        session[s].last_packet = time_now;
                        if (!config->cluster_iam_master) { master_forward_packet(buf, len, addr->sin_addr.s_addr, addr->sin_port); return; }
-                       processipcp(t, s, p, l);
+                       processipcp(s, t, p, l);
                }
                else if (prot == PPPIPV6CP)
                {
                        session[s].last_packet = time_now;
                        if (!config->cluster_iam_master) { master_forward_packet(buf, len, addr->sin_addr.s_addr, addr->sin_port); return; }
-                       processipv6cp(t, s, p, l);
+                       processipv6cp(s, t, p, l);
                }
                else if (prot == PPPCCP)
                {
                        session[s].last_packet = time_now;
                        if (!config->cluster_iam_master) { master_forward_packet(buf, len, addr->sin_addr.s_addr, addr->sin_port); return; }
-                       processccp(t, s, p, l);
+                       processccp(s, t, p, l);
                }
                else if (prot == PPPIP)
                {
@@ -2519,7 +2519,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                                return;
                        }
 
-                       processipin(t, s, p, l);
+                       processipin(s, t, p, l);
                }
                else if (prot == PPPIPV6)
                {
@@ -2541,7 +2541,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                                return;
                        }
 
-                       processipv6in(t, s, p, l);
+                       processipv6in(s, t, p, l);
                }
                else
                {
@@ -2660,7 +2660,7 @@ static void regular_cleanups(double period)
                if (tunnel[t].state == TUNNELOPEN && tunnel[t].lastrec < TIME + 600)
                {
                        controlt *c = controlnew(6); // sending HELLO
-                       controladd(c, t, 0); // send the message
+                       controladd(c, 0, t); // send the message
                        LOG(3, 0, t, "Sending HELLO message\n");
                        t_actions++;
                }
@@ -2730,7 +2730,7 @@ static void regular_cleanups(double period)
                                        LOG(3, s, session[s].tunnel, "No ACK for LCP ConfigReq... resending\n");
                                        sess_local[s].lcp.restart = time_now + config->ppp_restart_time;
                                        sess_local[s].lcp.conf_sent++;
-                                       sendlcp(t, s, sess_local[s].lcp_authtype);
+                                       sendlcp(s, t, sess_local[s].lcp_authtype);
                                        change_state(s, lcp, next_state);
                                }
                                else
@@ -2761,7 +2761,7 @@ static void regular_cleanups(double period)
                                        LOG(3, s, session[s].tunnel, "No ACK for IPCP ConfigReq... resending\n");
                                        sess_local[s].ipcp.restart = time_now + config->ppp_restart_time;
                                        sess_local[s].ipcp.conf_sent++;
-                                       sendipcp(t, s);
+                                       sendipcp(s, t);
                                        change_state(s, ipcp, next_state);
                                }
                                else
@@ -2792,7 +2792,7 @@ static void regular_cleanups(double period)
                                        LOG(3, s, session[s].tunnel, "No ACK for IPV6CP ConfigReq... resending\n");
                                        sess_local[s].ipv6cp.restart = time_now + config->ppp_restart_time;
                                        sess_local[s].ipv6cp.conf_sent++;
-                                       sendipv6cp(t, s);
+                                       sendipv6cp(s, t);
                                        change_state(s, ipv6cp, next_state);
                                }
                                else
@@ -2820,7 +2820,7 @@ static void regular_cleanups(double period)
                                        LOG(3, s, session[s].tunnel, "No ACK for CCP ConfigReq... resending\n");
                                        sess_local[s].ccp.restart = time_now + config->ppp_restart_time;
                                        sess_local[s].ccp.conf_sent++;
-                                       sendccp(t, s);
+                                       sendccp(s, t);
                                        change_state(s, ccp, next_state);
                                }
                                else
@@ -2847,7 +2847,7 @@ static void regular_cleanups(double period)
                {
                        uint8_t b[MAXCONTROL] = {0};
 
-                       uint8_t *q = makeppp(b, sizeof(b), 0, 0, session[s].tunnel, s, PPPLCP);
+                       uint8_t *q = makeppp(b, sizeof(b), 0, 0, s, session[s].tunnel, PPPLCP);
                        if (!q) continue;
 
                        *q = EchoReq;
@@ -4400,7 +4400,7 @@ static void read_config_file()
        update_config();
 }
 
-int sessionsetup(tunnelidt t, sessionidt s)
+int sessionsetup(sessionidt s, tunnelidt t)
 {
        // A session now exists, set it up
        in_addr_t ip;
@@ -4479,7 +4479,7 @@ int sessionsetup(tunnelidt t, sessionidt s)
        }
 
        sess_local[s].lcp_authtype = 0; // RADIUS authentication complete
-       lcp_open(t, s); // transition to Network phase and send initial IPCP
+       lcp_open(s, t); // transition to Network phase and send initial IPCP
 
        // Run the plugin's against this new session.
        {

diff --git a/l2tpns.h b/l2tpns.h
index bc623ee..890aab1 100644 (file)
--- a/l2tpns.h
+++ b/l2tpns.h
@@ -1,5 +1,5 @@
 // L2TPNS Global Stuff
-// $Id: l2tpns.h,v 1.81 2005/07/31 10:04:10 bodea Exp $
+// $Id: l2tpns.h,v 1.82 2005/08/10 11:25:56 bodea Exp $
 
 #ifndef __L2TPNS_H__
 #define __L2TPNS_H__
@@ -658,20 +658,20 @@ void sendarp(int ifr_idx, const unsigned char* mac, in_addr_t ip);
 
 
 // ppp.c
-void processpap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l);
-void processchap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l);
-void lcp_open(tunnelidt t, sessionidt s);
-void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l);
-void processipcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l);
-void processipv6cp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l);
-void processipin(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l);
-void processipv6in(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l);
-void processccp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l);
-void sendchap(tunnelidt t, sessionidt s);
-uint8_t *makeppp(uint8_t *b, int size, uint8_t *p, int l, tunnelidt t, sessionidt s, uint16_t mtype);
-void sendlcp(tunnelidt t, sessionidt s, int authtype);
+void processpap(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l);
+void processchap(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l);
+void lcp_open(sessionidt s, tunnelidt t);
+void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l);
+void processipcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l);
+void processipv6cp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l);
+void processipin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l);
+void processipv6in(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l);
+void processccp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l);
+void sendchap(sessionidt s, tunnelidt t);
+uint8_t *makeppp(uint8_t *b, int size, uint8_t *p, int l, sessionidt s, tunnelidt t, uint16_t mtype);
+void sendlcp(sessionidt s, tunnelidt t, int authtype);
 void send_ipin(sessionidt s, uint8_t *buf, int len);
-void sendccp(tunnelidt t, sessionidt s);
+void sendccp(sessionidt s, tunnelidt t);
 
 
 // radius.c
@@ -686,7 +686,7 @@ void processdae(uint8_t *buf, int len, struct sockaddr_in *addr, int alen);
 
 // l2tpns.c
 clockt backoff(uint8_t try);
-void send_ipv6_ra(tunnelidt t, sessionidt s, struct in6_addr *ip);
+void send_ipv6_ra(sessionidt s, tunnelidt t, struct in6_addr *ip);
 void route6set(sessionidt s, struct in6_addr ip, int prefixlen, int add);
 sessionidt sessionbyip(in_addr_t ip);
 sessionidt sessionbyipv6(struct in6_addr ip);
@@ -698,8 +698,8 @@ void sessionshutdown(sessionidt s, char *reason, int result, int error);
 void filter_session(sessionidt s, int filter_in, int filter_out);
 void send_garp(in_addr_t ip);
 void tunnelsend(uint8_t *buf, uint16_t l, tunnelidt t);
-void sendipcp(tunnelidt t, sessionidt s);
-void sendipv6cp(tunnelidt t, sessionidt s);
+void sendipcp(sessionidt s, tunnelidt t);
+void sendipv6cp(sessionidt s, tunnelidt t);
 void processudp(uint8_t *buf, int len, struct sockaddr_in *addr);
 void snoop_send_packet(uint8_t *packet, uint16_t size, in_addr_t destination, uint16_t port);
 int find_filter(char const *name, size_t len);
@@ -716,7 +716,7 @@ int cmd_show_hist_open(struct cli_def *cli, char *command, char **argv, int argc
 void _log(int level, sessionidt s, tunnelidt t, const char *format, ...) __attribute__((format (printf, 4, 5)));
 void _log_hex(int level, const char *title, const uint8_t *data, int maxsize);
 
-int sessionsetup(tunnelidt t, sessionidt s);
+int sessionsetup(sessionidt s, tunnelidt t);
 int run_plugins(int plugin_type, void *data);
 void rebuild_address_pool(void);
 void throttle_session(sessionidt s, int rate_in, int rate_out);

diff --git a/ppp.c b/ppp.c
index adeca58..5af3cb2 100644 (file)
--- a/ppp.c
+++ b/ppp.c
@@ -1,6 +1,6 @@
 // L2TPNS PPP Stuff
 
-char const *cvs_id_ppp = "$Id: ppp.c,v 1.67 2005/08/10 08:59:23 bodea Exp $";
+char const *cvs_id_ppp = "$Id: ppp.c,v 1.68 2005/08/10 11:25:56 bodea Exp $";
 
 #include <stdio.h>
 #include <string.h>
@@ -26,7 +26,7 @@ extern configt *config;
 static int add_lcp_auth(uint8_t *b, int size, int authtype);
 
 // Process PAP messages
-void processpap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
+void processpap(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 {
        char user[MAXUSER];
        char pass[MAXPASS];
@@ -91,7 +91,7 @@ void processpap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
                // respond now, either no RADIUS available or already authenticated
                uint8_t b[MAXCONTROL];
                uint8_t id = p[1];
-               uint8_t *p = makeppp(b, sizeof(b), 0, 0, t, s, PPPPAP);
+               uint8_t *p = makeppp(b, sizeof(b), 0, 0, s, t, PPPPAP);
                if (!p) return;
 
                if (session[s].ip)
@@ -140,7 +140,7 @@ void processpap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 }
 
 // Process CHAP messages
-void processchap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
+void processchap(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 {
        uint16_t r;
        uint16_t hl;
@@ -336,7 +336,7 @@ static void dumplcp(uint8_t *p, int l)
        }
 }
 
-void lcp_open(tunnelidt t, sessionidt s)
+void lcp_open(sessionidt s, tunnelidt t)
 {
        // transition to Authentication or Network phase: 
        session[s].ppp.phase = sess_local[s].lcp_authtype ? Authenticate : Network;
@@ -347,12 +347,12 @@ void lcp_open(tunnelidt t, sessionidt s)
        if (session[s].ppp.phase == Authenticate)
        {
                if (sess_local[s].lcp_authtype == AUTHCHAP)
-                       sendchap(t, s);
+                       sendchap(s, t);
        }
        else
        {
                // This-Layer-Up
-               sendipcp(t, s);
+               sendipcp(s, t);
                change_state(s, ipcp, RequestSent);
                // move to passive state for IPv6 (if configured), CCP
                if (config->ipv6_prefix.s6_addr[0])
@@ -378,7 +378,7 @@ static uint8_t *ppp_rej(sessionidt s, uint8_t *buf, size_t blen, uint16_t mtype,
 {
        if (!*response || **response != ConfigRej)
        {
-               queued = *response = makeppp(buf, blen, packet, 2, session[s].tunnel, s, mtype);
+               queued = *response = makeppp(buf, blen, packet, 2, s, session[s].tunnel, mtype);
                if (!queued)
                        return 0;
 
@@ -422,7 +422,7 @@ static uint8_t *ppp_nak(sessionidt s, uint8_t *buf, size_t blen, uint16_t mtype,
                if (*nak_sent >= config->ppp_max_failure)
                        return ppp_rej(s, buf, blen, mtype, response, 0, packet, option);
 
-               queued = *response = makeppp(buf, blen, packet, 2, session[s].tunnel, s, mtype);
+               queued = *response = makeppp(buf, blen, packet, 2, s, session[s].tunnel, mtype);
                if (!queued)
                        return 0;
 
@@ -444,7 +444,7 @@ static uint8_t *ppp_nak(sessionidt s, uint8_t *buf, size_t blen, uint16_t mtype,
 }
 
 // Process LCP messages
-void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
+void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 {
        uint8_t b[MAXCONTROL];
        uint8_t *q = NULL;
@@ -525,7 +525,7 @@ void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
                        break;
 
                case AckSent:
-                       lcp_open(t, s);
+                       lcp_open(s, t);
                        break;
 
                default:
@@ -637,7 +637,7 @@ void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
                else
                {
                        // Send packet back as ConfigAck
-                       response = makeppp(b, sizeof(b), p, l, t, s, PPPLCP);
+                       response = makeppp(b, sizeof(b), p, l, s, t, PPPLCP);
                        if (!response) return;
                        *response = ConfigAck;
                }
@@ -645,7 +645,7 @@ void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
                switch (session[s].ppp.lcp)
                {
                case Closed:
-                       response = makeppp(b, sizeof(b), p, 2, t, s, PPPLCP);
+                       response = makeppp(b, sizeof(b), p, 2, s, t, PPPLCP);
                        if (!response) return;
                        *response = TerminateAck;
                        *((uint16_t *) (response + 2)) = htons(l = 4);
@@ -669,7 +669,7 @@ void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 
                case AckReceived:
                        if (*response == ConfigAck)
-                               lcp_open(t, s);
+                               lcp_open(s, t);
 
                        break;
 
@@ -765,7 +765,7 @@ void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
                case Closed:
                case Stopped:
                        {
-                               uint8_t *response = makeppp(b, sizeof(b), p, 2, t, s, PPPLCP);
+                               uint8_t *response = makeppp(b, sizeof(b), p, 2, s, t, PPPLCP);
                                if (!response) return;
                                *response = TerminateAck;
                                *((uint16_t *) (response + 2)) = htons(l = 4);
@@ -798,7 +798,7 @@ void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
        {
                LOG(3, s, t, "LCP: Received TerminateReq.  Sending TerminateAck\n");
                *p = TerminateAck;      // close
-               q = makeppp(b, sizeof(b),  p, l, t, s, PPPLCP);
+               q = makeppp(b, sizeof(b),  p, l, s, t, PPPLCP);
                if (!q) return;
                tunnelsend(b, l + (q - b), t); // send it
                sessionshutdown(s, "Remote end closed connection.", 3, 0);
@@ -826,7 +826,7 @@ void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
                LOG(5, s, t, "LCP: Received EchoReq.  Sending EchoReply\n");
                *p = EchoReply;         // reply
                *(uint32_t *) (p + 4) = htonl(session[s].magic); // our magic number
-               q = makeppp(b, sizeof(b), p, l, t, s, PPPLCP);
+               q = makeppp(b, sizeof(b), p, l, s, t, PPPLCP);
                if (!q) return;
                tunnelsend(b, l + (q - b), t); // send it
        }
@@ -844,7 +844,7 @@ void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
                if (l > mru) l = mru;
 
                *p = CodeRej;
-               q = makeppp(b, sizeof(b), p, l, t, s, PPPLCP);
+               q = makeppp(b, sizeof(b), p, l, s, t, PPPLCP);
                if (!q) return;
 
                LOG(3, s, t, "Unexpected LCP code %s\n", ppp_code(code));
@@ -852,7 +852,7 @@ void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
        }
 }
 
-static void ipcp_open(tunnelidt t, sessionidt s)
+static void ipcp_open(sessionidt s, tunnelidt t)
 {
        LOG(3, s, t, "IPCP: Opened, session is now active\n");
 
@@ -868,13 +868,13 @@ static void ipcp_open(tunnelidt t, sessionidt s)
        // start IPv6 if configured and still in passive state
        if (session[s].ppp.ipv6cp == Stopped)
        {
-               sendipv6cp(t, s);
+               sendipv6cp(s, t);
                change_state(s, ipv6cp, RequestSent);
        }
 }
 
 // Process IPCP messages
-void processipcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
+void processipcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 {
        uint8_t b[MAXCONTROL];
        uint8_t *q = 0;
@@ -921,7 +921,7 @@ void processipcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
                        break;
 
                case AckSent:
-                       ipcp_open(t, s);
+                       ipcp_open(s, t);
                        break;
 
                default:
@@ -1001,7 +1001,7 @@ void processipcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
                else if (gotip)
                {
                        // Send packet back as ConfigAck
-                       response = makeppp(b, sizeof(b), p, l, t, s, PPPIPCP);
+                       response = makeppp(b, sizeof(b), p, l, s, t, PPPIPCP);
                        if (!response) return;
                        *response = ConfigAck;
                }
@@ -1015,7 +1015,7 @@ void processipcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
                switch (session[s].ppp.ipcp)
                {
                case Closed:
-                       response = makeppp(b, sizeof(b), p, 2, t, s, PPPIPCP);
+                       response = makeppp(b, sizeof(b), p, 2, s, t, PPPIPCP);
                        if (!response) return;
                        *response = TerminateAck;
                        *((uint16_t *) (response + 2)) = htons(l = 4);
@@ -1039,7 +1039,7 @@ void processipcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 
                case AckReceived:
                        if (*response == ConfigAck)
-                               ipcp_open(t, s);
+                               ipcp_open(s, t);
 
                        break;
 
@@ -1068,7 +1068,7 @@ void processipcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
        {
                LOG(3, s, t, "IPCP: Received TerminateReq.  Sending TerminateAck\n");
                *p = TerminateAck;
-               q = makeppp(b, sizeof(b),  p, l, t, s, PPPIPCP);
+               q = makeppp(b, sizeof(b), p, l, s, t, PPPIPCP);
                if (!q) return;
                tunnelsend(b, l + (q - b), t);
                change_state(s, ipcp, Stopped);
@@ -1083,7 +1083,7 @@ void processipcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
                if (l > mru) l = mru;
 
                *p = CodeRej;
-               q = makeppp(b, sizeof(b), p, l, t, s, PPPIPCP);
+               q = makeppp(b, sizeof(b), p, l, s, t, PPPIPCP);
                if (!q) return;
 
                LOG(3, s, t, "Unexpected IPCP code %s\n", ppp_code(code));
@@ -1091,7 +1091,7 @@ void processipcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
        }
 }
 
-static void ipv6cp_open(tunnelidt t, sessionidt s)
+static void ipv6cp_open(sessionidt s, tunnelidt t)
 {
        LOG(3, s, t, "IPV6CP: Opened\n");
 
@@ -1100,11 +1100,11 @@ static void ipv6cp_open(tunnelidt t, sessionidt s)
                route6set(s, session[s].ipv6route, session[s].ipv6prefixlen, 1);
 
        // Send an initial RA (TODO: Should we send these regularly?)
-       send_ipv6_ra(t, s, NULL);
+       send_ipv6_ra(s, t, NULL);
 }
 
 // Process IPV6CP messages
-void processipv6cp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
+void processipv6cp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 {
        uint8_t b[MAXCONTROL];
        uint8_t *q = 0;
@@ -1138,7 +1138,7 @@ void processipv6cp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
        {
                LOG(2, s, t, "IPV6CP: %s rejected (not configured)\n", ppp_code(*p));
                *p = ProtocolRej;
-               q = makeppp(b, sizeof(b),  p, l, t, s, PPPIPV6CP);
+               q = makeppp(b, sizeof(b),  p, l, s, t, PPPIPV6CP);
                if (!q) return;
                tunnelsend(b, l + (q - b), t);
                return;
@@ -1167,7 +1167,7 @@ void processipv6cp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
                        break;
 
                case AckSent:
-                       ipv6cp_open(t, s);
+                       ipv6cp_open(s, t);
                        break;
 
                default:
@@ -1221,7 +1221,7 @@ void processipv6cp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
                else if (gotip)
                {
                        // Send packet back as ConfigAck
-                       response = makeppp(b, sizeof(b), p, l, t, s, PPPIPV6CP);
+                       response = makeppp(b, sizeof(b), p, l, s, t, PPPIPV6CP);
                        if (!response) return;
                        *response = ConfigAck;
                }
@@ -1235,7 +1235,7 @@ void processipv6cp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
                switch (session[s].ppp.ipv6cp)
                {
                case Closed:
-                       response = makeppp(b, sizeof(b), p, 2, t, s, PPPIPV6CP);
+                       response = makeppp(b, sizeof(b), p, 2, s, t, PPPIPV6CP);
                        if (!response) return;
                        *response = TerminateAck;
                        *((uint16_t *) (response + 2)) = htons(l = 4);
@@ -1259,7 +1259,7 @@ void processipv6cp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 
                case AckReceived:
                        if (*response == ConfigAck)
-                               ipv6cp_open(t, s);
+                               ipv6cp_open(s, t);
 
                        break;
 
@@ -1288,7 +1288,7 @@ void processipv6cp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
        {
                LOG(3, s, t, "IPV6CP: Received TerminateReq.  Sending TerminateAck\n");
                *p = TerminateAck;
-               q = makeppp(b, sizeof(b),  p, l, t, s, PPPIPV6CP);
+               q = makeppp(b, sizeof(b),  p, l, s, t, PPPIPV6CP);
                if (!q) return;
                tunnelsend(b, l + (q - b), t);
                change_state(s, ipv6cp, Stopped);
@@ -1303,7 +1303,7 @@ void processipv6cp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
                if (l > mru) l = mru;
 
                *p = CodeRej;
-               q = makeppp(b, sizeof(b), p, l, t, s, PPPIPV6CP);
+               q = makeppp(b, sizeof(b), p, l, s, t, PPPIPV6CP);
                if (!q) return;
 
                LOG(3, s, t, "Unexpected IPV6CP code %s\n", ppp_code(code));
@@ -1315,7 +1315,7 @@ void processipv6cp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 //
 // This MUST be called with at least 4 byte behind 'p'.
 // (i.e. this routine writes to p[-4]).
-void processipin(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
+void processipin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 {
        in_addr_t ip;
 
@@ -1401,7 +1401,7 @@ void processipin(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 //
 // This MUST be called with at least 4 byte behind 'p'.
 // (i.e. this routine writes to p[-4]).
-void processipv6in(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
+void processipv6in(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 {
        struct in6_addr ip;
        in_addr_t ipv4;
@@ -1438,7 +1438,7 @@ void processipv6in(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
                        *(uint32_t *)(p + 34) == 0 &&
                        *(p + 38) == 0 && *(p + 39) == 2 && *(p + 40) == 133) {
                LOG(3, s, t, "Got IPv6 RS\n");
-               send_ipv6_ra(t, s, &ip);
+               send_ipv6_ra(s, t, &ip);
                return;
        }
 
@@ -1535,7 +1535,7 @@ void send_ipin(sessionidt s, uint8_t *buf, int len)
 
 
 // Process CCP messages
-void processccp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
+void processccp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 {
        uint8_t b[MAXCONTROL];
        uint8_t *q;
@@ -1588,13 +1588,13 @@ void processccp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
                else // compression requested--reject
                        *p = ConfigRej;
 
-               q = makeppp(b, sizeof(b), p, l, t, s, PPPCCP);
+               q = makeppp(b, sizeof(b), p, l, s, t, PPPCCP);
                if (!q) return;
 
                switch (session[s].ppp.ccp)
                {
                case Closed:
-                       q = makeppp(b, sizeof(b), p, 2, t, s, PPPCCP);
+                       q = makeppp(b, sizeof(b), p, 2, s, t, PPPCCP);
                        if (!q) return;
                        *q = TerminateAck;
                        *((uint16_t *) (q + 2)) = htons(l = 4);
@@ -1647,7 +1647,7 @@ void processccp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
        {
                LOG(3, s, t, "CCP: Received TerminateReq.  Sending TerminateAck\n");
                *p = TerminateAck;
-               q = makeppp(b, sizeof(b),  p, l, t, s, PPPCCP);
+               q = makeppp(b, sizeof(b),  p, l, s, t, PPPCCP);
                if (!q) return;
                tunnelsend(b, l + (q - b), t);
                change_state(s, ccp, Stopped);
@@ -1662,7 +1662,7 @@ void processccp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
                if (l > mru) l = mru;
 
                *p = CodeRej;
-               q = makeppp(b, sizeof(b), p, l, t, s, PPPCCP);
+               q = makeppp(b, sizeof(b), p, l, s, t, PPPCCP);
                if (!q) return;
 
                LOG(3, s, t, "Unexpected CCP code %s\n", ppp_code(code));
@@ -1671,7 +1671,7 @@ void processccp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 }
 
 // send a CHAP challenge
-void sendchap(tunnelidt t, sessionidt s)
+void sendchap(sessionidt s, tunnelidt t)
 {
        uint8_t b[MAXCONTROL];
        uint16_t r;
@@ -1702,7 +1702,7 @@ void sendchap(tunnelidt t, sessionidt s)
                STAT(tunnel_tx_errors);
                return ;
        }
-       q = makeppp(b, sizeof(b), 0, 0, t, s, PPPCHAP);
+       q = makeppp(b, sizeof(b), 0, 0, s, t, PPPCHAP);
        if (!q) return;
 
        *q = 1;                                 // challenge
@@ -1717,7 +1717,7 @@ void sendchap(tunnelidt t, sessionidt s)
 // fill in a L2TP message with a PPP frame,
 // copies existing PPP message and changes magic number if seen
 // returns start of PPP frame
-uint8_t *makeppp(uint8_t *b, int size, uint8_t *p, int l, tunnelidt t, sessionidt s, uint16_t mtype)
+uint8_t *makeppp(uint8_t *b, int size, uint8_t *p, int l, sessionidt s, tunnelidt t, uint16_t mtype)
 {
        if (size < 12) // Need more space than this!!
        {
@@ -1785,11 +1785,11 @@ static int add_lcp_auth(uint8_t *b, int size, int authtype)
 }
 
 // Send initial LCP ConfigReq for MRU, authentication type and magic no
-void sendlcp(tunnelidt t, sessionidt s, int authtype)
+void sendlcp(sessionidt s, tunnelidt t, int authtype)
 {
        uint8_t b[500], *q, *l;
 
-       if (!(q = makeppp(b, sizeof(b), NULL, 0, t, s, PPPLCP)))
+       if (!(q = makeppp(b, sizeof(b), NULL, 0, s, t, PPPLCP)))
                return;
 
        LOG(4, s, t, "Sending LCP ConfigReq%s%s\n",
@@ -1822,11 +1822,11 @@ void sendlcp(tunnelidt t, sessionidt s, int authtype)
 }
 
 // Send CCP request for no compression
-void sendccp(tunnelidt t, sessionidt s)
+void sendccp(sessionidt s, tunnelidt t)
 {
        uint8_t b[500], *q;
 
-       if (!(q = makeppp(b, sizeof(b), NULL, 0, t, s, PPPCCP)))
+       if (!(q = makeppp(b, sizeof(b), NULL, 0, s, t, PPPCCP)))
                return;
 
        LOG(4, s, t, "Sending CCP ConfigReq for no compression\n");

diff --git a/radius.c b/radius.c
index 9c8d444..1aa9d62 100644 (file)
--- a/radius.c
+++ b/radius.c
@@ -1,6 +1,6 @@
 // L2TPNS Radius Stuff
 
-char const *cvs_id_radius = "$Id: radius.c,v 1.38 2005/07/31 10:35:39 bodea Exp $";
+char const *cvs_id_radius = "$Id: radius.c,v 1.39 2005/08/10 11:25:56 bodea Exp $";
 
 #include <time.h>
 #include <stdio.h>
@@ -493,7 +493,7 @@ void processrad(uint8_t *buf, int len, char socket_index)
                        if (radius[r].chap)
                        {
                                // CHAP
-                               uint8_t *p = makeppp(b, sizeof(b), 0, 0, t, s, PPPCHAP);
+                               uint8_t *p = makeppp(b, sizeof(b), 0, 0, s, t, PPPCHAP);
                                if (!p) return; // Abort!
 
                                *p = (r_code == AccessAccept) ? 3 : 4;     // ack/nak
@@ -507,7 +507,7 @@ void processrad(uint8_t *buf, int len, char socket_index)
                        else
                        {
                                // PAP
-                               uint8_t *p = makeppp(b, sizeof(b), 0, 0, t, s, PPPPAP);
+                               uint8_t *p = makeppp(b, sizeof(b), 0, 0, s, t, PPPPAP);
                                if (!p) return;         // Abort!
 
                                // ack/nak
@@ -712,7 +712,7 @@ void processrad(uint8_t *buf, int len, char socket_index)
 
                        // Valid Session, set it up
                        session[s].unique_id = 0;
-                       sessionsetup(t, s);
+                       sessionsetup(s, t);
                }
                else
                {
@@ -739,7 +739,7 @@ void radiusretry(uint16_t r)
        switch (radius[r].state)
        {
                case RADIUSCHAP:        // sending CHAP down PPP
-                       sendchap(t, s);
+                       sendchap(s, t);
                        break;
                case RADIUSAUTH:        // sending auth to RADIUS server
                case RADIUSSTART:       // sending start accounting to RADIUS server