long -> u_int32_t, extra param for ip-up/down scripts

[ppp.git] / modules / vjcompress.c

diff --git a/modules/vjcompress.c b/modules/vjcompress.c
index 80246ddc443301b2cb16af74e14bf4d313ef9554..ef2c9c487fb619985b7a604f9b10bd5d00d6f999 100644 (file)
--- a/modules/vjcompress.c
+++ b/modules/vjcompress.c
@@ -24,26 +24,32 @@
  * so that the entire packet being decompressed doesn't have
  * to be in contiguous memory (just the compressed header).
  *
- * $Id: vjcompress.c,v 1.1 1994/09/16 06:58:24 paulus Exp $
+ * $Id: vjcompress.c,v 1.4 1994/12/08 00:35:33 paulus Exp $
  */
 
 #include <sys/types.h>
 #include <sys/param.h>
+
+#ifdef __osf__
+#include <net/net_globals.h>
+#endif
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/tcp.h>
 
-#ifdef __STDC__
-#define __P(x) x
+#ifdef __aix4__
+#define _NETINET_IN_SYSTM_H_
+typedef u_long  n_long;
 #else
-#define __P()  ()
+#include <netinet/in_systm.h>
 #endif
 
+#include <netinet/ip.h>
+#include <netinet/tcp.h>
+
+#include <net/ppp_defs.h>
 #include <net/vjcompress.h>
 
 #ifndef VJ_NO_STATS
-#define INCR(counter) ++comp->counter
+#define INCR(counter) ++comp->stats.counter
 #else
 #define INCR(counter)
 #endif
@@ -55,6 +61,15 @@
 #define ovbcopy bcopy
 #endif
 
+#ifdef __osf__
+#define getip_hl(base) (((base).ip_vhl)&0xf)
+#define getth_off(base)        ((((base).th_xoff)&0xf0)>>4)
+
+#else
+#define getip_hl(base) ((base).ip_hl)
+#define getth_off(base)        ((base).th_off)
+#endif
+
 void
 vj_compress_init(comp, max_state)
     struct vjcompress *comp;
@@ -109,7 +124,7 @@ vj_compress_init(comp, max_state)
                (f) = htonl(ntohl(f) + ((cp[1] << 8) | cp[2])); \
                cp += 3; \
        } else { \
-               (f) = htonl(ntohl(f) + (u_long)*cp++); \
+               (f) = htonl(ntohl(f) + (u_int32_t)*cp++); \
        } \
 }
 
@@ -118,7 +133,7 @@ vj_compress_init(comp, max_state)
                (f) = htons(ntohs(f) + ((cp[1] << 8) | cp[2])); \
                cp += 3; \
        } else { \
-               (f) = htons(ntohs(f) + (u_long)*cp++); \
+               (f) = htons(ntohs(f) + (u_int32_t)*cp++); \
        } \
 }
 
@@ -127,7 +142,7 @@ vj_compress_init(comp, max_state)
                (f) = htons((cp[1] << 8) | cp[2]); \
                cp += 3; \
        } else { \
-               (f) = htons((u_long)*cp++); \
+               (f) = htons((u_int32_t)*cp++); \
        } \
 }
 
