Deleted Added
sdiff udiff text old ( 111729 ) new ( 127675 )
full compact
print-null.c (111729) print-null.c (127675)
1/*
2 * Copyright (c) 1991, 1993, 1994, 1995, 1996, 1997
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that: (1) source code distributions
7 * retain the above copyright notice and this paragraph in its entirety, (2)
8 * distributions including binary code include the above copyright notice and

--- 4 unchanged lines hidden (view full) ---

13 * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
14 * the University nor the names of its contributors may be used to endorse
15 * or promote products derived from this software without specific prior
16 * written permission.
17 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
19 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
20 *
1/*
2 * Copyright (c) 1991, 1993, 1994, 1995, 1996, 1997
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that: (1) source code distributions
7 * retain the above copyright notice and this paragraph in its entirety, (2)
8 * distributions including binary code include the above copyright notice and

--- 4 unchanged lines hidden (view full) ---

13 * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
14 * the University nor the names of its contributors may be used to endorse
15 * or promote products derived from this software without specific prior
16 * written permission.
17 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
19 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
20 *
21 * $FreeBSD: head/contrib/tcpdump/print-null.c 111729 2003-03-02 08:25:48Z fenner $
21 * $FreeBSD: head/contrib/tcpdump/print-null.c 127675 2004-03-31 14:57:24Z bms $
22 */
23
24#ifndef lint
22 */
23
24#ifndef lint
25static const char rcsid[] =
26 "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.41.4.1 2002/06/01 23:51:15 guy Exp $ (LBL)";
25static const char rcsid[] _U_ =
26 "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.49.2.2 2003/11/16 08:51:36 guy Exp $ (LBL)";
27#endif
28
29#ifdef HAVE_CONFIG_H
30#include "config.h"
31#endif
32
27#endif
28
29#ifdef HAVE_CONFIG_H
30#include "config.h"
31#endif
32
33#include <sys/param.h>
34#include <sys/time.h>
35#include <sys/socket.h>
33#include <tcpdump-stdinc.h>
36
34
37#include <netinet/in.h>
38
39#include <pcap.h>
40#include <stdio.h>
41#include <string.h>
42
43#include "interface.h"
44#include "addrtoname.h"
45
46#include "ip.h"
47#ifdef INET6
48#include "ip6.h"
49#endif
50
35#include <pcap.h>
36#include <stdio.h>
37#include <string.h>
38
39#include "interface.h"
40#include "addrtoname.h"
41
42#include "ip.h"
43#ifdef INET6
44#include "ip6.h"
45#endif
46
51#ifndef AF_NS
52#define AF_NS 6 /* XEROX NS protocols */
53#endif
54
55/*
56 * The DLT_NULL packet header is 4 bytes long. It contains a host-byte-order
57 * 32-bit integer that specifies the family, e.g. AF_INET.
58 *
59 * Note here that "host" refers to the host on which the packets were
60 * captured; that isn't necessarily *this* host.
61 *
62 * The OpenBSD DLT_LOOP packet header is the same, except that the integer
63 * is in network byte order.
64 */
65#define NULL_HDRLEN 4
66
47/*
48 * The DLT_NULL packet header is 4 bytes long. It contains a host-byte-order
49 * 32-bit integer that specifies the family, e.g. AF_INET.
50 *
51 * Note here that "host" refers to the host on which the packets were
52 * captured; that isn't necessarily *this* host.
53 *
54 * The OpenBSD DLT_LOOP packet header is the same, except that the integer
55 * is in network byte order.
56 */
57#define NULL_HDRLEN 4
58
59/*
60 * BSD AF_ values.
61 *
62 * Unfortunately, the BSDs don't all use the same value for AF_INET6,
63 * so, because we want to be able to read captures from all of the BSDs,
64 * we check for all of them.
65 */
66#define BSD_AF_INET 2
67#define BSD_AF_NS 6 /* XEROX NS protocols */
68#define BSD_AF_ISO 7
69#define BSD_AF_APPLETALK 16
70#define BSD_AF_IPX 23
71#define BSD_AF_INET6_BSD 24 /* OpenBSD (and probably NetBSD), BSD/OS */
72#define BSD_AF_INET6_FREEBSD 28
73#define BSD_AF_INET6_DARWIN 30
74
67static void
68null_print(u_int family, u_int length)
69{
70 if (nflag)
71 printf("AF %u ", family);
72 else {
73 switch (family) {
74
75static void
76null_print(u_int family, u_int length)
77{
78 if (nflag)
79 printf("AF %u ", family);
80 else {
81 switch (family) {
82
75 case AF_INET:
83 case BSD_AF_INET:
76 printf("ip ");
77 break;
78
79#ifdef INET6
84 printf("ip ");
85 break;
86
87#ifdef INET6
80 case AF_INET6:
88 case BSD_AF_INET6_BSD:
89 case BSD_AF_INET6_FREEBSD:
90 case BSD_AF_INET6_DARWIN:
81 printf("ip6 ");
82 break;
83#endif
84
91 printf("ip6 ");
92 break;
93#endif
94
85 case AF_NS:
95 case BSD_AF_NS:
86 printf("ns ");
87 break;
88
96 printf("ns ");
97 break;
98
99 case BSD_AF_ISO:
100 printf("osi ");
101 break;
102
103 case BSD_AF_APPLETALK:
104 printf("atalk ");
105 break;
106
107 case BSD_AF_IPX:
108 printf("ipx ");
109 break;
110
89 default:
90 printf("AF %u ", family);
91 break;
92 }
93 }
94 printf("%d: ", length);
95}
96
97/*
98 * Byte-swap a 32-bit number.
99 * ("htonl()" or "ntohl()" won't work - we want to byte-swap even on
100 * big-endian platforms.)
101 */
102#define SWAPLONG(y) \
103((((y)&0xff)<<24) | (((y)&0xff00)<<8) | (((y)&0xff0000)>>8) | (((y)>>24)&0xff))
104
111 default:
112 printf("AF %u ", family);
113 break;
114 }
115 }
116 printf("%d: ", length);
117}
118
119/*
120 * Byte-swap a 32-bit number.
121 * ("htonl()" or "ntohl()" won't work - we want to byte-swap even on
122 * big-endian platforms.)
123 */
124#define SWAPLONG(y) \
125((((y)&0xff)<<24) | (((y)&0xff00)<<8) | (((y)&0xff0000)>>8) | (((y)>>24)&0xff))
126
105void
106null_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
127/*
128 * This is the top level routine of the printer. 'p' points
129 * to the ether header of the packet, 'h->ts' is the timestamp,
130 * 'h->length' is the length of the packet off the wire, and 'h->caplen'
131 * is the number of bytes actually captured.
132 */
133u_int
134null_if_print(const struct pcap_pkthdr *h, const u_char *p)
107{
108 u_int length = h->len;
109 u_int caplen = h->caplen;
135{
136 u_int length = h->len;
137 u_int caplen = h->caplen;
110 const struct ip *ip;
111 u_int family;
112
138 u_int family;
139
113 ++infodelay;
114 ts_print(&h->ts);
140 if (caplen < NULL_HDRLEN) {
141 printf("[|null]");
142 return (NULL_HDRLEN);
143 }
115
116 memcpy((char *)&family, (char *)p, sizeof(family));
117
118 /*
119 * This isn't necessarily in our host byte order; if this is
120 * a DLT_LOOP capture, it's in network byte order, and if
121 * this is a DLT_NULL capture from a machine with the opposite
122 * byte-order, it's in the opposite byte order from ours.
123 *
124 * If the upper 16 bits aren't all zero, assume it's byte-swapped.
125 */
126 if ((family & 0xFFFF0000) != 0)
127 family = SWAPLONG(family);
128
144
145 memcpy((char *)&family, (char *)p, sizeof(family));
146
147 /*
148 * This isn't necessarily in our host byte order; if this is
149 * a DLT_LOOP capture, it's in network byte order, and if
150 * this is a DLT_NULL capture from a machine with the opposite
151 * byte-order, it's in the opposite byte order from ours.
152 *
153 * If the upper 16 bits aren't all zero, assume it's byte-swapped.
154 */
155 if ((family & 0xFFFF0000) != 0)
156 family = SWAPLONG(family);
157
129 /*
130 * Some printers want to get back at the link level addresses,
131 * and/or check that they're not walking off the end of the packet.
132 * Rather than pass them all the way down, we set these globals.
133 */
134 packetp = p;
135 snapend = p + caplen;
136
137 length -= NULL_HDRLEN;
158 length -= NULL_HDRLEN;
159 caplen -= NULL_HDRLEN;
160 p += NULL_HDRLEN;
138
161
139 ip = (struct ip *)(p + NULL_HDRLEN);
140
141 if (eflag)
142 null_print(family, length);
143
162 if (eflag)
163 null_print(family, length);
164
144 switch (IP_V(ip)) {
145 case 4:
146 ip_print((const u_char *)ip, length);
165 switch (family) {
166
167 case BSD_AF_INET:
168 ip_print(p, length);
147 break;
169 break;
170
148#ifdef INET6
171#ifdef INET6
149 case 6:
150 ip6_print((const u_char *)ip, length);
172 case BSD_AF_INET6_BSD:
173 case BSD_AF_INET6_FREEBSD:
174 case BSD_AF_INET6_DARWIN:
175 ip6_print(p, length);
151 break;
176 break;
152#endif /* INET6 */
153 default:
154 printf("ip v%d", IP_V(ip));
177#endif
178
179 case BSD_AF_ISO:
180 isoclns_print(p, length, caplen);
155 break;
181 break;
182
183 case BSD_AF_APPLETALK:
184 atalk_print(p, length);
185 break;
186
187 case BSD_AF_IPX:
188 ipx_print(p, length);
189 break;
190
191 default:
192 /* unknown AF_ value */
193 if (!eflag)
194 null_print(family, length + NULL_HDRLEN);
195 if (!xflag && !qflag)
196 default_print(p, caplen);
156 }
157
197 }
198
158 if (xflag)
159 default_print((const u_char *)ip, caplen - NULL_HDRLEN);
160 putchar('\n');
161 --infodelay;
162 if (infoprint)
163 info(0);
199 return (NULL_HDRLEN);
164}
165
200}
201