diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2006-01-20 08:48:43 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2006-01-20 08:48:43 +0000 |
| commit | 256225d73f9b4740e9dac67a48ac8de6b9fb8b9a (patch) | |
| tree | df3d721e012cd3ce2b0ce83a21a55ef3329db7c4 /epan/column.c | |
| parent | 3facb43c073fc330eea6238ac8fbcba6971bee97 (diff) | |
Mike Hall:
This will add the ability to configure a .1q vlan column in ethereal.
Me:
Change 1q -> 1Q
svn path=/trunk/; revision=17058
Diffstat (limited to 'epan/column.c')
| -rw-r--r-- | epan/column.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/epan/column.c b/epan/column.c index 17993bd7df..138d2822b8 100644 --- a/epan/column.c +++ b/epan/column.c @@ -50,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" }; if (fmt < 0 || fmt >= NUM_COL_FMTS) @@ -108,6 +108,7 @@ 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", }; const gchar * @@ -205,6 +206,9 @@ 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; default: break; } @@ -422,6 +426,9 @@ get_column_longest_string(gint format) case COL_DCE_CALL: return "0000"; break; + case COL_8021Q_VLAN_ID: + return "0000"; + break; default: /* COL_INFO */ return "Source port: kerberos-master Destination port: kerberos-master"; break; @@ -568,6 +575,9 @@ get_column_format_from_str(gchar *str) { case 'y': return COL_DCE_CALL; break; + case 'v': + return COL_8021Q_VLAN_ID; + break; } cptr++; } |