aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--llcsaps.h14
-rw-r--r--packet-gre.c4
-rw-r--r--packet-ipx.c5
-rw-r--r--packet-llc.c14
-rw-r--r--packet-osi.c10
5 files changed, 31 insertions, 16 deletions
diff --git a/llcsaps.h b/llcsaps.h
index 7943687a7d..4a0a0d663d 100644
--- a/llcsaps.h
+++ b/llcsaps.h
@@ -1,13 +1,12 @@
/* llcsaps.h
* Defines LLC SAP values.
*
- * $Id: llcsaps.h,v 1.6 2003/03/02 21:52:14 guy Exp $
+ * $Id: llcsaps.h,v 1.7 2003/06/10 05:38:52 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
*
- *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
@@ -33,10 +32,15 @@
#define SAP_SNA1 0x08
#define SAP_SNA2 0x0C
#define SAP_PROWAY_NM_INIT 0x0E
+#define SAP_NETWARE1 0x10
+#define SAP_OSINL1 0x14
#define SAP_TI 0x18
+#define SAP_OSINL2 0x20
+#define SAP_OSINL3 0x34
#define SAP_SNA3 0x40
#define SAP_BPDU 0x42
#define SAP_RS511 0x4E
+#define SAP_OSINL4 0x54
#define SAP_X25 0x7E
#define SAP_XNS 0x80
#define SAP_BACNET 0x82
@@ -47,13 +51,13 @@
#define SAP_ARP 0x98
#define SAP_VINES1 0xBA
#define SAP_VINES2 0xBC
-#define SAP_NETWARE 0xE0
+#define SAP_NETWARE2 0xE0
#define SAP_NETBIOS 0xF0
#define SAP_IBMNM 0xF4
#define SAP_HPEXT 0xF8
#define SAP_UB 0xFA
#define SAP_RPL 0xFC
-#define SAP_OSINL 0xFE
+#define SAP_OSINL5 0xFE
#define SAP_GLOBAL 0xFF
#endif /* llcsaps.h */
diff --git a/packet-gre.c b/packet-gre.c
index b80797c678..1b15b48a38 100644
--- a/packet-gre.c
+++ b/packet-gre.c
@@ -2,7 +2,7 @@
* Routines for the Generic Routing Encapsulation (GRE) protocol
* Brad Robel-Forrest <brad.robel-forrest@watchguard.com>
*
- * $Id: packet-gre.c,v 1.53 2002/11/07 22:12:13 guy Exp $
+ * $Id: packet-gre.c,v 1.54 2003/06/10 05:38:52 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -72,7 +72,7 @@ static void dissect_gre_wccp2_redirect_header(tvbuff_t *, int, proto_tree *);
static const value_string typevals[] = {
{ ETHERTYPE_PPP, "PPP" },
{ ETHERTYPE_IP, "IP" },
- { SAP_OSINL, "OSI"},
+ { SAP_OSINL5, "OSI"},
{ GRE_WCCP, "WCCP"},
{ ETHERTYPE_IPX, "IPX"},
{ ETHERTYPE_ETHBRIDGE, "Transparent Ethernet bridging" },
diff --git a/packet-ipx.c b/packet-ipx.c
index 35fbfcce14..d178bcc754 100644
--- a/packet-ipx.c
+++ b/packet-ipx.c
@@ -6,7 +6,7 @@
* Portions Copyright (c) 2000-2002 by Gilbert Ramirez.
* Portions Copyright (c) Novell, Inc. 2002-2003
*
- * $Id: packet-ipx.c,v 1.130 2003/04/14 01:26:57 guy Exp $
+ * $Id: packet-ipx.c,v 1.131 2003/06/10 05:38:52 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -1433,7 +1433,8 @@ proto_reg_handoff_ipx(void)
dissector_add("ethertype", ETHERTYPE_IPX, ipx_handle);
dissector_add("chdlctype", ETHERTYPE_IPX, ipx_handle);
dissector_add("ppp.protocol", PPP_IPX, ipx_handle);
- dissector_add("llc.dsap", SAP_NETWARE, ipx_handle);
+ dissector_add("llc.dsap", SAP_NETWARE1, ipx_handle);
+ dissector_add("llc.dsap", SAP_NETWARE2, ipx_handle);
dissector_add("null.type", BSD_AF_IPX, ipx_handle);
dissector_add("gre.proto", ETHERTYPE_IPX, ipx_handle);
dissector_add("arcnet.protocol_id", ARCNET_PROTO_IPX, ipx_handle);
diff --git a/packet-llc.c b/packet-llc.c
index 06f451b3b1..d217fcc6a3 100644
--- a/packet-llc.c
+++ b/packet-llc.c
@@ -2,7 +2,7 @@
* Routines for IEEE 802.2 LLC layer
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: packet-llc.c,v 1.109 2003/04/18 03:41:39 guy Exp $
+ * $Id: packet-llc.c,v 1.110 2003/06/10 05:38:51 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -114,9 +114,14 @@ const value_string sap_vals[] = {
{ SAP_SNA1, "SNA" },
{ SAP_SNA2, "SNA" },
{ SAP_PROWAY_NM_INIT, "PROWAY (IEC955) Network Management and Initialization" },
+ { SAP_NETWARE1, "NetWare (unofficial?)" },
+ { SAP_OSINL1, "ISO Network Layer (OSLAN 1)" },
{ SAP_TI, "Texas Instruments" },
+ { SAP_OSINL2, "ISO Network Layer (unofficial?)" },
+ { SAP_OSINL3, "ISO Network Layer (unofficial?)" },
{ SAP_BPDU, "Spanning Tree BPDU" },
{ SAP_RS511, "EIA RS-511 Manufacturing Message Service" },
+ { SAP_OSINL4, "ISO Network Layer (OSLAN 2)" },
{ SAP_X25, "ISO 8208 (X.25 over 802.2)" },
/*
* XXX - setting the group bit of SAP_X25 make 0x7F; is this just
@@ -131,13 +136,13 @@ const value_string sap_vals[] = {
{ SAP_SNAP, "SNAP" },
{ SAP_VINES1, "Banyan Vines" },
{ SAP_VINES2, "Banyan Vines" },
- { SAP_NETWARE, "NetWare" },
+ { SAP_NETWARE2, "NetWare" },
{ SAP_NETBIOS, "NetBIOS" },
{ SAP_IBMNM, "IBM Net Management" },
{ SAP_HPEXT, "HP Extended LLC" },
{ SAP_UB, "Ungermann-Bass" },
{ SAP_RPL, "Remote Program Load" },
- { SAP_OSINL, "ISO Network Layer" },
+ { SAP_OSINL5, "ISO Network Layer" },
{ SAP_GLOBAL, "Global LSAP" },
{ 0x00, NULL }
};
@@ -234,7 +239,8 @@ capture_llc(const guchar *pd, int offset, int len, packet_counts *ld) {
ld);
break;
- case SAP_NETWARE:
+ case SAP_NETWARE1:
+ case SAP_NETWARE2:
capture_ipx(ld);
break;
diff --git a/packet-osi.c b/packet-osi.c
index 5f1011b824..8bd85d59d0 100644
--- a/packet-osi.c
+++ b/packet-osi.c
@@ -2,7 +2,7 @@
* Routines for ISO/OSI network and transport protocol packet disassembly
* Main entrance point and common functions
*
- * $Id: packet-osi.c,v 1.61 2003/05/15 06:35:02 guy Exp $
+ * $Id: packet-osi.c,v 1.62 2003/06/10 05:38:52 guy Exp $
* Laurent Deniel <laurent.deniel@free.fr>
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
@@ -282,10 +282,14 @@ proto_reg_handoff_osi(void)
dissector_handle_t osi_handle;
osi_handle = create_dissector_handle(dissect_osi, -1);
- dissector_add("llc.dsap", SAP_OSINL, osi_handle);
+ dissector_add("llc.dsap", SAP_OSINL1, osi_handle);
+ dissector_add("llc.dsap", SAP_OSINL2, osi_handle);
+ dissector_add("llc.dsap", SAP_OSINL3, osi_handle);
+ dissector_add("llc.dsap", SAP_OSINL4, osi_handle);
+ dissector_add("llc.dsap", SAP_OSINL5, osi_handle);
dissector_add("ppp.protocol", PPP_OSI, osi_handle);
dissector_add("chdlctype", CHDLCTYPE_OSI, osi_handle);
dissector_add("null.type", BSD_AF_ISO, osi_handle);
- dissector_add("gre.proto", SAP_OSINL, osi_handle);
+ dissector_add("gre.proto", SAP_OSINL5, osi_handle);
data_handle = find_dissector("data");
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 14:38:08 +0000