| print-ip.c (277783) | print-ip.c (281938) |
|---|---|
| 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-ip.c 277783 2015-01-27 01:45:47Z pfg $ | 21 * $FreeBSD: head/contrib/tcpdump/print-ip.c 281938 2015-04-24 16:11:22Z brooks $ |
| 22 */ 23 24#define NETDISSECT_REWORKED 25#ifdef HAVE_CONFIG_H 26#include "config.h" 27#endif 28 29#include <tcpdump-stdinc.h> --- 452 unchanged lines hidden (view full) --- 482 break; 483 484 case IPPROTO_PGM: 485 pgm_print(ndo, ipds->cp, ipds->len, (const u_char *)ipds->ip); 486 break; 487 488#if defined(HAVE_NET_PFVAR_H) 489 case IPPROTO_PFSYNC: | 22 */ 23 24#define NETDISSECT_REWORKED 25#ifdef HAVE_CONFIG_H 26#include "config.h" 27#endif 28 29#include <tcpdump-stdinc.h> --- 452 unchanged lines hidden (view full) --- 482 break; 483 484 case IPPROTO_PGM: 485 pgm_print(ndo, ipds->cp, ipds->len, (const u_char *)ipds->ip); 486 break; 487 488#if defined(HAVE_NET_PFVAR_H) 489 case IPPROTO_PFSYNC: |
| 490 pfsync_ip_print(ipds->cp, ipds->len); | 490 pfsync_ip_print(ndo, ipds->cp, ipds->len); |
| 491 break; 492#endif 493 494 default: 495 if (ndo->ndo_nflag==0 && (proto = getprotobynumber(ipds->nh)) != NULL) 496 ND_PRINT((ndo, " %s", proto->p_name)); 497 else 498 ND_PRINT((ndo, " ip-proto-%d", ipds->nh)); --- 219 unchanged lines hidden --- | 491 break; 492#endif 493 494 default: 495 if (ndo->ndo_nflag==0 && (proto = getprotobynumber(ipds->nh)) != NULL) 496 ND_PRINT((ndo, " %s", proto->p_name)); 497 else 498 ND_PRINT((ndo, " ip-proto-%d", ipds->nh)); --- 219 unchanged lines hidden --- |