byte ordering

diff --git a/l2tpns.c b/l2tpns.c
index 5b4ce7e..d171c1d 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.139 2005-09-16 11:46:48 bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.140 2005-09-16 13:20:39 bodea Exp $";

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


@@ -2613,7 +2613,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
 
                        *q = ProtocolRej;
                        *(q + 1) = ++sess_local[s].lcp_ident;
 
                        *q = ProtocolRej;
                        *(q + 1) = ++sess_local[s].lcp_ident;

-                       *(uint16_t *)(q + 2) = l;
+                       *(uint16_t *)(q + 2) = htons(l);

                        *(uint16_t *)(q + 4) = htons(proto);
                        memcpy(q + 6, p, l - 6);
 
                        *(uint16_t *)(q + 4) = htons(proto);
                        memcpy(q + 6, p, l - 6);
 

diff --git a/ppp.c b/ppp.c
index 4e19251..4215cb8 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.83 2005-09-16 05:20:32 bodea Exp $";
+char const *cvs_id_ppp = "$Id: ppp.c,v 1.84 2005-09-16 13:20:39 bodea Exp $";

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


@@ -459,7 +459,7 @@ static void ppp_code_rej(sessionidt s, tunnelidt t, uint16_t proto,
 
        *q = CodeRej;
        *(q + 1) = ++sess_local[s].lcp_ident;
 
        *q = CodeRej;
        *(q + 1) = ++sess_local[s].lcp_ident;

-       *(uint16_t *)(q + 2) = l;
+       *(uint16_t *)(q + 2) = htons(l);

        memcpy(q + 4, p, l - 4);
 
        LOG(2, s, t, "Unexpected %s code %s\n", pname, ppp_code(*p));
        memcpy(q + 4, p, l - 4);
 
        LOG(2, s, t, "Unexpected %s code %s\n", pname, ppp_code(*p));