Deleted Added
full compact
print-udp.c (56896) print-udp.c (75118)
1/*
2 * Copyright (c) 1988, 1989, 1990, 1991, 1992, 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) 1988, 1989, 1990, 1991, 1992, 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-udp.c 56896 2000-01-30 01:05:24Z fenner $
21 * $FreeBSD: head/contrib/tcpdump/print-udp.c 75118 2001-04-03 07:50:46Z fenner $
22 */
23
24#ifndef lint
25static const char rcsid[] =
22 */
23
24#ifndef lint
25static const char rcsid[] =
26 "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.70 1999/12/22 06:27:23 itojun Exp $ (LBL)";
26 "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.90 2000/12/23 20:55:22 guy Exp $ (LBL)";
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>
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>
36
37#include <netinet/in.h>
35
36#include <netinet/in.h>
38#include <netinet/in_systm.h>
39#include <netinet/ip.h>
40#include <netinet/ip_var.h>
41#include <netinet/udp.h>
42#include <netinet/udp_var.h>
43
37
44#ifdef NOERROR
45#undef NOERROR /* Solaris sucks */
46#endif
47#ifdef T_UNSPEC
48#undef T_UNSPEC /* SINIX does too */
49#endif
50#include <arpa/nameser.h>
51#ifdef SEGSIZE
52#undef SEGSIZE
53#endif
54#include <arpa/tftp.h>
55
56#include <rpc/rpc.h>
57
58#include <stdio.h>
38#ifdef SEGSIZE
39#undef SEGSIZE
40#endif
41#include <arpa/tftp.h>
42
43#include <rpc/rpc.h>
44
45#include <stdio.h>
46#include <string.h>
59
47
60#ifdef INET6
61#include <netinet/ip6.h>
62#endif
63
64#include "interface.h"
65#include "addrtoname.h"
66#include "appletalk.h"
67
48#include "interface.h"
49#include "addrtoname.h"
50#include "appletalk.h"
51
52#include "udp.h"
53
54#include "ip.h"
55#ifdef INET6
56#include "ip6.h"
57#endif
58
59#ifdef NOERROR
60#undef NOERROR /* Solaris sucks */
61#endif
62#ifdef T_UNSPEC
63#undef T_UNSPEC /* SINIX does too */
64#endif
65#include "nameser.h"
68#include "nfs.h"
69#include "bootp.h"
70
71struct rtcphdr {
66#include "nfs.h"
67#include "bootp.h"
68
69struct rtcphdr {
72 u_short rh_flags; /* T:2 P:1 CNT:5 PT:8 */
73 u_short rh_len; /* length of message (in words) */
74 u_int rh_ssrc; /* synchronization src id */
70 u_int16_t rh_flags; /* T:2 P:1 CNT:5 PT:8 */
71 u_int16_t rh_len; /* length of message (in words) */
72 u_int32_t rh_ssrc; /* synchronization src id */
75};
76
77typedef struct {
73};
74
75typedef struct {
78 u_int upper; /* more significant 32 bits */
79 u_int lower; /* less significant 32 bits */
76 u_int32_t upper; /* more significant 32 bits */
77 u_int32_t lower; /* less significant 32 bits */
80} ntp64;
81
82/*
83 * Sender report.
84 */
85struct rtcp_sr {
86 ntp64 sr_ntp; /* 64-bit ntp timestamp */
78} ntp64;
79
80/*
81 * Sender report.
82 */
83struct rtcp_sr {
84 ntp64 sr_ntp; /* 64-bit ntp timestamp */
87 u_int sr_ts; /* reference media timestamp */
88 u_int sr_np; /* no. packets sent */
89 u_int sr_nb; /* no. bytes sent */
85 u_int32_t sr_ts; /* reference media timestamp */
86 u_int32_t sr_np; /* no. packets sent */
87 u_int32_t sr_nb; /* no. bytes sent */
90};
91
92/*
93 * Receiver report.
94 * Time stamps are middle 32-bits of ntp timestamp.
95 */
96struct rtcp_rr {
88};
89
90/*
91 * Receiver report.
92 * Time stamps are middle 32-bits of ntp timestamp.
93 */
94struct rtcp_rr {
97 u_int rr_srcid; /* sender being reported */
98 u_int rr_nl; /* no. packets lost */
99 u_int rr_ls; /* extended last seq number received */
100 u_int rr_dv; /* jitter (delay variance) */
101 u_int rr_lsr; /* orig. ts from last rr from this src */
102 u_int rr_dlsr; /* time from recpt of last rr to xmit time */
95 u_int32_t rr_srcid; /* sender being reported */
96 u_int32_t rr_nl; /* no. packets lost */
97 u_int32_t rr_ls; /* extended last seq number received */
98 u_int32_t rr_dv; /* jitter (delay variance) */
99 u_int32_t rr_lsr; /* orig. ts from last rr from this src */
100 u_int32_t rr_dlsr; /* time from recpt of last rr to xmit time */
103};
104
105/*XXX*/
106#define RTCP_PT_SR 200
107#define RTCP_PT_RR 201
108#define RTCP_PT_SDES 202
109#define RTCP_SDES_CNAME 1
110#define RTCP_SDES_NAME 2

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

116#define RTCP_SDES_PRIV 8
117#define RTCP_PT_BYE 203
118#define RTCP_PT_APP 204
119
120static void
121vat_print(const void *hdr, u_int len, register const struct udphdr *up)
122{
123 /* vat/vt audio */
101};
102
103/*XXX*/
104#define RTCP_PT_SR 200
105#define RTCP_PT_RR 201
106#define RTCP_PT_SDES 202
107#define RTCP_SDES_CNAME 1
108#define RTCP_SDES_NAME 2

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

114#define RTCP_SDES_PRIV 8
115#define RTCP_PT_BYE 203
116#define RTCP_PT_APP 204
117
118static void
119vat_print(const void *hdr, u_int len, register const struct udphdr *up)
120{
121 /* vat/vt audio */
124 u_int ts = *(u_short *)hdr;
122 u_int ts = *(u_int16_t *)hdr;
125 if ((ts & 0xf060) != 0) {
126 /* probably vt */
127 (void)printf(" udp/vt %u %d / %d",
128 (u_int32_t)(ntohs(up->uh_ulen) - sizeof(*up)),
129 ts & 0x3ff, ts >> 10);
130 } else {
131 /* probably vat */
123 if ((ts & 0xf060) != 0) {
124 /* probably vt */
125 (void)printf(" udp/vt %u %d / %d",
126 (u_int32_t)(ntohs(up->uh_ulen) - sizeof(*up)),
127 ts & 0x3ff, ts >> 10);
128 } else {
129 /* probably vat */
132 u_int i0 = ntohl(((u_int *)hdr)[0]);
133 u_int i1 = ntohl(((u_int *)hdr)[1]);
130 u_int32_t i0 = (u_int32_t)ntohl(((u_int *)hdr)[0]);
131 u_int32_t i1 = (u_int32_t)ntohl(((u_int *)hdr)[1]);
134 printf(" udp/vat %u c%d %u%s",
135 (u_int32_t)(ntohs(up->uh_ulen) - sizeof(*up) - 8),
136 i0 & 0xffff,
137 i1, i0 & 0x800000? "*" : "");
138 /* audio format */
139 if (i0 & 0x1f0000)
140 printf(" f%d", (i0 >> 16) & 0x1f);
141 if (i0 & 0x3f000000)
142 printf(" s%d", (i0 >> 24) & 0x3f);
143 }
144}
145
146static void
147rtp_print(const void *hdr, u_int len, register const struct udphdr *up)
148{
149 /* rtp v1 or v2 */
150 u_int *ip = (u_int *)hdr;
151 u_int hasopt, hasext, contype, hasmarker;
132 printf(" udp/vat %u c%d %u%s",
133 (u_int32_t)(ntohs(up->uh_ulen) - sizeof(*up) - 8),
134 i0 & 0xffff,
135 i1, i0 & 0x800000? "*" : "");
136 /* audio format */
137 if (i0 & 0x1f0000)
138 printf(" f%d", (i0 >> 16) & 0x1f);
139 if (i0 & 0x3f000000)
140 printf(" s%d", (i0 >> 24) & 0x3f);
141 }
142}
143
144static void
145rtp_print(const void *hdr, u_int len, register const struct udphdr *up)
146{
147 /* rtp v1 or v2 */
148 u_int *ip = (u_int *)hdr;
149 u_int hasopt, hasext, contype, hasmarker;
152 u_int i0 = ntohl(((u_int *)hdr)[0]);
153 u_int i1 = ntohl(((u_int *)hdr)[1]);
150 u_int32_t i0 = (u_int32_t)ntohl(((u_int *)hdr)[0]);
151 u_int32_t i1 = (u_int32_t)ntohl(((u_int *)hdr)[1]);
154 u_int dlen = ntohs(up->uh_ulen) - sizeof(*up) - 8;
155 const char * ptype;
156
157 ip += 2;
158 len >>= 2;
159 len -= 2;
160 hasopt = 0;
161 hasext = 0;

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

179 ptype,
180 dlen,
181 contype,
182 (hasopt || hasext)? "+" : "",
183 hasmarker? "*" : "",
184 i0 & 0xffff,
185 i1);
186 if (vflag) {
152 u_int dlen = ntohs(up->uh_ulen) - sizeof(*up) - 8;
153 const char * ptype;
154
155 ip += 2;
156 len >>= 2;
157 len -= 2;
158 hasopt = 0;
159 hasext = 0;

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

177 ptype,
178 dlen,
179 contype,
180 (hasopt || hasext)? "+" : "",
181 hasmarker? "*" : "",
182 i0 & 0xffff,
183 i1);
184 if (vflag) {
187 printf(" %u", i1);
185 printf(" %u", (u_int32_t)ntohl(((u_int *)hdr)[2]));
188 if (hasopt) {
189 u_int i2, optlen;
190 do {
191 i2 = ip[0];
192 optlen = (i2 >> 16) & 0xff;
193 if (optlen == 0 || optlen > len) {
194 printf(" !opt");
195 return;

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

216static const u_char *
217rtcp_print(const u_char *hdr, const u_char *ep)
218{
219 /* rtp v2 control (rtcp) */
220 struct rtcp_rr *rr = 0;
221 struct rtcp_sr *sr;
222 struct rtcphdr *rh = (struct rtcphdr *)hdr;
223 u_int len;
186 if (hasopt) {
187 u_int i2, optlen;
188 do {
189 i2 = ip[0];
190 optlen = (i2 >> 16) & 0xff;
191 if (optlen == 0 || optlen > len) {
192 printf(" !opt");
193 return;

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

214static const u_char *
215rtcp_print(const u_char *hdr, const u_char *ep)
216{
217 /* rtp v2 control (rtcp) */
218 struct rtcp_rr *rr = 0;
219 struct rtcp_sr *sr;
220 struct rtcphdr *rh = (struct rtcphdr *)hdr;
221 u_int len;
224 u_short flags;
222 u_int16_t flags;
225 int cnt;
226 double ts, dts;
227 if ((u_char *)(rh + 1) > ep) {
228 printf(" [|rtcp]");
229 return (ep);
230 }
231 len = (ntohs(rh->rh_len) + 1) * 4;
232 flags = ntohs(rh->rh_flags);
233 cnt = (flags >> 8) & 0x1f;
234 switch (flags & 0xff) {
235 case RTCP_PT_SR:
236 sr = (struct rtcp_sr *)(rh + 1);
237 printf(" sr");
238 if (len != cnt * sizeof(*rr) + sizeof(*sr) + sizeof(*rh))
239 printf(" [%d]", len);
240 if (vflag)
223 int cnt;
224 double ts, dts;
225 if ((u_char *)(rh + 1) > ep) {
226 printf(" [|rtcp]");
227 return (ep);
228 }
229 len = (ntohs(rh->rh_len) + 1) * 4;
230 flags = ntohs(rh->rh_flags);
231 cnt = (flags >> 8) & 0x1f;
232 switch (flags & 0xff) {
233 case RTCP_PT_SR:
234 sr = (struct rtcp_sr *)(rh + 1);
235 printf(" sr");
236 if (len != cnt * sizeof(*rr) + sizeof(*sr) + sizeof(*rh))
237 printf(" [%d]", len);
238 if (vflag)
241 printf(" %u", (u_int32_t)ntohl(rh->rh_ssrc));
239 printf(" %u", (u_int32_t)ntohl(rh->rh_ssrc));
242 if ((u_char *)(sr + 1) > ep) {
243 printf(" [|rtcp]");
244 return (ep);
245 }
246 ts = (double)((u_int32_t)ntohl(sr->sr_ntp.upper)) +
247 ((double)((u_int32_t)ntohl(sr->sr_ntp.lower)) /
248 4294967296.0);
249 printf(" @%.2f %u %up %ub", ts, (u_int32_t)ntohl(sr->sr_ts),
250 (u_int32_t)ntohl(sr->sr_np), (u_int32_t)ntohl(sr->sr_nb));
251 rr = (struct rtcp_rr *)(sr + 1);
252 break;
253 case RTCP_PT_RR:
254 printf(" rr");
255 if (len != cnt * sizeof(*rr) + sizeof(*rh))
256 printf(" [%d]", len);
257 rr = (struct rtcp_rr *)(rh + 1);
258 if (vflag)
240 if ((u_char *)(sr + 1) > ep) {
241 printf(" [|rtcp]");
242 return (ep);
243 }
244 ts = (double)((u_int32_t)ntohl(sr->sr_ntp.upper)) +
245 ((double)((u_int32_t)ntohl(sr->sr_ntp.lower)) /
246 4294967296.0);
247 printf(" @%.2f %u %up %ub", ts, (u_int32_t)ntohl(sr->sr_ts),
248 (u_int32_t)ntohl(sr->sr_np), (u_int32_t)ntohl(sr->sr_nb));
249 rr = (struct rtcp_rr *)(sr + 1);
250 break;
251 case RTCP_PT_RR:
252 printf(" rr");
253 if (len != cnt * sizeof(*rr) + sizeof(*rh))
254 printf(" [%d]", len);
255 rr = (struct rtcp_rr *)(rh + 1);
256 if (vflag)
259 printf(" %u", (u_int32_t)ntohl(rh->rh_ssrc));
257 printf(" %u", (u_int32_t)ntohl(rh->rh_ssrc));
260 break;
261 case RTCP_PT_SDES:
262 printf(" sdes %d", len);
263 if (vflag)
258 break;
259 case RTCP_PT_SDES:
260 printf(" sdes %d", len);
261 if (vflag)
264 printf(" %u", (u_int32_t)ntohl(rh->rh_ssrc));
262 printf(" %u", (u_int32_t)ntohl(rh->rh_ssrc));
265 cnt = 0;
266 break;
267 case RTCP_PT_BYE:
268 printf(" bye %d", len);
269 if (vflag)
263 cnt = 0;
264 break;
265 case RTCP_PT_BYE:
266 printf(" bye %d", len);
267 if (vflag)
270 printf(" %u", (u_int32_t)ntohl(rh->rh_ssrc));
268 printf(" %u", (u_int32_t)ntohl(rh->rh_ssrc));
271 cnt = 0;
272 break;
273 default:
274 printf(" type-0x%x %d", flags & 0xff, len);
275 cnt = 0;
276 break;
277 }
278 if (cnt > 1)

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

289 printf(" %ul %us %uj @%.2f+%.2f",
290 (u_int32_t)ntohl(rr->rr_nl) & 0x00ffffff,
291 (u_int32_t)ntohl(rr->rr_ls),
292 (u_int32_t)ntohl(rr->rr_dv), ts, dts);
293 }
294 return (hdr + len);
295}
296
269 cnt = 0;
270 break;
271 default:
272 printf(" type-0x%x %d", flags & 0xff, len);
273 cnt = 0;
274 break;
275 }
276 if (cnt > 1)

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

287 printf(" %ul %us %uj @%.2f+%.2f",
288 (u_int32_t)ntohl(rr->rr_nl) & 0x00ffffff,
289 (u_int32_t)ntohl(rr->rr_ls),
290 (u_int32_t)ntohl(rr->rr_dv), ts, dts);
291 }
292 return (hdr + len);
293}
294
295static int udp_cksum(register const struct ip *ip,
296 register const struct udphdr *up,
297 register int len)
298{
299 int i, tlen;
300 union phu {
301 struct phdr {
302 u_int32_t src;
303 u_int32_t dst;
304 u_char mbz;
305 u_char proto;
306 u_int16_t len;
307 } ph;
308 u_int16_t pa[6];
309 } phu;
310 register const u_int16_t *sp;
311 u_int32_t sum;
312 tlen = ntohs(ip->ip_len) - ((const char *)up-(const char*)ip);
313
314 /* pseudo-header.. */
315 phu.ph.len = htons(tlen);
316 phu.ph.mbz = 0;
317 phu.ph.proto = IPPROTO_UDP;
318 memcpy(&phu.ph.src, &ip->ip_src.s_addr, sizeof(u_int32_t));
319 memcpy(&phu.ph.dst, &ip->ip_dst.s_addr, sizeof(u_int32_t));
320
321 sp = &phu.pa[0];
322 sum = sp[0]+sp[1]+sp[2]+sp[3]+sp[4]+sp[5];
323
324 sp = (const u_int16_t *)up;
325
326 for (i=0; i<(tlen&~1); i+= 2)
327 sum += *sp++;
328
329 if (tlen & 1) {
330 sum += htons( (*(const u_int8_t *)sp) << 8);
331 }
332
333 while (sum > 0xffff)
334 sum = (sum & 0xffff) + (sum >> 16);
335 sum = ~sum & 0xffff;
336
337 return (sum);
338}
339
340#ifdef INET6
341static int udp6_cksum(const struct ip6_hdr *ip6, const struct udphdr *up,
342 int len)
343{
344 int i, tlen;
345 register const u_int16_t *sp;
346 u_int32_t sum;
347 union {
348 struct {
349 struct in6_addr ph_src;
350 struct in6_addr ph_dst;
351 u_int32_t ph_len;
352 u_int8_t ph_zero[3];
353 u_int8_t ph_nxt;
354 } ph;
355 u_int16_t pa[20];
356 } phu;
357
358 tlen = ntohs(ip6->ip6_plen) + sizeof(struct ip6_hdr) -
359 ((const char *)up - (const char*)ip6);
360
361 /* pseudo-header */
362 memset(&phu, 0, sizeof(phu));
363 phu.ph.ph_src = ip6->ip6_src;
364 phu.ph.ph_dst = ip6->ip6_dst;
365 phu.ph.ph_len = htonl(tlen);
366 phu.ph.ph_nxt = IPPROTO_UDP;
367
368 sum = 0;
369 for (i = 0; i < sizeof(phu.pa) / sizeof(phu.pa[0]); i++)
370 sum += phu.pa[i];
371
372 sp = (const u_int16_t *)up;
373
374 for (i = 0; i < (tlen & ~1); i += 2)
375 sum += *sp++;
376
377 if (tlen & 1)
378 sum += htons((*(const u_int8_t *)sp) << 8);
379
380 while (sum > 0xffff)
381 sum = (sum & 0xffff) + (sum >> 16);
382 sum = ~sum & 0xffff;
383
384 return (sum);
385}
386#endif
387
388
297/* XXX probably should use getservbyname() and cache answers */
298#define TFTP_PORT 69 /*XXX*/
299#define KERBEROS_PORT 88 /*XXX*/
300#define SUNRPC_PORT 111 /*XXX*/
301#define SNMP_PORT 161 /*XXX*/
302#define NTP_PORT 123 /*XXX*/
303#define SNMPTRAP_PORT 162 /*XXX*/
304#define ISAKMP_PORT 500 /*XXX*/
389/* XXX probably should use getservbyname() and cache answers */
390#define TFTP_PORT 69 /*XXX*/
391#define KERBEROS_PORT 88 /*XXX*/
392#define SUNRPC_PORT 111 /*XXX*/
393#define SNMP_PORT 161 /*XXX*/
394#define NTP_PORT 123 /*XXX*/
395#define SNMPTRAP_PORT 162 /*XXX*/
396#define ISAKMP_PORT 500 /*XXX*/
397#define TIMED_PORT 525 /*XXX*/
305#define RIP_PORT 520 /*XXX*/
306#define KERBEROS_SEC_PORT 750 /*XXX*/
307#define L2TP_PORT 1701 /*XXX*/
308#define ISAKMP_PORT_USER1 7500 /*??? - nonstandard*/
309#define ISAKMP_PORT_USER2 8500 /*??? - nonstandard*/
310#define RX_PORT_LOW 7000 /*XXX*/
311#define RX_PORT_HIGH 7009 /*XXX*/
312#define NETBIOS_NS_PORT 137
313#define NETBIOS_DGRAM_PORT 138
314#define CISCO_AUTORP_PORT 496 /*XXX*/
398#define RIP_PORT 520 /*XXX*/
399#define KERBEROS_SEC_PORT 750 /*XXX*/
400#define L2TP_PORT 1701 /*XXX*/
401#define ISAKMP_PORT_USER1 7500 /*??? - nonstandard*/
402#define ISAKMP_PORT_USER2 8500 /*??? - nonstandard*/
403#define RX_PORT_LOW 7000 /*XXX*/
404#define RX_PORT_HIGH 7009 /*XXX*/
405#define NETBIOS_NS_PORT 137
406#define NETBIOS_DGRAM_PORT 138
407#define CISCO_AUTORP_PORT 496 /*XXX*/
408#define RADIUS_PORT 1645
409#define RADIUS_NEW_PORT 1812
410#define RADIUS_ACCOUNTING_PORT 1646
411#define RADIUS_NEW_ACCOUNTING_PORT 1813
315
316#ifdef INET6
317#define RIPNG_PORT 521 /*XXX*/
318#define DHCP6_SERV_PORT 546 /*XXX*/
319#define DHCP6_CLI_PORT 547 /*XXX*/
320#endif
321
322void
412
413#ifdef INET6
414#define RIPNG_PORT 521 /*XXX*/
415#define DHCP6_SERV_PORT 546 /*XXX*/
416#define DHCP6_CLI_PORT 547 /*XXX*/
417#endif
418
419void
323udp_print(register const u_char *bp, u_int length, register const u_char *bp2)
420udp_print(register const u_char *bp, u_int length,
421 register const u_char *bp2, int fragmented)
324{
325 register const struct udphdr *up;
326 register const struct ip *ip;
327 register const u_char *cp;
328 register const u_char *ep = bp + length;
422{
423 register const struct udphdr *up;
424 register const struct ip *ip;
425 register const u_char *cp;
426 register const u_char *ep = bp + length;
329 u_short sport, dport, ulen;
427 u_int16_t sport, dport, ulen;
330#ifdef INET6
331 register const struct ip6_hdr *ip6;
332#endif
333
334 if (ep > snapend)
335 ep = snapend;
336 up = (struct udphdr *)bp;
337 ip = (struct ip *)bp2;
338#ifdef INET6
428#ifdef INET6
429 register const struct ip6_hdr *ip6;
430#endif
431
432 if (ep > snapend)
433 ep = snapend;
434 up = (struct udphdr *)bp;
435 ip = (struct ip *)bp2;
436#ifdef INET6
339 if (ip->ip_v == 6)
437 if (IP_V(ip) == 6)
340 ip6 = (struct ip6_hdr *)bp2;
341 else
342 ip6 = NULL;
343#endif /*INET6*/
344 cp = (u_char *)(up + 1);
345 if (cp > snapend) {
346 (void)printf("%s > %s: [|udp]",
347 ipaddr_string(&ip->ip_src), ipaddr_string(&ip->ip_dst));

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

353 length);
354 return;
355 }
356 length -= sizeof(struct udphdr);
357
358 sport = ntohs(up->uh_sport);
359 dport = ntohs(up->uh_dport);
360 ulen = ntohs(up->uh_ulen);
438 ip6 = (struct ip6_hdr *)bp2;
439 else
440 ip6 = NULL;
441#endif /*INET6*/
442 cp = (u_char *)(up + 1);
443 if (cp > snapend) {
444 (void)printf("%s > %s: [|udp]",
445 ipaddr_string(&ip->ip_src), ipaddr_string(&ip->ip_dst));

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

451 length);
452 return;
453 }
454 length -= sizeof(struct udphdr);
455
456 sport = ntohs(up->uh_sport);
457 dport = ntohs(up->uh_dport);
458 ulen = ntohs(up->uh_ulen);
459 if (ulen < 8) {
460 (void)printf("%s > %s: truncated-udplength %d",
461 ipaddr_string(&ip->ip_src),
462 ipaddr_string(&ip->ip_dst),
463 ulen);
464 return;
465 }
361 if (packettype) {
362 register struct rpc_msg *rp;
363 enum msg_type direction;
364
365 switch (packettype) {
366
367 case PT_VAT:
368 (void)printf("%s.%s > %s.%s:",

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

415 case PT_SNMP:
416 (void)printf("%s.%s > %s.%s:",
417 ipaddr_string(&ip->ip_src),
418 udpport_string(sport),
419 ipaddr_string(&ip->ip_dst),
420 udpport_string(dport));
421 snmp_print((const u_char *)(up + 1), length);
422 break;
466 if (packettype) {
467 register struct rpc_msg *rp;
468 enum msg_type direction;
469
470 switch (packettype) {
471
472 case PT_VAT:
473 (void)printf("%s.%s > %s.%s:",

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

520 case PT_SNMP:
521 (void)printf("%s.%s > %s.%s:",
522 ipaddr_string(&ip->ip_src),
523 udpport_string(sport),
524 ipaddr_string(&ip->ip_dst),
525 udpport_string(dport));
526 snmp_print((const u_char *)(up + 1), length);
527 break;
528
529 case PT_CNFP:
530 (void)printf("%s.%s > %s.%s:",
531 ipaddr_string(&ip->ip_src),
532 udpport_string(sport),
533 ipaddr_string(&ip->ip_dst),
534 udpport_string(dport));
535 cnfp_print(cp, length, (const u_char *)ip);
536 break;
423 }
424 return;
425 }
426
427 if (!qflag) {
428 register struct rpc_msg *rp;
429 enum msg_type direction;
430

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

448 }
449#endif
450 }
451 if (TTEST(((struct LAP *)cp)->type) &&
452 ((struct LAP *)cp)->type == lapDDP &&
453 (atalk_port(sport) || atalk_port(dport))) {
454 if (vflag)
455 fputs("kip ", stdout);
537 }
538 return;
539 }
540
541 if (!qflag) {
542 register struct rpc_msg *rp;
543 enum msg_type direction;
544

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

562 }
563#endif
564 }
565 if (TTEST(((struct LAP *)cp)->type) &&
566 ((struct LAP *)cp)->type == lapDDP &&
567 (atalk_port(sport) || atalk_port(dport))) {
568 if (vflag)
569 fputs("kip ", stdout);
456 atalk_print(cp, length);
570 llap_print(cp, length);
457 return;
458 }
459 }
460#if 0
461 (void)printf("%s.%s > %s.%s:",
462 ipaddr_string(&ip->ip_src), udpport_string(sport),
463 ipaddr_string(&ip->ip_dst), udpport_string(dport));
464#else

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

485 udpport_string(dport));
486 } else {
487 (void)printf("%s > %s: ",
488 udpport_string(sport), udpport_string(dport));
489 }
490 }
491#endif
492
571 return;
572 }
573 }
574#if 0
575 (void)printf("%s.%s > %s.%s:",
576 ipaddr_string(&ip->ip_src), udpport_string(sport),
577 ipaddr_string(&ip->ip_dst), udpport_string(dport));
578#else

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

599 udpport_string(dport));
600 } else {
601 (void)printf("%s > %s: ",
602 udpport_string(sport), udpport_string(dport));
603 }
604 }
605#endif
606
607 if (IP_V(ip) == 4 && vflag && !fragmented) {
608 int sum = up->uh_sum;
609 if (sum == 0) {
610 (void)printf(" [no cksum]");
611 } else if (TTEST2(cp[0], length)) {
612 sum = udp_cksum(ip, up, length);
613 if (sum != 0)
614 (void)printf(" [bad udp cksum %x!]", sum);
615 else
616 (void)printf(" [udp sum ok]");
617 }
618 }
619#ifdef INET6
620 if (IP_V(ip) == 6 && ip6->ip6_plen && vflag && !fragmented) {
621 int sum = up->uh_sum;
622 /* for IPv6, UDP checksum is mandatory */
623 if (TTEST2(cp[0], length)) {
624 sum = udp6_cksum(ip6, up, length);
625 if (sum != 0)
626 (void)printf(" [bad udp cksum %x!]", sum);
627 else
628 (void)printf(" [udp sum ok]");
629 }
630 }
631#endif
632
493 if (!qflag) {
494#define ISPORT(p) (dport == (p) || sport == (p))
495 if (ISPORT(NAMESERVER_PORT))
496 ns_print((const u_char *)(up + 1), length);
633 if (!qflag) {
634#define ISPORT(p) (dport == (p) || sport == (p))
635 if (ISPORT(NAMESERVER_PORT))
636 ns_print((const u_char *)(up + 1), length);
637 else if (ISPORT(TIMED_PORT))
638 timed_print((const u_char *)(up + 1), length);
497 else if (ISPORT(TFTP_PORT))
498 tftp_print((const u_char *)(up + 1), length);
499 else if (ISPORT(IPPORT_BOOTPC) || ISPORT(IPPORT_BOOTPS))
500 bootp_print((const u_char *)(up + 1), length,
501 sport, dport);
502 else if (ISPORT(RIP_PORT))
503 rip_print((const u_char *)(up + 1), length);
504 else if (ISPORT(ISAKMP_PORT))

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

541#endif /*INET6*/
542 /*
543 * Kludge in test for whiteboard packets.
544 */
545 else if (dport == 4567)
546 wb_print((const void *)(up + 1), length);
547 else if (ISPORT(CISCO_AUTORP_PORT))
548 cisco_autorp_print((const void *)(up + 1), length);
639 else if (ISPORT(TFTP_PORT))
640 tftp_print((const u_char *)(up + 1), length);
641 else if (ISPORT(IPPORT_BOOTPC) || ISPORT(IPPORT_BOOTPS))
642 bootp_print((const u_char *)(up + 1), length,
643 sport, dport);
644 else if (ISPORT(RIP_PORT))
645 rip_print((const u_char *)(up + 1), length);
646 else if (ISPORT(ISAKMP_PORT))

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

683#endif /*INET6*/
684 /*
685 * Kludge in test for whiteboard packets.
686 */
687 else if (dport == 4567)
688 wb_print((const void *)(up + 1), length);
689 else if (ISPORT(CISCO_AUTORP_PORT))
690 cisco_autorp_print((const void *)(up + 1), length);
691 else if (ISPORT(RADIUS_PORT) ||
692 ISPORT(RADIUS_NEW_PORT) ||
693 ISPORT(RADIUS_ACCOUNTING_PORT) ||
694 ISPORT(RADIUS_NEW_ACCOUNTING_PORT) )
695 radius_print((const u_char *)(up+1), length);
549 else
550 (void)printf(" udp %u",
551 (u_int32_t)(ulen - sizeof(*up)));
552#undef ISPORT
553 } else
554 (void)printf(" udp %u", (u_int32_t)(ulen - sizeof(*up)));
555}
696 else
697 (void)printf(" udp %u",
698 (u_int32_t)(ulen - sizeof(*up)));
699#undef ISPORT
700 } else
701 (void)printf(" udp %u", (u_int32_t)(ulen - sizeof(*up)));
702}