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

Custom columnfication: 

* Deprecate COL_BSSGP_TLLI (GPRS BSSGP IE TLLI). Use bssgp.tlli

svn path=/trunk/; revision=29546
This commit is contained in:
Anders Broman 2009-08-25 05:42:14 +00:00
parent 9b62cfb7f1
commit 2dd60e1b66
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/column.c
View File

@ -73,7 +73,7 @@ col_format_to_string(gint fmt) {
"%XR", /* 23) COL_RXID */
"%C", /* 24) !! DEPRECATED !! - COL_FR_DLCI */
"%F", /* 25) COL_FREQ_CHAN */
"%l", /* 26) COL_BSSGP_TLLI */
"%l", /* 26) !! DEPRECATED !! - COL_BSSGP_TLLI */
"%P", /* 27) !! DEPRECATED !! - COL_HPUX_DEVID */
"%H", /* 28) !! DEPRECATED !! - COL_HPUX_SUBSYS */
"%hd", /* 29) COL_DEF_DL_DST */

2
epan/column_info.h
View File

@ -92,7 +92,7 @@ enum {
COL_RXID, /* 23) Fibre Channel RXID */
COL_FR_DLCI, /* 24) !! DEPRECATED !! - Frame Relay DLCI */
COL_FREQ_CHAN, /* 25) IEEE 802.11 (and WiMax?) - Channel */
COL_BSSGP_TLLI, /* 26) GPRS BSSGP IE TLLI */
COL_BSSGP_TLLI, /* 26) !! DEPRECATED !! - GPRS BSSGP IE TLLI */
COL_HPUX_DEVID, /* 27) !! DEPRECATED !! - HP-UX Nettl Device ID */
COL_HPUX_SUBSYS, /* 28) !! DEPRECATED !! - HP-UX Nettl Subsystem */
COL_DEF_DL_DST, /* 29) Data link layer dest address */

1
epan/prefs.c
View File

@ -1753,6 +1753,7 @@ try_convert_to_custom_column(gpointer *el_data)
} migrated_columns[] = {
{ COL_COS_VALUE, "vlan.priority" },
{ COL_CIRCUIT_ID, "iax2.call" },
{ COL_BSSGP_TLLI, "bssgp.tlli" },
{ COL_HPUX_SUBSYS, "nettl.subsys" },
{ COL_HPUX_DEVID, "nettl.devid" },
{ COL_DSCP_VALUE, "ip.dsfield" },

1
gtk/new_packet_list.c
View File

@ -181,7 +181,6 @@ new_packet_list_append(column_info *cinfo, frame_data *fdata, packet_info *pinfo
case COL_DCE_CALL: /* 9) DCE/RPC connection oriented call id OR datagram sequence number */
case COL_DCE_CTX: /* 10) DCE/RPC connection oriented context id */
case COL_8021Q_VLAN_ID: /* 0) 802.1Q vlan ID */
case COL_BSSGP_TLLI: /* 26) GPRS BSSGP IE TLLI */
case COL_FREQ_CHAN: /* 25) IEEE 802.11 (and WiMax?) - Channel */
/* These too ? */
case COL_RSSI: /* 35) IEEE 802.11 - received signal strength */