Deleted Added
full compact
print-ip6.c (56894) print-ip6.c (57278)
1/*
2 * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994
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.
1/*
2 * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994
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 * $FreeBSD: head/contrib/tcpdump/print-ip6.c 57278 2000-02-17 03:30:04Z fenner $
20 */
21
22#ifndef lint
23static const char rcsid[] =
24 "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.2.2.1 2000/01/11 06:58:25 fenner Exp $";
25#endif
26
27#ifdef HAVE_CONFIG_H

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

163 int enh;
164 cp += ipcomp_print(cp, (const u_char *)ip6, &enh);
165 if (enh < 0)
166 goto end;
167 nh = enh & 0xff;
168 break;
169 }
170 case IPPROTO_PIM:
22 */
23
24#ifndef lint
25static const char rcsid[] =
26 "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.2.2.1 2000/01/11 06:58:25 fenner Exp $";
27#endif
28
29#ifdef HAVE_CONFIG_H

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

165 int enh;
166 cp += ipcomp_print(cp, (const u_char *)ip6, &enh);
167 if (enh < 0)
168 goto end;
169 nh = enh & 0xff;
170 break;
171 }
172 case IPPROTO_PIM:
171 (void)printf("PIM");
172 pim_print(cp, len);
173 goto end;
174#ifndef IPPROTO_OSPF
175#define IPPROTO_OSPF 89
176#endif
177 case IPPROTO_OSPF:
178 ospf6_print(cp, len);
179 goto end;

--- 49 unchanged lines hidden ---
173 pim_print(cp, len);
174 goto end;
175#ifndef IPPROTO_OSPF
176#define IPPROTO_OSPF 89
177#endif
178 case IPPROTO_OSPF:
179 ospf6_print(cp, len);
180 goto end;

--- 49 unchanged lines hidden ---