mirrors/ppp
0
0
Fork 0
mirror of https://github.com/paulusmack/ppp.git synced 2024-12-12 04:43:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

support AIX4 and OSF1 as well as SunOS 4

Browse Source
This commit is contained in:
Paul Mackerras 1994-12-08 00:35:33 +00:00
parent 13db890cb7
commit 5079a982cc
2 changed files with 62 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
modules/bsd-comp.c
View File

@ -38,20 +38,40 @@
*/ */
/* /*
* This version is for use with STREAMS under SunOS 4.x. * This version is for use with STREAMS under SunOS 4.x,
* DEC Alpha OSF/1, and AIX 4.x.
* *
* $Id: bsd-comp.c,v 1.7 1994/11/30 05:29:36 paulus Exp $ * $Id: bsd-comp.c,v 1.8 1994/12/08 00:35:33 paulus Exp $
*/ */
#ifdef __aix4__
#include <net/net_globals.h>
#endif
#include <sys/param.h> #include <sys/param.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stream.h> #include <sys/stream.h>
#include <sys/kmem_alloc.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <net/if.h> #include <net/if.h>
#include <net/ppp_defs.h> #include <net/ppp_defs.h>
#include <net/ppp_str.h> #include <net/ppp_str.h>
#ifdef sun
#include <sys/kmem_alloc.h>
#define ALLOCATE(n) kmem_alloc((n), KMEM_NOSLEEP)
#define FREE(p, n) kmem_free((p), (n))
#endif
#ifdef __osf__
#include <kern/kalloc.h>
#define ALLOCATE(n) kalloc((n))
#define FREE(p, n) kfree((p), (n))
#endif
#ifdef __aix4__
#define ALLOCATE(n) xmalloc((n), 0, pinned_heap)
#define FREE(p, n) xmfree((p), pinned_heap)
#endif
#define PACKETPTR mblk_t * #define PACKETPTR mblk_t *
#include <net/ppp-comp.h> #include <net/ppp-comp.h>
@ -352,7 +372,7 @@ bsd_alloc(options, opt_len, decomp)
maxmaxcode = MAXCODE(bits); maxmaxcode = MAXCODE(bits);
newlen = sizeof(*db) + (hsize-1) * (sizeof(db->dict[0])); newlen = sizeof(*db) + (hsize-1) * (sizeof(db->dict[0]));
db = (struct bsd_db *) kmem_alloc(newlen, KMEM_NOSLEEP); db = (struct bsd_db *) ALLOCATE(newlen);
if (!db) if (!db)
return NULL; return NULL;
bzero(db, sizeof(*db) - sizeof(db->dict)); bzero(db, sizeof(*db) - sizeof(db->dict));
@ -360,10 +380,9 @@ bsd_alloc(options, opt_len, decomp)
if (!decomp) { if (!decomp) {
db->lens = NULL; db->lens = NULL;
} else { } else {
db->lens = (u_short *) kmem_alloc((maxmaxcode+1) * sizeof(db->lens[0]), db->lens = (u_short *) ALLOCATE((maxmaxcode+1) * sizeof(db->lens[0]));
KMEM_NOSLEEP);
if (!db->lens) { if (!db->lens) {
kmem_free(db, newlen); FREE(db, newlen);
return NULL; return NULL;
} }
} }
@ -384,8 +403,8 @@ bsd_free(state)
struct bsd_db *db = (struct bsd_db *) state; struct bsd_db *db = (struct bsd_db *) state;
if (db->lens) if (db->lens)
kmem_free(db->lens, (db->maxmaxcode+1) * sizeof(db->lens[0])); FREE(db->lens, (db->maxmaxcode+1) * sizeof(db->lens[0]));
kmem_free(db, db->totlen); FREE(db, db->totlen);
} }
static void * static void *

48
modules/vjcompress.c
View File

