osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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
This commit is contained in:
Guy Harris 1999-08-22 01:48:24 +00:00
parent 71e84f38fd
commit 63a69a5cca
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
packet-null.c
View File

@ -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;