diff options
| author | sam <sam@FreeBSD.org> | 2006-09-04 20:25:04 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2006-09-04 20:25:04 +0000 |
| commit | a8bc04a53e80c5d3caf667ed73ed30a17f5bd59d (patch) | |
| tree | f2c7f7e1286aabfb28d9294895c2ffe8abac34a0 /contrib/tcpdump/print-ipx.c | |
| parent | 6bf6a28af37230c5ca61c232f2749a46397da00a (diff) | |
| download | FreeBSD-src-a8bc04a53e80c5d3caf667ed73ed30a17f5bd59d.zip FreeBSD-src-a8bc04a53e80c5d3caf667ed73ed30a17f5bd59d.tar.gz | |
resolve merge conflicts
MFC after: 1 month
Diffstat (limited to 'contrib/tcpdump/print-ipx.c')
| -rw-r--r-- | contrib/tcpdump/print-ipx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/tcpdump/print-ipx.c b/contrib/tcpdump/print-ipx.c index 4afc4b3..6459b31 100644 --- a/contrib/tcpdump/print-ipx.c +++ b/contrib/tcpdump/print-ipx.c @@ -198,7 +198,7 @@ ipx_rip_print(const u_short *ipx, u_int length) (void)printf("ipx-rip-req"); if (length > 0) { TCHECK(ipx[3]); - (void)printf(" %x/%d.%d", EXTRACT_32BITS(&ipx[0]), + (void)printf(" %u/%d.%d", EXTRACT_32BITS(&ipx[0]), EXTRACT_16BITS(&ipx[2]), EXTRACT_16BITS(&ipx[3])); } break; @@ -206,7 +206,7 @@ ipx_rip_print(const u_short *ipx, u_int length) (void)printf("ipx-rip-resp"); for (i = 0; i < 50 && length > 0; i++) { TCHECK(ipx[3]); - (void)printf(" %x/%d.%d", EXTRACT_32BITS(&ipx[0]), + (void)printf(" %u/%d.%d", EXTRACT_32BITS(&ipx[0]), EXTRACT_16BITS(&ipx[2]), EXTRACT_16BITS(&ipx[3])); ipx += 4; |
