diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-10-19 00:40:05 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-10-19 00:40:05 +0000 |
| commit | dbfeea36203e050b0abb8022b524b12f0b29986d (patch) | |
| tree | e0bd4928703a1bcfbbe76f26564432cfe623bd01 /epan | |
| parent | a4d1704b636fb2e5cfd58f1687a75316614f5fe9 (diff) | |
The Frame Relay DLCI is a virtual circuit identifer, not a source or
destination address, so yank out the AT_DLCI stuff.
Clean up indentation.
svn path=/trunk/; revision=6455
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/column-utils.c | 11 | ||||
| -rw-r--r-- | epan/packet_info.h | 3 |
2 files changed, 2 insertions, 12 deletions
diff --git a/epan/column-utils.c b/epan/column-utils.c index 11d79427a5..3de614313c 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -1,7 +1,7 @@ /* column-utils.c * Routines for column utilities. * - * $Id: column-utils.c,v 1.22 2002/10/19 00:10:50 guy Exp $ + * $Id: column-utils.c,v 1.23 2002/10/19 00:40:05 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -477,15 +477,6 @@ col_set_addr(packet_info *pinfo, int col, address *addr, gboolean is_res, pinfo->cinfo->col_data[col] = pinfo->cinfo->col_buf[col]; break; - case AT_DLCI: - snprintf(pinfo->cinfo->col_buf[col], COL_MAX_LEN, "%u", - *(guint16 *)(addr->data)); - pinfo->cinfo->col_buf[col][COL_MAX_LEN - 1] = '\0'; - strcpy(pinfo->cinfo->col_expr[col], "fr.dlci"); - pinfo->cinfo->col_data[col] = pinfo->cinfo->col_buf[col]; - strcpy(pinfo->cinfo->col_expr_val[col],pinfo->cinfo->col_buf[col]); - break; - case AT_ARCNET: snprintf(pinfo->cinfo->col_buf[col], COL_MAX_LEN, "%02X", addr->data[0]); diff --git a/epan/packet_info.h b/epan/packet_info.h index 277560a563..763942d7ca 100644 --- a/epan/packet_info.h +++ b/epan/packet_info.h @@ -1,7 +1,7 @@ /* packet_info.h * Definitions for packet info structures and routines * - * $Id: packet_info.h,v 1.21 2002/10/18 21:40:13 guy Exp $ + * $Id: packet_info.h,v 1.22 2002/10/19 00:40:05 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -39,7 +39,6 @@ typedef enum { AT_ATALK, /* Appletalk DDP */ AT_VINES, /* Banyan Vines */ AT_OSI, /* OSI NSAP */ - AT_DLCI, /* Frame Relay DLCI */ AT_ARCNET /* ARCNET */ } address_type; |