diff options
| author | Guy Harris <guy@alum.mit.edu> | 1999-08-22 01:48:24 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 1999-08-22 01:48:24 +0000 |
| commit | 63a69a5ccaa96027d68119d36dda72480f5e9c29 (patch) | |
| tree | 7d35402d42ddd52a315c97e982ed38d447fb562d /packet-null.c | |
| parent | 71e84f38fdffeafdf7f3ad2f48d945bc2d95b554 (diff) | |
FreeBSD and OpenBSD both use 23 for AF_IPX (that may have been in
4.4-Lite), but they use different values for AF_INET6; define and handle
both of them.
Add AF_ISO as well.
svn path=/trunk/; revision=543
Diffstat (limited to 'packet-null.c')
| -rw-r--r-- | packet-null.c | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/packet-null.c b/packet-null.c index 59ccafe634..80b375b2ea 100644 --- a/packet-null.c +++ b/packet-null.c @@ -1,7 +1,7 @@ /* packet-null.c * Routines for null packet disassembly * - * $Id: packet-null.c,v 1.12 1999/08/22 00:47:42 guy Exp $ + * $Id: packet-null.c,v 1.13 1999/08/22 01:48:24 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -59,17 +59,21 @@ static int hf_null_family = -1; /* BSD AF_ values. */ #define BSD_AF_INET 2 +#define BSD_AF_ISO 7 #define BSD_AF_APPLETALK 16 -#define BSD_AF_IPX 23 /* at least on FreeBSD */ -#define BSD_AF_INET6 28 /* at least on FreeBSD */ +#define BSD_AF_IPX 23 +#define BSD_AF_INET6_OPENBSD 24 +#define BSD_AF_INET6_FREEBSD 28 /* Family values. */ static const value_string family_vals[] = { - {BSD_AF_INET, "IP" }, - {BSD_AF_APPLETALK, "Appletalk" }, - {BSD_AF_IPX, "Netware IPX/SPX"}, - {BSD_AF_INET6, "IPv6" }, - {0, NULL } + {BSD_AF_INET, "IP" }, + {BSD_AF_ISO, "OSI" }, + {BSD_AF_APPLETALK, "Appletalk" }, + {BSD_AF_IPX, "Netware IPX/SPX"}, + {BSD_AF_INET6_OPENBSD, "IPv6" }, + {BSD_AF_INET6_FREEBSD, "IPv6" }, + {0, NULL } }; void @@ -283,7 +287,12 @@ dissect_null( const u_char *pd, frame_data *fd, proto_tree *tree ) dissect_ipx(pd, 4, fd, tree); break; - case BSD_AF_INET6: + case BSD_AF_ISO: + dissect_osi(pd, 4, fd, tree); + break; + + case BSD_AF_INET6_OPENBSD: + case BSD_AF_INET6_FREEBSD: dissect_ipv6(pd, 4, fd, tree); break; |