diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-03-02 21:29:15 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-03-02 21:29:15 +0000 |
| commit | aa06c53ff4c1e4510aa141135abb5551076df7bb (patch) | |
| tree | b873c3753a60d9f5661e40b9229d27105ac9739a /epan/column.c | |
| parent | 4fa3d0a550c11bf22fe4c3688ce21c89937a640c (diff) | |
from Daniele Orlandi:
The attached patch adds support for LAPD frames captured using vISDN thru
libpcap. The support has already been included in libpcap.
The patch adds a new wiretap encapsulation, the necessary glue to decode
SLL-encapsulated frames, and some minor change in the LAPD dissector in order
to support the remote-to-remote frames captured on the ISDN E-Channel.
Please apply ethereal-encap-table.diff before, as it fixes a misalignment in
the encapsulation names table.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@17451 f5534014-38df-0310-8fa8-9805f1628bb7
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 138d2822b8..b3d956aa96 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", "%v" + "%Xd", "%V", "%x", "%e", "%H", "%P", "%y", "%v", "%E" }; if (fmt < 0 || fmt >= NUM_COL_FMTS) @@ -109,6 +109,7 @@ static const gchar *dlist[NUM_COL_FMTS] = { "HP-UX Device ID", "DCE/RPC call (cn_call_id / dg_seqnum)", "802.1Q VLAN id", + "TEI", }; const gchar * @@ -209,6 +210,9 @@ get_column_format_matches(gboolean *fmt_list, gint format) { case COL_8021Q_VLAN_ID: fmt_list[COL_8021Q_VLAN_ID] = TRUE; break; + case COL_TEI: + fmt_list[COL_TEI] = TRUE; + break; default: break; } @@ -429,6 +433,9 @@ get_column_longest_string(gint format) 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; @@ -578,6 +585,9 @@ get_column_format_from_str(gchar *str) { case 'v': return COL_8021Q_VLAN_ID; break; + case 'E': + return COL_TEI; + break; } cptr++; } |