diff options
| author | brian <brian@FreeBSD.org> | 1998-06-27 23:48:54 +0000 |
|---|---|---|
| committer | brian <brian@FreeBSD.org> | 1998-06-27 23:48:54 +0000 |
| commit | ecefb9d1a210a6c86638b396ea5ece55c433bc66 (patch) | |
| tree | 0a77c0e67b7da6215327359880d61c222fd24aa7 /usr.sbin/ppp/ip.c | |
| parent | 40b850dd415ad2adcddb88549067b23762bce91a (diff) | |
| download | FreeBSD-src-ecefb9d1a210a6c86638b396ea5ece55c433bc66.zip FreeBSD-src-ecefb9d1a210a6c86638b396ea5ece55c433bc66.tar.gz | |
o Fix remaining sizeof problems for 64 bit machines.
o Allow ``set ....'' when we have multiple links but aren't in
multilink mode.
o Do a TLS when we receive a ``Open'' event in ``Closed'' state,
despite the rfc state transition table. This is clearly an
error in the RFC as TLS cannot have yet been called (without
TLF) in the ``Closed'' state.
I've posted a message to comp.protocols.ppp for confirmation.
Diffstat (limited to 'usr.sbin/ppp/ip.c')
| -rw-r--r-- | usr.sbin/ppp/ip.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.sbin/ppp/ip.c b/usr.sbin/ppp/ip.c index d2c4fd3..393788b 100644 --- a/usr.sbin/ppp/ip.c +++ b/usr.sbin/ppp/ip.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: ip.c,v 1.46 1998/06/27 14:17:26 brian Exp $ + * $Id: ip.c,v 1.47 1998/06/27 14:18:05 brian Exp $ * * TODO: * o Return ICMP message for filterd packet @@ -333,8 +333,8 @@ PacketCheck(struct bundle *bundle, char *cp, int nb, struct filter *filter) n++; } snprintf(logbuf + loglen, sizeof logbuf - loglen, - " seq:%x ack:%x (%d/%d)", - ntohl(th->th_seq), ntohl(th->th_ack), len, nb); + " seq:%lx ack:%lx (%d/%d)", + (u_long)ntohl(th->th_seq), (u_long)ntohl(th->th_ack), len, nb); loglen += strlen(logbuf + loglen); if ((th->th_flags & TH_SYN) && nb > 40) { u_short *sp; @@ -379,7 +379,9 @@ ip_Input(struct bundle *bundle, struct mbuf * bp) int nb, nw; struct tun_data tun; struct ip *pip = (struct ip *)tun.data; +#ifndef NOALIAS struct ip *piip = (struct ip *)((char *)pip + (pip->ip_hl << 2)); +#endif tun_fill_header(tun, AF_INET); cp = tun.data; |
