aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/netxray.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2005-06-16 08:10:13 +0000
committerGuy Harris <guy@alum.mit.edu>2005-06-16 08:10:13 +0000
commitf28456dd846a8be3f0a5f01139e6f84c04ee5f19 (patch)
tree6747e52563dbc17bb45b486c35f227b3ac8d932a /wiretap/netxray.c
parentddbee0ffd062e5f4164d716a90baf815d44a4add (diff)
Note that the WAN_CAPTYPE value of 4 can correspond to Cisco HDLC
traffic as well as Frame Relay traffic, and give some information about the cruft found in the xxc field of the header for one CHDLC and one FR capture. svn path=/trunk/; revision=14659
Diffstat (limited to 'wiretap/netxray.c')
-rw-r--r--wiretap/netxray.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/wiretap/netxray.c b/wiretap/netxray.c
index b33c22b589..02588f4a33 100644
--- a/wiretap/netxray.c
+++ b/wiretap/netxray.c
@@ -440,6 +440,20 @@ int netxray_open(wtap *wth, int *err, gchar **err_info)
case WAN_CAPTYPE_FRELAY:
/*
* Frame Relay.
+ *
+ * XXX - in at least one capture, this
+ * is Cisco HDLC, not Frame Relay, but
+ * in another capture, it's Frame Relay.
+ *
+ * In the Cisco HDLC capture, hdr.xxc[22:26]
+ * is 0x02 0x00 0x01 0x00 0x06, but it's
+ * 0x00 0x00 0x00 0x00 0x00 in the Frame
+ * Relay capture. Also, hdr.xxc[30:31]
+ * is 0xff 0xff in the Cisco HDLC capture
+ * and 0x00 0x00 in the Frame Relay capture,
+ * and hdr.xxc[46:47] is 0xff 0xff in the
+ * Cisco HDLC capture and 0x05 0x00 in the
+ * Frame Relay capture.
*/
file_encap = WTAP_ENCAP_FRELAY_WITH_PHDR;
break;