Hello,
Attached to this email are a patch for packet-x25.c for supporting x25
over LLC2 (CMNS)
and a capture of x25 over LLC2 (between 2 cisco routers).
If it is ok, please commit.
Attachment:
cmns.cap.gz
Description: GNU Zip compressed data
diff -u -r ethereal-2001-01-04/llcsaps.h ethereal-src/llcsaps.h
--- ethereal-2001-01-04/llcsaps.h Mon Apr 17 03:32:37 2000
+++ ethereal-src/llcsaps.h Fri Jan 5 16:55:10 2001
@@ -36,6 +36,7 @@
#define SAP_TI 0x18
#define SAP_BPDU 0x42
#define SAP_RS511 0x4E
+#define SAP_X25 0x7E
#define SAP_XNS 0x80
#define SAP_NESTAR 0x86
#define SAP_PROWAY_ASLM 0x8E
diff -u -r ethereal-2001-01-04/packet-llc.c ethereal-src/packet-llc.c
--- ethereal-2001-01-04/packet-llc.c Wed Jan 3 12:34:41 2001
+++ ethereal-src/packet-llc.c Fri Jan 5 16:59:30 2001
@@ -116,11 +116,7 @@
{ SAP_TI, "Texas Instruments" },
{ SAP_BPDU, "Spanning Tree BPDU" },
{ SAP_RS511, "EIA RS-511 Manufacturing Message Service" },
-#if 0
- /* XXX - setting the group bit makes this 0x7F; is that just
- a group version of this? */
- { 0x7E, "ISO 8208 (X.25 over 802.2 Type 2)" },
-#endif
+ { SAP_X25, "ISO 8208 (X.25 over 802.2)" },
{ 0x7F, "ISO 802.2" },
{ SAP_XNS, "XNS" },
{ SAP_NESTAR, "Nestar" },
diff -u -r ethereal-2001-01-04/packet-x25.c ethereal-src/packet-x25.c
--- ethereal-2001-01-04/packet-x25.c Thu Jan 4 01:30:50 2001
+++ ethereal-src/packet-x25.c Fri Jan 5 16:57:36 2001
@@ -37,6 +37,7 @@
#include <stdlib.h>
#include <string.h>
#include "etypes.h"
+#include "llcsaps.h"
#include "packet.h"
#include "packet-x25.h"
#include "packet-ip.h"
@@ -2067,4 +2068,5 @@
*/
ip_handle = find_dissector("ip");
ositp_handle = find_dissector("ositp");
+ dissector_add("llc.dsap", SAP_X25, dissect_x25);
}
