osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Merge Paul Ionescu's CDP fixes with Guy's. Add #defines to oui.h for Cisco 

IOS 9.0 and bridged frame relay and update packet-llc.c accordingly.  Add
CDP handler to capture_llc() in packet-llc.c.

svn path=/trunk/; revision=1524
This commit is contained in:
Gerald Combs 2000-01-22 21:49:50 +00:00
parent 287efcbbe7
commit 42d68156a9
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
oui.h
View File

@ -2,11 +2,11 @@
* Definitions of OUIs
* Gilbert Ramirez <gramirez@tivoli.com>
*
* $Id: oui.h,v 1.3 2000/01/12 19:37:24 guy Exp $
* $Id: oui.h,v 1.4 2000/01/22 21:49:50 gerald Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
* Copyright 1998 - 2000 Gerald Combs
*
*
* This program is free software; you can redistribute it and/or
@ -25,7 +25,9 @@
*/
#define OUI_ENCAP_ETHER 0x000000 /* encapsulated Ethernet */
#define OUI_CISCO 0x00000C /* Cisco */
#define OUI_CISCO 0x00000C /* Cisco (future use) */
#define OUI_CISCO_90 0x0000F8 /* Cisco (IOS 9.0 and above?) */
#define OUI_BFR 0x0080C2 /* Bridged Frame-Relay, RFC 2427 */
#define OUI_ATM_FORUM 0x00A03E /* ATM Forum */
#define OUI_APPLE_ATALK 0x080007 /* Appletalk */

12
packet-llc.c
View File

@ -2,7 +2,7 @@
* Routines for IEEE 802.2 LLC layer
* Gilbert Ramirez <gramirez@tivoli.com>
*
* $Id: packet-llc.c,v 1.39 2000/01/12 20:00:19 guy Exp $
* $Id: packet-llc.c,v 1.40 2000/01/22 21:49:50 gerald Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -36,6 +36,7 @@
#include "packet.h"
#include "oui.h"
#include "xdlc.h"
#include "etypes.h"
static int proto_llc = -1;
static int hf_llc_dsap = -1;
@ -157,8 +158,8 @@ const value_string oui_vals[] = {
http://www.cisco.com/univercd/cc/td/doc/product/software/ios113ed/113ed_cr/ibm_r/brprt1/brsrb.htm
*/
{ OUI_CISCO, "Cisco" },
{ 0x0000f8, "Cisco 90-Compatible" },
{ 0x0080c2, "Bridged Frame-Relay" }, /* RFC 2427 */
{ OUI_CISCO_90, "Cisco IOS 9.0 Compatible" },
{ OUI_BFR, "Bridged Frame-Relay" }, /* RFC 2427 */
{ OUI_ATM_FORUM, "ATM Forum" },
{ OUI_APPLE_ATALK, "Apple (AppleTalk)" },
{ 0, NULL }
@ -250,7 +251,10 @@ capture_llc(const u_char *pd, int offset, guint32 cap_len, packet_counts *ld) {
capture_ethertype(etype, offset+8, pd,
cap_len, ld);
break;
case OUI_CISCO:
capture_ethertype(etype,
offset + 8, pd, cap_len, ld);
break;
default:
ld->other++;
break;