Deleted Added
full compact
print-null.c (17681) print-null.c (21262)
1/*
2 * Copyright (c) 1991, 1993, 1994, 1995, 1996
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
9 * this paragraph in its entirety in the documentation or other materials
10 * provided with the distribution, and (3) all advertising materials mentioning
11 * features or use of this software display the following acknowledgement:
12 * ``This product includes software developed by the University of California,
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
22#ifndef lint
23static char rcsid[] =
24 "@(#)$Header: print-null.c,v 1.19 96/07/14 19:39:02 leres Exp $ (LBL)";
25#endif
26
27#include <sys/param.h>
28#include <sys/time.h>
29#include <sys/socket.h>
30#include <sys/file.h>
31#include <sys/ioctl.h>
32
33#if __STDC__
34struct mbuf;
35struct rtentry;
36#endif
37#include <net/if.h>
38
39#include <netinet/in.h>
40#include <netinet/in_systm.h>
41#include <netinet/ip.h>
1/*
2 * Copyright (c) 1991, 1993, 1994, 1995, 1996
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
9 * this paragraph in its entirety in the documentation or other materials
10 * provided with the distribution, and (3) all advertising materials mentioning
11 * features or use of this software display the following acknowledgement:
12 * ``This product includes software developed by the University of California,
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
22#ifndef lint
23static char rcsid[] =
24 "@(#)$Header: print-null.c,v 1.19 96/07/14 19:39:02 leres Exp $ (LBL)";
25#endif
26
27#include <sys/param.h>
28#include <sys/time.h>
29#include <sys/socket.h>
30#include <sys/file.h>
31#include <sys/ioctl.h>
32
33#if __STDC__
34struct mbuf;
35struct rtentry;
36#endif
37#include <net/if.h>
38
39#include <netinet/in.h>
40#include <netinet/in_systm.h>
41#include <netinet/ip.h>
42#include <netinet/if_ether.h>
42#include <net/ethernet.h>
43#include <netinet/ip_var.h>
44#include <netinet/udp.h>
45#include <netinet/udp_var.h>
46#include <netinet/tcp.h>
47#include <netinet/tcpip.h>
48
49#include <stdio.h>
50#include <string.h>
51
52#include "interface.h"
53#include "addrtoname.h"
54#include "pcap.h"
55
56#define NULL_HDRLEN 4
57
58static void
59null_print(const u_char *p, const struct ip *ip, u_int length)
60{
61 u_int family;
62
63 memcpy((char *)&family, (char *)p, sizeof(family));
64
65 if (nflag) {
66 /* XXX just dump the header */
67 return;
68 }
69 switch (family) {
70
71 case AF_INET:
72 printf("ip: ");
73 break;
74
75 case AF_NS:
76 printf("ns: ");
77 break;
78
79 default:
80 printf("AF %d: ", family);
81 break;
82 }
83}
84
85void
86null_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
87{
88 u_int length = h->len;
89 u_int caplen = h->caplen;
90 const struct ip *ip;
91
92 ts_print(&h->ts);
93
94 /*
95 * Some printers want to get back at the link level addresses,
96 * and/or check that they're not walking off the end of the packet.
97 * Rather than pass them all the way down, we set these globals.
98 */
99 packetp = p;
100 snapend = p + caplen;
101
102 length -= NULL_HDRLEN;
103
104 ip = (struct ip *)(p + NULL_HDRLEN);
105
106 if (eflag)
107 null_print(p, ip, length);
108
109 ip_print((const u_char *)ip, length);
110
111 if (xflag)
112 default_print((const u_char *)ip, caplen - NULL_HDRLEN);
113 putchar('\n');
114}
115
43#include <netinet/ip_var.h>
44#include <netinet/udp.h>
45#include <netinet/udp_var.h>
46#include <netinet/tcp.h>
47#include <netinet/tcpip.h>
48
49#include <stdio.h>
50#include <string.h>
51
52#include "interface.h"
53#include "addrtoname.h"
54#include "pcap.h"
55
56#define NULL_HDRLEN 4
57
58static void
59null_print(const u_char *p, const struct ip *ip, u_int length)
60{
61 u_int family;
62
63 memcpy((char *)&family, (char *)p, sizeof(family));
64
65 if (nflag) {
66 /* XXX just dump the header */
67 return;
68 }
69 switch (family) {
70
71 case AF_INET:
72 printf("ip: ");
73 break;
74
75 case AF_NS:
76 printf("ns: ");
77 break;
78
79 default:
80 printf("AF %d: ", family);
81 break;
82 }
83}
84
85void
86null_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
87{
88 u_int length = h->len;
89 u_int caplen = h->caplen;
90 const struct ip *ip;
91
92 ts_print(&h->ts);
93
94 /*
95 * Some printers want to get back at the link level addresses,
96 * and/or check that they're not walking off the end of the packet.
97 * Rather than pass them all the way down, we set these globals.
98 */
99 packetp = p;
100 snapend = p + caplen;
101
102 length -= NULL_HDRLEN;
103
104 ip = (struct ip *)(p + NULL_HDRLEN);
105
106 if (eflag)
107 null_print(p, ip, length);
108
109 ip_print((const u_char *)ip, length);
110
111 if (xflag)
112 default_print((const u_char *)ip, caplen - NULL_HDRLEN);
113 putchar('\n');
114}
115