| print-sl.c (127675) | print-sl.c (146778) |
|---|---|
| 1/* 2 * Copyright (c) 1989, 1990, 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 --- 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) 1989, 1990, 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 --- 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-sl.c 127675 2004-03-31 14:57:24Z bms $ | 21 * $FreeBSD: head/contrib/tcpdump/print-sl.c 146778 2005-05-29 19:09:28Z sam $ |
| 22 */ 23 24#ifndef lint 25static const char rcsid[] _U_ = | 22 */ 23 24#ifndef lint 25static const char rcsid[] _U_ = |
| 26 "@(#) $Header: /tcpdump/master/tcpdump/print-sl.c,v 1.62.2.2 2003/11/16 08:51:44 guy Exp $ (LBL)"; | 26 "@(#) $Header: /tcpdump/master/tcpdump/print-sl.c,v 1.65 2005/04/06 21:32:42 mcr Exp $ (LBL)"; |
| 27#endif 28 29#ifdef HAVE_CONFIG_H 30#include "config.h" 31#endif 32 33#include <tcpdump-stdinc.h> 34 --- 31 unchanged lines hidden (view full) --- 66 67 ip = (struct ip *)(p + SLIP_HDRLEN); 68 69 if (eflag) 70 sliplink_print(p, ip, length); 71 72 switch (IP_V(ip)) { 73 case 4: | 27#endif 28 29#ifdef HAVE_CONFIG_H 30#include "config.h" 31#endif 32 33#include <tcpdump-stdinc.h> 34 --- 31 unchanged lines hidden (view full) --- 66 67 ip = (struct ip *)(p + SLIP_HDRLEN); 68 69 if (eflag) 70 sliplink_print(p, ip, length); 71 72 switch (IP_V(ip)) { 73 case 4: |
| 74 ip_print((u_char *)ip, length); | 74 ip_print(gndo, (u_char *)ip, length); |
| 75 break; 76#ifdef INET6 77 case 6: 78 ip6_print((u_char *)ip, length); 79 break; 80#endif 81 default: 82 printf ("ip v%d", IP_V(ip)); --- 18 unchanged lines hidden (view full) --- 101 102 ip = (struct ip *)(p + SLIP_HDRLEN); 103 104#ifdef notdef 105 if (eflag) 106 sliplink_print(p, ip, length); 107#endif 108 | 75 break; 76#ifdef INET6 77 case 6: 78 ip6_print((u_char *)ip, length); 79 break; 80#endif 81 default: 82 printf ("ip v%d", IP_V(ip)); --- 18 unchanged lines hidden (view full) --- 101 102 ip = (struct ip *)(p + SLIP_HDRLEN); 103 104#ifdef notdef 105 if (eflag) 106 sliplink_print(p, ip, length); 107#endif 108 |
| 109 ip_print((u_char *)ip, length); | 109 ip_print(gndo, (u_char *)ip, length); |
| 110 111 return (SLIP_HDRLEN); 112} 113 114static void 115sliplink_print(register const u_char *p, register const struct ip *ip, 116 register u_int length) 117{ --- 124 unchanged lines hidden --- | 110 111 return (SLIP_HDRLEN); 112} 113 114static void 115sliplink_print(register const u_char *p, register const struct ip *ip, 116 register u_int length) 117{ --- 124 unchanged lines hidden --- |