diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2006-11-29 06:44:07 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2006-11-29 06:44:07 +0000 |
| commit | 6c9ce8acf8610f9c5ff99215eb3650ec0b6e0688 (patch) | |
| tree | 8ec6fc9d92c3351e1dec0eec3a14a7a1290a6155 /epan/column.c | |
| parent | 35482921b20efde6d5856cad5df217bfabd323c8 (diff) | |
Froim Rene Pilz:
This patch consists also the last issues. Additionally it solves:
- For the SSCOP frames the AAL5 decoding was not performed due to an earlier patch. This caused that no SSCOP message was properly decoded.
- As the detection between a LANE frame and a SSCOP frame is rather hard a switch within the atm dissector is included which enforce SSCOP dissecting over a LANE frame. At the moment I do not see a better solution for that.
svn path=/trunk/; revision=20013
Diffstat (limited to 'epan/column.c')
| -rw-r--r-- | epan/column.c | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/epan/column.c b/epan/column.c index 33a85eb9d6..dc56cd0a2e 100644 --- a/epan/column.c +++ b/epan/column.c @@ -93,7 +93,9 @@ col_format_to_string(gint fmt) { "%y", "%z", "%v", - "%E" + "%E", + "%C", + "%l" }; if (fmt < 0 || fmt >= NUM_COL_FMTS) @@ -154,6 +156,8 @@ static const gchar *dlist[NUM_COL_FMTS] = { "DCE/RPC context ID (cn_ctx_id)", /* COL_DCE_CTX */ "802.1Q VLAN id", /* COL_8021Q_VLAN_ID */ "TEI", /* XXX - why is it missing in column_utils.c and elsewhere? */ + "Frame Relay DLCI", /* COL_FR_DLCI */ + "GPRS BSSGP TLLI", /* COL_BSSGP_TLLI */ }; const gchar * @@ -260,6 +264,12 @@ get_column_format_matches(gboolean *fmt_list, gint format) { case COL_TEI: fmt_list[COL_TEI] = TRUE; break; + case COL_FR_DLCI: + fmt_list[COL_FR_DLCI] = TRUE; + break; + case COL_BSSGP_TLLI: + fmt_list[COL_BSSGP_TLLI] = TRUE; + break; default: break; } @@ -460,7 +470,7 @@ get_column_longest_string(gint format) return "0000000"; break; case COL_VSAN: - return "000000"; + return "000000"; break; case COL_TX_RATE: return "108.0"; @@ -486,6 +496,12 @@ get_column_longest_string(gint format) case COL_TEI: return "127"; break; + case COL_FR_DLCI: + return "8388608"; + break; + case COL_BSSGP_TLLI: + return "0xffffffff"; + break; default: /* COL_INFO */ return "Source port: kerberos-master Destination port: kerberos-master"; break; @@ -640,6 +656,10 @@ get_column_format_from_str(gchar *str) { break; case 'E': return COL_TEI; + case 'C': + return COL_FR_DLCI; + case 'l': + return COL_BSSGP_TLLI; break; } cptr++; |