Special casing is no longer necessary for formatting of AT_STRINGZ in col_set_addr() as

address_to_str_buf() does now take COL_MAX_LEN as a parameter.

Add support for AT_URI to col_expr for addresses in col_set_addr(). The field names are "uri.src" and "uri.dst".


svn path=/trunk/; revision=23017

1 files changed, 10 insertions, 15 deletions

diff --git a/epan/column-utils.c b/epan/column-utils.c
index 1c669c3806..3da93a755a 100644
--- a/epan/column-utils.c
+++ b/epan/column-utils.c
@@ -922,22 +922,9 @@ col_set_addr(packet_info *pinfo, int col, address *addr, gboolean is_res,
     return;	/* no address, nothing to do */
 
   if (is_res) {
-    get_addr_name_buf(addr, pinfo->cinfo->col_buf[col],COL_MAX_LEN);
+    get_addr_name_buf(addr, pinfo->cinfo->col_buf[col], COL_MAX_LEN);
   } else {
-    switch (addr->type) {
-
-    case AT_STRINGZ:
-      /* XXX - should be done in "address_to_str_buf()", but that routine
-         doesn't know COL_MAX_LEN; it should be changed to take the
-         maximum length as an argument. */
-      strncpy(pinfo->cinfo->col_buf[col], addr->data, COL_MAX_LEN);
-      pinfo->cinfo->col_buf[col][COL_MAX_LEN - 1] = '\0';
-      break;
-
-    default:
-      address_to_str_buf(addr, pinfo->cinfo->col_buf[col], COL_MAX_LEN);
-      break;
-    }
+    address_to_str_buf(addr, pinfo->cinfo->col_buf[col], COL_MAX_LEN);
   }
   pinfo->cinfo->col_data[col] = pinfo->cinfo->col_buf[col];
 
@@ -986,6 +973,14 @@ col_set_addr(packet_info *pinfo, int col, address *addr, gboolean is_res,
     strcpy(pinfo->cinfo->col_expr_val[col], pinfo->cinfo->col_buf[col]);
     break;
 
+  case AT_URI:
+    if (is_src)
+      strcpy(pinfo->cinfo->col_expr[col], "uri.src");
+    else
+      strcpy(pinfo->cinfo->col_expr[col], "uri.dst");
+    address_to_str_buf(addr, pinfo->cinfo->col_expr_val[col], COL_MAX_LEN);
+    break;
+
   default:
     break;
   }