From Mark C. Brown:

[obnox/wireshark/wip.git] / epan / column.c

diff --git a/epan/column.c b/epan/column.c
index 90dae767092aad59c589e5d16b1f9a388456d6ca..b3d956aa960f6a7dbe39935e39fbf5dd7d3ff345 100644 (file)
--- a/epan/column.c
+++ b/epan/column.c
@@ -35,10 +35,6 @@
 #include <unistd.h>
 #endif
 
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
 #include <epan/timestamp.h>
 #include <epan/prefs.h>
 #include <epan/column.h>
@@ -54,7 +50,7 @@ col_format_to_string(gint fmt) {
        "%rd", "%ud", "%hd", "%rhd", "%uhd", "%nd", "%rnd",
        "%und", "%S", "%rS", "%uS", "%D", "%rD", "%uD", "%p",
        "%i", "%L", "%B", "%XO", "%XR", "%I", "%c", "%Xs", 
-       "%Xd", "%V", "%x", "%e", "%H", "%P", "%y"
+       "%Xd", "%V", "%x", "%e", "%H", "%P", "%y", "%v", "%E"
 };
                      
   if (fmt < 0 || fmt >= NUM_COL_FMTS)
@@ -112,6 +108,8 @@ static const gchar *dlist[NUM_COL_FMTS] = {
        "HP-UX Subsystem",
        "HP-UX Device ID",
        "DCE/RPC call (cn_call_id / dg_seqnum)",
+       "802.1Q VLAN id",
+       "TEI",
 };
 
 const gchar *
@@ -209,6 +207,12 @@ get_column_format_matches(gboolean *fmt_list, gint format) {
     case COL_DCE_CALL:
       fmt_list[COL_DCE_CALL] = TRUE;
       break;
+    case COL_8021Q_VLAN_ID:
+      fmt_list[COL_8021Q_VLAN_ID] = TRUE;
+      break;
+    case COL_TEI:
+      fmt_list[COL_TEI] = TRUE;
+      break;
     default:
       break;
   }
@@ -426,6 +430,12 @@ get_column_longest_string(gint format)
     case COL_DCE_CALL:
       return "0000";
       break;
+    case COL_8021Q_VLAN_ID:
+      return "0000";
+      break;
+    case COL_TEI:
+      return "127";
+      break;
     default: /* COL_INFO */
       return "Source port: kerberos-master  Destination port: kerberos-master";
       break;
@@ -572,6 +582,12 @@ get_column_format_from_str(gchar *str) {
       case 'y':
        return COL_DCE_CALL;
        break;
+      case 'v':
+       return COL_8021Q_VLAN_ID;
+       break;
+      case 'E':
+       return COL_TEI;
+       break;
     }
     cptr++;
   }