@@ -140,7 +155,7 @@ vj_compress_tcp(ip, mlen, comp, compress_cid, vjhdrp)
     u_char **vjhdrp;
 {
     register struct cstate *cs = comp->last_cs->cs_next;
-    register u_int hlen = ip->ip_hl;
+    register u_int hlen = getip_hl(*ip);
     register struct tcphdr *oth;
     register struct tcphdr *th;
     register u_int deltaS, deltaA;
@@ -170,7 +185,7 @@ vj_compress_tcp(ip, mlen, comp, compress_cid, vjhdrp)
     INCR(vjs_packets);
     if (ip->ip_src.s_addr != cs->cs_ip.ip_src.s_addr ||
        ip->ip_dst.s_addr != cs->cs_ip.ip_dst.s_addr ||
-       *(int *)th != ((int *)&cs->cs_ip)[cs->cs_ip.ip_hl]) {
+       *(int *)th != ((int *)&cs->cs_ip)[getip_hl(cs->cs_ip)]) {
        /*
         * Wasn't the first -- search for it.
         *
@@ -191,7 +206,7 @@ vj_compress_tcp(ip, mlen, comp, compress_cid, vjhdrp)
            INCR(vjs_searches);
            if (ip->ip_src.s_addr == cs->cs_ip.ip_src.s_addr
                && ip->ip_dst.s_addr == cs->cs_ip.ip_dst.s_addr
-               && *(int *)th == ((int *)&cs->cs_ip)[cs->cs_ip.ip_hl])
+               && *(int *)th == ((int *)&cs->cs_ip)[getip_hl(cs->cs_ip)])
                goto found;
        } while (cs != lastcs);
 
@@ -205,7 +220,7 @@ vj_compress_tcp(ip, mlen, comp, compress_cid, vjhdrp)
         */
        INCR(vjs_misses);
        comp->last_cs = lcs;
-       hlen += th->th_off;
+       hlen += getth_off(*th);
        hlen <<= 2;
        if (hlen > mlen)
            return (TYPE_IP);
@@ -237,7 +252,7 @@ vj_compress_tcp(ip, mlen, comp, compress_cid, vjhdrp)
      */
     oth = (struct tcphdr *)&((int *)&cs->cs_ip)[hlen];
     deltaS = hlen;
-    hlen += th->th_off;
+    hlen += getth_off(*th);
     hlen <<= 2;
     if (hlen > mlen)
        return (TYPE_IP);
@@ -245,9 +260,9 @@ vj_compress_tcp(ip, mlen, comp, compress_cid, vjhdrp)
     if (((u_short *)ip)[0] != ((u_short *)&cs->cs_ip)[0] ||
        ((u_short *)ip)[3] != ((u_short *)&cs->cs_ip)[3] ||
        ((u_short *)ip)[4] != ((u_short *)&cs->cs_ip)[4] ||
-       th->th_off != oth->th_off ||
+       getth_off(*th) != getth_off(*oth) ||
        (deltaS > 5 && BCMP(ip + 1, &cs->cs_ip + 1, (deltaS - 5) << 2)) ||
-       (th->th_off > 5 && BCMP(th + 1, oth + 1, (th->th_off - 5) << 2)))
+       (getth_off(*th) > 5 && BCMP(th + 1, oth + 1, (getth_off(*th) - 5) << 2)))
        goto uncompressed;
 
     /*
@@ -414,8 +429,8 @@ vj_uncompress_uncomp(buf, comp)
     cs = &comp->rstate[comp->last_recv = ip->ip_p];
     comp->flags &=~ VJF_TOSS;
     ip->ip_p = IPPROTO_TCP;
-    hlen = ip->ip_hl;
-    hlen += ((struct tcphdr *)&((int *)ip)[hlen])->th_off;
+    hlen = getip_hl(*ip);
+    hlen += getth_off(*((struct tcphdr *)&((int *)ip)[hlen]));
     hlen <<= 2;
     BCOPY(ip, &cs->cs_ip, hlen);
     cs->cs_hlen = hlen;
@@ -443,7 +458,6 @@ vj_uncompress_tcp(buf, buflen, total_len, comp, hdrp, hlenp)
     register u_int hlen, changes;
     register struct tcphdr *th;
     register struct cstate *cs;
-    register struct ip *ip;
     register u_short *bp;
     register u_int vjlen;
 
@@ -468,7 +482,7 @@ vj_uncompress_tcp(buf, buflen, total_len, comp, hdrp, hlenp)
        }
     }
     cs = &comp->rstate[comp->last_recv];
-    hlen = cs->cs_ip.ip_hl << 2;
+    hlen = getip_hl(cs->cs_ip) << 2;
     th = (struct tcphdr *)&((u_char *)&cs->cs_ip)[hlen];
     th->th_sum = htons((*cp << 8) | cp[1]);
     cp += 2;