diff options
author | Guy Harris <guy@alum.mit.edu> | 2001-03-15 06:41:13 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2001-03-15 06:41:13 +0000 |
commit | a9659200c1aa9625ad451efc6b7b28ce002ebe5e (patch) | |
tree | fca3b3f7cbe71b703d23f5b4b0a42215a77ddd41 /epan | |
parent | fceae9e370a0f07f67aba23da5887ec27ef5edd0 (diff) |
Add a new AT_OSI address type.
In the CLNP dissector, set the source and destination network-layer and
"top-level" addresses; this will cause them to show up in the source and
destination columns of the summary display if you're showing the
network-layer or top-level address (although you'll probably have to
widen those columns significantly to see the entire address), and also
makes them available to subdissectors.
svn path=/trunk/; revision=3131
Diffstat (limited to 'epan')
-rw-r--r-- | epan/packet.c | 10 | ||||
-rw-r--r-- | epan/packet.h | 5 |
2 files changed, 12 insertions, 3 deletions
diff --git a/epan/packet.c b/epan/packet.c index 4553188d28..2923d12334 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -1,7 +1,7 @@ /* packet.c * Routines for packet disassembly * - * $Id: packet.c,v 1.20 2001/02/08 07:06:55 guy Exp $ + * $Id: packet.c,v 1.21 2001/03/15 06:41:13 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -78,6 +78,7 @@ #include "packet-ipv6.h" #include "packet-sna.h" #include "packet-vines.h" +#include "packet-osi.h" #include "resolv.h" #include "tvbuff.h" @@ -842,6 +843,13 @@ col_set_addr(frame_data *fd, int col, address *addr, gboolean is_res) fd->cinfo->col_data[col] = fd->cinfo->col_buf[col]; break; + case AT_OSI: + strncpy(fd->cinfo->col_buf[col], print_nsap_net(addr->data, addr->len), + COL_MAX_LEN); + fd->cinfo->col_buf[col][COL_MAX_LEN - 1] = '\0'; + fd->cinfo->col_data[col] = fd->cinfo->col_buf[col]; + break; + default: break; } diff --git a/epan/packet.h b/epan/packet.h index c6232afd2b..fd857c8be8 100644 --- a/epan/packet.h +++ b/epan/packet.h @@ -1,7 +1,7 @@ /* packet.h * Definitions for packet disassembly structures and routines * - * $Id: packet.h,v 1.22 2001/02/27 07:28:48 guy Exp $ + * $Id: packet.h,v 1.23 2001/03/15 06:41:13 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -129,7 +129,8 @@ typedef enum { AT_IPX, /* IPX */ AT_SNA, /* SNA */ AT_ATALK, /* Appletalk DDP */ - AT_VINES /* Banyan Vines */ + AT_VINES, /* Banyan Vines */ + AT_OSI, /* OSI NSAP */ } address_type; typedef struct _address { |