Custom columfication:

* Deprecate COL_CIRCUIT_ID (Circuit ID). Use iax2.call

svn path=/trunk/; revision=29515

diff --git a/epan/column-utils.c b/epan/column-utils.c
index 277d9a831925760713a4564ed5281576f62e6798..d657140481ca711c2cf6eb2fc1b8e8fce8f968b6 100644 (file)
--- 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 b347125c4e2977bf45f0f5ee2362aff64af275eb..33efdd557359ccc4b3329b29f499c85b229e565b 100644 (file)
--- 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 1e5d3e7cdd613d2f21a583936cf820dd83463b7d..b73ef014e553d350c5497b04f65be5cb9fb9ef78 100644 (file)
--- 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 c6c08f35c6b8976fa5e4580f474c2ba967357061..4c0496f90b5f6f44f814db967c85327102b0d42c 100644 (file)
--- 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 fdddbfd5f4b74f496dc83e6aa9babcc28c2c3be6..b44998805a31c53a1b53b14849fe8b1b69017c9d 100644 (file)
--- 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 */