| print-lane.c (146773) | print-lane.c (162017) |
|---|---|
| 1/* 2 * Marko Kiiskila carnil@cs.tut.fi 3 * 4 * Tampere University of Technology - Telecommunications Laboratory 5 * 6 * Permission to use, copy, modify and distribute this 7 * software and its documentation is hereby granted, 8 * provided that both the copyright notice and this --- 8 unchanged lines hidden (view full) --- 17 * CONDITION AND DISCLAIMS ANY LIABILITY OF ANY KIND FOR 18 * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS 19 * SOFTWARE. 20 * 21 */ 22 23#ifndef lint 24static const char rcsid[] _U_ = | 1/* 2 * Marko Kiiskila carnil@cs.tut.fi 3 * 4 * Tampere University of Technology - Telecommunications Laboratory 5 * 6 * Permission to use, copy, modify and distribute this 7 * software and its documentation is hereby granted, 8 * provided that both the copyright notice and this --- 8 unchanged lines hidden (view full) --- 17 * CONDITION AND DISCLAIMS ANY LIABILITY OF ANY KIND FOR 18 * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS 19 * SOFTWARE. 20 * 21 */ 22 23#ifndef lint 24static const char rcsid[] _U_ = |
| 25 "@(#) $Header: /tcpdump/master/tcpdump/print-lane.c,v 1.23 2004/03/17 23:24:37 guy Exp $ (LBL)"; | 25 "@(#) $Header: /tcpdump/master/tcpdump/print-lane.c,v 1.23.2.1 2005/07/07 01:24:37 guy Exp $ (LBL)"; |
| 26#endif 27 28#ifdef HAVE_CONFIG_H 29#include "config.h" 30#endif 31 32#include <tcpdump-stdinc.h> 33 --- 107 unchanged lines hidden (view full) --- 141 &extracted_ethertype) == 0) { 142 /* ether_type not known, print raw packet */ 143 if (!eflag) 144 lane_hdr_print((u_char *)ep, length + sizeof(*ep)); 145 if (extracted_ethertype) { 146 printf("(LLC %s) ", 147 etherproto_string(htons(extracted_ethertype))); 148 } | 26#endif 27 28#ifdef HAVE_CONFIG_H 29#include "config.h" 30#endif 31 32#include <tcpdump-stdinc.h> 33 --- 107 unchanged lines hidden (view full) --- 141 &extracted_ethertype) == 0) { 142 /* ether_type not known, print raw packet */ 143 if (!eflag) 144 lane_hdr_print((u_char *)ep, length + sizeof(*ep)); 145 if (extracted_ethertype) { 146 printf("(LLC %s) ", 147 etherproto_string(htons(extracted_ethertype))); 148 } |
| 149 if (!xflag && !qflag) | 149 if (!suppress_default_print) |
| 150 default_print(p, caplen); 151 } 152 } else if (ether_encap_print(ether_type, p, length, caplen, 153 &extracted_ethertype) == 0) { 154 /* ether_type not known, print raw packet */ 155 if (!eflag) 156 lane_hdr_print((u_char *)ep, length + sizeof(*ep)); | 150 default_print(p, caplen); 151 } 152 } else if (ether_encap_print(ether_type, p, length, caplen, 153 &extracted_ethertype) == 0) { 154 /* ether_type not known, print raw packet */ 155 if (!eflag) 156 lane_hdr_print((u_char *)ep, length + sizeof(*ep)); |
| 157 if (!xflag && !qflag) | 157 if (!suppress_default_print) |
| 158 default_print(p, caplen); 159 } 160} 161 162u_int 163lane_if_print(const struct pcap_pkthdr *h, const u_char *p) 164{ 165 lane_print(p, h->len, h->caplen); 166 167 return (sizeof(struct lecdatahdr_8023)); 168} | 158 default_print(p, caplen); 159 } 160} 161 162u_int 163lane_if_print(const struct pcap_pkthdr *h, const u_char *p) 164{ 165 lane_print(p, h->len, h->caplen); 166 167 return (sizeof(struct lecdatahdr_8023)); 168} |