| print-lane.c (162017) | print-lane.c (172683) |
|---|---|
| 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.2.1 2005/07/07 01:24:37 guy Exp $ (LBL)"; | 25 "@(#) $Header: /tcpdump/master/tcpdump/print-lane.c,v 1.23.2.2 2005/11/13 12:12:59 guy Exp $ (LBL)"; |
| 26#endif 27 28#ifdef HAVE_CONFIG_H 29#include "config.h" 30#endif 31 32#include <tcpdump-stdinc.h> 33 --- 95 unchanged lines hidden (view full) --- 129 ep = (struct lecdatahdr_8023 *)p; 130 p += sizeof(struct lecdatahdr_8023); 131 132 ether_type = EXTRACT_16BITS(&ep->h_type); 133 134 /* 135 * Is it (gag) an 802.3 encapsulation? 136 */ | 26#endif 27 28#ifdef HAVE_CONFIG_H 29#include "config.h" 30#endif 31 32#include <tcpdump-stdinc.h> 33 --- 95 unchanged lines hidden (view full) --- 129 ep = (struct lecdatahdr_8023 *)p; 130 p += sizeof(struct lecdatahdr_8023); 131 132 ether_type = EXTRACT_16BITS(&ep->h_type); 133 134 /* 135 * Is it (gag) an 802.3 encapsulation? 136 */ |
| 137 extracted_ethertype = 0; | |
| 138 if (ether_type <= ETHERMTU) { 139 /* Try to print the LLC-layer header & higher layers */ 140 if (llc_print(p, length, caplen, ep->h_source, ep->h_dest, 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) { --- 23 unchanged lines hidden --- | 137 if (ether_type <= ETHERMTU) { 138 /* Try to print the LLC-layer header & higher layers */ 139 if (llc_print(p, length, caplen, ep->h_source, ep->h_dest, 140 &extracted_ethertype) == 0) { 141 /* ether_type not known, print raw packet */ 142 if (!eflag) 143 lane_hdr_print((u_char *)ep, length + sizeof(*ep)); 144 if (extracted_ethertype) { --- 23 unchanged lines hidden --- |