diff options
author | gj <gj@FreeBSD.org> | 2000-04-04 09:20:53 +0000 |
---|---|---|
committer | gj <gj@FreeBSD.org> | 2000-04-04 09:20:53 +0000 |
commit | 8efc52e23945fe19a226d0f430ef1275dd820bfe (patch) | |
tree | 60fc66a7644584eff6566185dc14ceb7927a10f0 | |
parent | aef627d63f70cc2aa92ca509a7119f7838f842d9 (diff) | |
download | FreeBSD-src-8efc52e23945fe19a226d0f430ef1275dd820bfe.zip FreeBSD-src-8efc52e23945fe19a226d0f430ef1275dd820bfe.tar.gz |
Pass me the pointy hat.
It was not a good idea to remove csu_header from struct cspace, it had
ramifications which I didn't notice.
Restore src/usr.sbin/ppp/slcompress.h to the way it was, since MAX_HDR
was already defined as 128 there and it's a user program anyway.
In sys/net/slcompress.h make MAX_HDR 128 intead of MLEN to avoid
bloat.
My apologies for any inconvenience.
-rw-r--r-- | sys/net/slcompress.h | 7 | ||||
-rw-r--r-- | usr.sbin/ppp/slcompress.h | 10 |
2 files changed, 14 insertions, 3 deletions
diff --git a/sys/net/slcompress.h b/sys/net/slcompress.h index 4e20c37..6959db0 100644 --- a/sys/net/slcompress.h +++ b/sys/net/slcompress.h @@ -119,8 +119,13 @@ struct cstate { u_int16_t cs_hlen; /* size of hdr (receive only) */ u_char cs_id; /* connection # associated with this state */ u_char cs_filler; - struct ip cs_ip; /* ip/tcp hdr from most recent packet */ + union { + char csu_hdr[MAX_HDR]; + struct ip csu_ip; /* ip/tcp hdr from most recent packet */ + } slcs_u; }; +#define cs_ip slcs_u.csu_ip +#define cs_hdr slcs_u.csu_hdr /* * all the state data for one serial line (we need one of these diff --git a/usr.sbin/ppp/slcompress.h b/usr.sbin/ppp/slcompress.h index 85aee74..099771b 100644 --- a/usr.sbin/ppp/slcompress.h +++ b/usr.sbin/ppp/slcompress.h @@ -102,8 +102,14 @@ struct cstate { u_short cs_hlen; /* size of hdr (receive only) */ u_char cs_id; /* connection # associated with this state */ u_char cs_filler; - struct ip cs_ip; /* ip/tcp hdr from most recent packet */ -}; + union { + char csu_hdr[MAX_HDR]; + struct ip csu_ip; /* ip/tcp hdr from most recent packet */ + } slcs_u; + }; + +#define cs_ip slcs_u.csu_ip +#define cs_hdr slcs_u.csu_hdr /* * all the state data for one serial line (we need one of these |