Expand on the comments about AIX libpcap.

No, Nokia *weren't* kind enough to change the major or minor version
number in the capture file when they changed the format, just as they
weren't kind enough to change the magic number.

svn path=/trunk/; revision=4173

1 files changed, 10 insertions, 6 deletions

diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c
index a692ebe145..ae5f4ad81c 100644
--- a/wiretap/libpcap.c
+++ b/wiretap/libpcap.c
@@ -1,6 +1,6 @@
 /* libpcap.c
  *
- * $Id: libpcap.c,v 1.54 2001/11/06 01:55:14 guy Exp $
+ * $Id: libpcap.c,v 1.55 2001/11/07 08:16:26 guy Exp $
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -468,7 +468,15 @@ int libpcap_open(wtap *wth, int *err)
 	 * which correspond to DLT_IEEE802 (used for Token Ring),
 	 * DLT_SLIP, and DLT_SLIP_BSDOS, respectively.  We shall
 	 * assume that if the minor version number is 2, and
-	 * the network type is 6, 8, or 15, that it's AIX libpcap.
+	 * the network type is 6, 8, or 15, that it's AIX libpcap;
+	 * I'm assuming those older versions of libpcap didn't
+	 * use DLT_IEEE802 for Token Ring, and didn't use DLT_SLIP_BSDOS
+	 * as that came later.  It may have used DLT_SLIP, however, in
+	 * which case we're out of luck; we assume it's Token Ring
+	 * in AIX libpcap rather than SLIP in standard libpcap, as
+	 * you're probably more likely to be handing an AIX libpcap
+	 * capture than an old (pre-libpcap 0.4) SLIP capture to
+	 * Ethereal.
 	 */
 	aix = FALSE;	/* assume it's not AIX */
 	if (hdr.version_major == 2 && hdr.version_minor == 2) {
@@ -552,10 +560,6 @@ int libpcap_open(wtap *wth, int *err)
 	 * Oh, and if it has the standard magic number, it might, instead,
 	 * be a Nokia libpcap file, so we may need to try that if
 	 * neither normal nor ss990417 headers work.
-	 *
-	 * XXX - have Nokia been kind enough to change the major or
-	 * minor version number?  If so, hopefully they didn't go
-	 * with 2.2....
 	 */
 	if (modified) {
 		/*