@ -24,13 +24,24 @@
* so that the entire packet being decompressed doesn't have * so that the entire packet being decompressed doesn't have
* to be in contiguous memory (just the compressed header). * to be in contiguous memory (just the compressed header).
* *
* $Id: vjcompress.c,v 1.3 1994/11/30 05:31:00 paulus Exp $ * $Id: vjcompress.c,v 1.4 1994/12/08 00:35:33 paulus Exp $
*/ */
#include <sys/types.h> #include <sys/types.h>
#include <sys/param.h> #include <sys/param.h>
#ifdef __osf__
#include <net/net_globals.h>
#endif
#include <netinet/in.h> #include <netinet/in.h>
#ifdef __aix4__
#define _NETINET_IN_SYSTM_H_
typedef u_long n_long;
#else
#include <netinet/in_systm.h> #include <netinet/in_systm.h>
#endif
#include <netinet/ip.h> #include <netinet/ip.h>
#include <netinet/tcp.h> #include <netinet/tcp.h>
@ -50,6 +61,15 @@
#define ovbcopy bcopy #define ovbcopy bcopy
#endif #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 void
vj_compress_init(comp, max_state) vj_compress_init(comp, max_state)
struct vjcompress *comp; struct vjcompress *comp;
@ -104,7 +124,7 @@ vj_compress_init(comp, max_state)
(f) = htonl(ntohl(f) + ((cp[1] << 8) | cp[2])); \ (f) = htonl(ntohl(f) + ((cp[1] << 8) | cp[2])); \
cp += 3; \ cp += 3; \
} else { \ } else { \
(f) = htonl(ntohl(f) + (u_long)*cp++); \ (f) = htonl(ntohl(f) + (u_int32_t)*cp++); \
} \ } \
} }
@ -113,7 +133,7 @@ vj_compress_init(comp, max_state)
(f) = htons(ntohs(f) + ((cp[1] << 8) | cp[2])); \ (f) = htons(ntohs(f) + ((cp[1] << 8) | cp[2])); \
cp += 3; \ cp += 3; \
} else { \ } else { \
(f) = htons(ntohs(f) + (u_long)*cp++); \ (f) = htons(ntohs(f) + (u_int32_t)*cp++); \
} \ } \
} }
@ -122,7 +142,7 @@ vj_compress_init(comp, max_state)
(f) = htons((cp[1] << 8) | cp[2]); \ (f) = htons((cp[1] << 8) | cp[2]); \
cp += 3; \ cp += 3; \
} else { \ } else { \
(f) = htons((u_long)*cp++); \ (f) = htons((u_int32_t)*cp++); \
} \ } \
} }
@ -135,7 +155,7 @@ vj_compress_tcp(ip, mlen, comp, compress_cid, vjhdrp)
u_char **vjhdrp; u_char **vjhdrp;
{ {
register struct cstate *cs = comp->last_cs->cs_next; 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 *oth;
register struct tcphdr *th; register struct tcphdr *th;
register u_int deltaS, deltaA; register u_int deltaS, deltaA;
@ -165,7 +185,7 @@ vj_compress_tcp(ip, mlen, comp, compress_cid, vjhdrp)
INCR(vjs_packets); INCR(vjs_packets);
if (ip->ip_src.s_addr != cs->cs_ip.ip_src.s_addr || 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 || 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. * Wasn't the first -- search for it.
* *
@ -186,7 +206,7 @@ vj_compress_tcp(ip, mlen, comp, compress_cid, vjhdrp)
INCR(vjs_searches); INCR(vjs_searches);
if (ip->ip_src.s_addr == cs->cs_ip.ip_src.s_addr 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 && 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; goto found;
} while (cs != lastcs); } while (cs != lastcs);
@ -200,7 +220,7 @@ vj_compress_tcp(ip, mlen, comp, compress_cid, vjhdrp)
*/ */
INCR(vjs_misses); INCR(vjs_misses);
comp->last_cs = lcs; comp->last_cs = lcs;
hlen += th->th_off; hlen += getth_off(*th);
hlen <<= 2; hlen <<= 2;
if (hlen > mlen) if (hlen > mlen)
return (TYPE_IP); return (TYPE_IP);
@ -232,7 +252,7 @@ vj_compress_tcp(ip, mlen, comp, compress_cid, vjhdrp)
*/ */
oth = (struct tcphdr *)&((int *)&cs->cs_ip)[hlen]; oth = (struct tcphdr *)&((int *)&cs->cs_ip)[hlen];
deltaS = hlen; deltaS = hlen;
hlen += th->th_off; hlen += getth_off(*th);
hlen <<= 2; hlen <<= 2;
if (hlen > mlen) if (hlen > mlen)
return (TYPE_IP); return (TYPE_IP);
@ -240,9 +260,9 @@ vj_compress_tcp(ip, mlen, comp, compress_cid, vjhdrp)
if (((u_short *)ip)[0] != ((u_short *)&cs->cs_ip)[0] || if (((u_short *)ip)[0] != ((u_short *)&cs->cs_ip)[0] ||
((u_short *)ip)[3] != ((u_short *)&cs->cs_ip)[3] || ((u_short *)ip)[3] != ((u_short *)&cs->cs_ip)[3] ||
((u_short *)ip)[4] != ((u_short *)&cs->cs_ip)[4] || ((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)) || (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; goto uncompressed;
/* /*
@ -409,8 +429,8 @@ vj_uncompress_uncomp(buf, comp)
cs = &comp->rstate[comp->last_recv = ip->ip_p]; cs = &comp->rstate[comp->last_recv = ip->ip_p];
comp->flags &=~ VJF_TOSS; comp->flags &=~ VJF_TOSS;
ip->ip_p = IPPROTO_TCP; ip->ip_p = IPPROTO_TCP;
hlen = ip->ip_hl; hlen = getip_hl(*ip);
hlen += ((struct tcphdr *)&((int *)ip)[hlen])->th_off; hlen += getth_off(*((struct tcphdr *)&((int *)ip)[hlen]));
hlen <<= 2; hlen <<= 2;
BCOPY(ip, &cs->cs_ip, hlen); BCOPY(ip, &cs->cs_ip, hlen);
cs->cs_hlen = hlen; cs->cs_hlen = hlen;
@ -462,7 +482,7 @@ vj_uncompress_tcp(buf, buflen, total_len, comp, hdrp, hlenp)
} }
} }
cs = &comp->rstate[comp->last_recv]; 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 = (struct tcphdr *)&((u_char *)&cs->cs_ip)[hlen];
th->th_sum = htons((*cp << 8) | cp[1]); th->th_sum = htons((*cp << 8) | cp[1]);
cp += 2; cp += 2;