diff options
| author | Brian Somers <brian@FreeBSD.org> | 1998-06-27 23:48:54 +0000 |
|---|---|---|
| committer | Brian Somers <brian@FreeBSD.org> | 1998-06-27 23:48:54 +0000 |
| commit | 3a2e4f621c7f05e1f6148507e3e5ca55ff3a01f0 (patch) | |
| tree | b1bbcd05e5a634e687dd81405ba92565b54b59e9 /usr.sbin/ppp/ip.c | |
| parent | 25d0f8a50ce1e1ebceaa3cff358a35287c4853ae (diff) | |
| download | src-test2-3a2e4f621c7f05e1f6148507e3e5ca55ff3a01f0.tar.gz src-test2-3a2e4f621c7f05e1f6148507e3e5ca55ff3a01f0.zip | |
Notes
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 d2c4fd31a926..393788bac9c0 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; |