diff options
| -rw-r--r-- | epan/column-utils.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-iax2.c | 4 | ||||
| -rw-r--r-- | epan/prefs.c | 3 | ||||
| -rw-r--r-- | epan/wslua/wslua_pinfo.c | 1 | ||||
| -rw-r--r-- | gtk/new_packet_list.c | 2 |
5 files changed, 2 insertions, 12 deletions
diff --git a/epan/column-utils.c b/epan/column-utils.c index 277d9a8319..d657140481 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -1622,10 +1622,6 @@ col_fill_in(packet_info *pinfo, gboolean fill_fd_colums) case COL_IF_DIR: /* currently done by dissectors */ break; - case COL_CIRCUIT_ID: - col_set_circuit_id(pinfo, i); - break; - case COL_SRCIDX: g_snprintf(pinfo->cinfo->col_buf[i], COL_MAX_LEN, "0x%x", pinfo->src_idx); pinfo->cinfo->col_data[i] = pinfo->cinfo->col_buf[i]; diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index b347125c4e..33efdd5573 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -948,10 +948,6 @@ static void iax2_populate_pinfo_from_packet_data(packet_info *pinfo, const iax_ pinfo -> circuit_id = (guint32)p->call_data->forward_circuit_ids[0]; pinfo -> p2p_dir = p->reversed?P2P_DIR_RECV:P2P_DIR_SENT; - if (check_col (pinfo->cinfo, COL_CIRCUIT_ID)) { - col_set_str (pinfo->cinfo, COL_CIRCUIT_ID, "" ); - col_add_fstr(pinfo->cinfo, COL_CIRCUIT_ID, "%u", pinfo->circuit_id); - } if (check_col (pinfo->cinfo, COL_IF_DIR)) col_set_str (pinfo->cinfo, COL_IF_DIR, p->reversed ? "rev" : "fwd" ); } diff --git a/epan/prefs.c b/epan/prefs.c index 1e5d3e7cdd..b73ef014e5 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -1751,7 +1751,8 @@ try_convert_to_custom_column(gpointer *el_data) gint el; gchar *col_expr; } migrated_columns[] = { - { COL_COS_VALUE, "vlan.priority" } + { COL_COS_VALUE, "vlan.priority" }, + { COL_CIRCUIT_ID, "iax2.call" } }; gint haystack_idx; diff --git a/epan/wslua/wslua_pinfo.c b/epan/wslua/wslua_pinfo.c index c6c08f35c6..4c0496f90b 100644 --- a/epan/wslua/wslua_pinfo.c +++ b/epan/wslua/wslua_pinfo.c @@ -331,7 +331,6 @@ static const struct col_names_t colnames[] = { {"oxid",COL_OXID}, {"rxid",COL_RXID}, {"direction",COL_IF_DIR}, - {"circuit_id",COL_CIRCUIT_ID}, {"src_idx",COL_SRCIDX}, {"dst_idx",COL_DSTIDX}, {"vsan",COL_VSAN}, diff --git a/gtk/new_packet_list.c b/gtk/new_packet_list.c index fdddbfd5f4..b44998805a 100644 --- a/gtk/new_packet_list.c +++ b/gtk/new_packet_list.c @@ -140,8 +140,6 @@ new_packet_list_append(column_info *cinfo, frame_data *fdata, packet_info *pinfo fdata->col_text[i] = se_strdup(pinfo->cinfo->col_buf[i]); break; /* Columns based on (binary)data in pinfo */ - case COL_CIRCUIT_ID: /* 3) Circuit ID */ - /* pinfo->circuit_id */ case COL_RES_DST: /* 14) Resolved dest */ case COL_UNRES_DST: /* 15) Unresolved dest */ case COL_DEF_DST: /* 18) Destination address */ |