Deleted Added
full compact
print-null.c (26183) print-null.c (39300)
1/*
1/*
2 * Copyright (c) 1991, 1993, 1994, 1995, 1996
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
9 * this paragraph in its entirety in the documentation or other materials
10 * provided with the distribution, and (3) all advertising materials mentioning

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

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 const char rcsid[] =
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

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

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 const char rcsid[] =
24 "@(#) $Header: print-null.c,v 1.22 96/12/10 23:18:58 leres Exp $ (LBL)";
24 "@(#) $Header: print-null.c,v 1.24 97/05/28 12:52:47 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

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

45#include <netinet/udp_var.h>
46#include <netinet/tcp.h>
47#include <netinet/tcpip.h>
48
49#include <pcap.h>
50#include <stdio.h>
51#include <string.h>
52
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

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

45#include <netinet/udp_var.h>
46#include <netinet/tcp.h>
47#include <netinet/tcpip.h>
48
49#include <pcap.h>
50#include <stdio.h>
51#include <string.h>
52
53#include "addrtoname.h"
54#include "interface.h"
53#include "interface.h"
54#include "addrtoname.h"
55
55
56#define NULL_HDRLEN 4
57
58#ifndef AF_NS
59#define AF_NS 6 /* XEROX NS protocols */
60#endif
61
56#ifndef AF_NS
57#define AF_NS 6 /* XEROX NS protocols */
58#endif
59
60/*
61 * The DLT_NULL packet header is 4 bytes long. It contains a network
62 * order 32 bit integer that specifies the family, e.g. AF_INET
63 */
64#define NULL_HDRLEN 4
65
62static void
63null_print(const u_char *p, const struct ip *ip, u_int length)
64{
65 u_int family;
66
67 memcpy((char *)&family, (char *)p, sizeof(family));
68
69 if (nflag) {

--- 50 unchanged lines hidden ---
66static void
67null_print(const u_char *p, const struct ip *ip, u_int length)
68{
69 u_int family;
70
71 memcpy((char *)&family, (char *)p, sizeof(family));
72
73 if (nflag) {

--- 50 unchanged lines hidden ---