fix protocol-reject

[l2tpns.git] / l2tpns.c

diff --git a/l2tpns.c b/l2tpns.c
index 7b9ca6f..54b2aff 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
 
 // 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.137 2005/09/16 06:10:21 bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.139 2005/09/16 11:46:48 bodea Exp $";

 
 #include <arpa/inet.h>
 #include <assert.h>
 
 #include <arpa/inet.h>
 #include <assert.h>


@@ -1029,7 +1029,7 @@ void adjust_tcp_mss(sessionidt s, tunnelidt t, uint8_t *buf, int len, uint8_t *t
                (tcp[13] & TCP_FLAG_ACK) ? ",ACK" : "", orig, MSS);
 
        // set mss
                (tcp[13] & TCP_FLAG_ACK) ? ",ACK" : "", orig, MSS);
 
        // set mss

-       *(int16_t *) mss = htns(MSS);
+       *(int16_t *) mss = htons(MSS);

 
        // adjust checksum (see rfc1141)
        sum = orig + (~MSS & 0xffff);
 
        // adjust checksum (see rfc1141)
        sum = orig + (~MSS & 0xffff);


@@ -2608,10 +2608,10 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
                        l += 6;
                        if (l > mru) l = mru;
 
                        l += 6;
                        if (l > mru) l = mru;
 

-                       q = makeppp(buf, sizeof(buf), 0, 0, s, t, proto);
+                       q = makeppp(buf, sizeof(buf), 0, 0, s, t, PPPLCP);

                        if (!q) return;
 
                        if (!q) return;
 

-                       *q = CodeRej;
+                       *q = ProtocolRej;

                        *(q + 1) = ++sess_local[s].lcp_ident;
                        *(uint16_t *)(q + 2) = l;
                        *(uint16_t *)(q + 4) = htons(proto);
                        *(q + 1) = ++sess_local[s].lcp_ident;
                        *(uint16_t *)(q + 2) = l;
                        *(uint16_t *)(q + 4) = htons(proto);