diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2017-11-29 09:18:10 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-11-29 09:06:49 +0000 |
| commit | d1a6742d9bcd76c0d4e52c7353d0740463e45bb0 (patch) | |
| tree | 94b1d7f811c81db03a1449d5559c15cdb9a0be5c | |
| parent | 140282cbf012fb3eac20d24c388d12e8a875501e (diff) | |
[L2TP] Enhance info col layout.
Change-Id: Ib16b71b47f97516db55412f1881d995706e723b1
Reviewed-on: https://code.wireshark.org/review/24645
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-l2tp.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index 323e868035..7fbc302890 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -2538,7 +2538,7 @@ process_l2tpv3_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, { int idx = *pIdx; int sid; - guint32 oam_cell = 0; + guint32 oam_cell = 0; proto_tree *l2_specific = NULL; proto_item *ti = NULL; tvbuff_t *next_tvb; @@ -2583,17 +2583,18 @@ process_l2tpv3_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (cookie_len == -1) cookie_len = L2TPv3_COOKIE_DEFAULT; - col_add_fstr(pinfo->cinfo,COL_INFO, - "%s (session id=%u)", - data_msg, sid); + col_append_fstr(pinfo->cinfo, COL_INFO, "D[S:0x%02X]", sid); + col_set_fence(pinfo->cinfo, COL_INFO); if (tree) { proto_tree_add_item(l2tp_tree, hf_l2tp_sid, tvb, idx-4, 4, ENC_BIG_ENDIAN); proto_item_set_len(l2tp_item, idx); - if (!(tvb_offset_exists(tvb, idx))) + if (!(tvb_offset_exists(tvb, idx))) { return; - if (cookie_len != 0) + } + if (cookie_len != 0) { proto_tree_add_item(l2tp_tree, hf_l2tp_cookie, tvb, idx, cookie_len, ENC_NA); + } } switch(l2_spec){ |