diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-02-29 08:47:11 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-02-29 08:47:11 +0000 |
| commit | d4b00639d695855af7568660f229e701ab119792 (patch) | |
| tree | 60fb9545bd8c44388e8d76716df2f150d6695b21 /epan | |
| parent | 5d613954210c88130bb92172002b1e70f4f3324d (diff) | |
| download | wireshark-d4b00639d695855af7568660f229e701ab119792.tar.gz wireshark-d4b00639d695855af7568660f229e701ab119792.tar.bz2 wireshark-d4b00639d695855af7568660f229e701ab119792.zip | |
From Jeff Morriss:
support the ISUP CIC as a circuit ID;
add a preference option to control whether to put the CIC into
the Info column or not.
svn path=/trunk/; revision=10265
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/column-utils.c | 9 | ||||
| -rw-r--r-- | epan/packet_info.h | 5 |
2 files changed, 11 insertions, 3 deletions
diff --git a/epan/column-utils.c b/epan/column-utils.c index 033dd0bb5d..57a907b212 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.45 2004/02/05 23:57:15 obiot Exp $ + * $Id: column-utils.c,v 1.46 2004/02/29 08:47:11 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -771,6 +771,13 @@ col_set_circuit_id(packet_info *pinfo, int col) snprintf(pinfo->cinfo->col_buf[col], COL_MAX_LEN, "%u", pinfo->circuit_id); break; + case CT_ISUP: + snprintf(pinfo->cinfo->col_buf[col], COL_MAX_LEN, "%u", pinfo->circuit_id); + strcpy(pinfo->cinfo->col_expr[col], "isup.cic"); + snprintf(pinfo->cinfo->col_expr_val[col], COL_MAX_LEN, "%u", pinfo->circuit_id); + pinfo->cinfo->col_expr_val[col][COL_MAX_LEN - 1] = '\0'; + break; + default: break; } diff --git a/epan/packet_info.h b/epan/packet_info.h index 90200bdc80..ee6d6e01ec 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.38 2003/12/29 22:44:50 guy Exp $ + * $Id: packet_info.h,v 1.39 2004/02/29 08:47:11 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -119,7 +119,8 @@ typedef enum { CT_NONE, /* no port number */ CT_DLCI, /* Frame Relay DLCI */ CT_ISDN, /* ISDN channel number */ - CT_X25 /* X.25 logical channel number */ + CT_X25, /* X.25 logical channel number */ + CT_ISUP /* ISDN User Part CIC */ /* Could also have ATM VPI/VCI pairs */ } circuit_type; |