diff options
| -rw-r--r-- | epan/dissectors/packet-atm.c | 10 | ||||
| -rw-r--r-- | epan/dissectors/packet-rtcp.c | 8 |
2 files changed, 15 insertions, 3 deletions
diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c index 559efc7866..900877a387 100644 --- a/epan/dissectors/packet-atm.c +++ b/epan/dissectors/packet-atm.c @@ -959,6 +959,15 @@ dissect_reassembled_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_uint(atm_tree, hf_atm_vci, tvb, 0, 0, pinfo->pseudo_header->atm.vci); + /* Also show vpi/vci in info column */ + if (check_col(pinfo->cinfo, COL_INFO)) + { + col_append_fstr(pinfo->cinfo, COL_INFO, " VPI=%u, VCI=%u", + pinfo->pseudo_header->atm.vpi, + pinfo->pseudo_header->atm.vci); + } + + next_tvb = tvb; if (truncated) { /* @@ -1644,6 +1653,7 @@ proto_register_atm(void) "ATM LANE", "lane"); register_dissector("lane", dissect_lane, proto_atm_lane); + register_dissector("atm_untruncated", dissect_atm_untruncated, proto_atm); } void diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index e1309248cf..79e830f9d8 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -519,9 +519,11 @@ dissect_rtcp_heur( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) packet_type = tvb_get_guint8(tvb, offset + 1); /* First packet within compound packet is supposed to be a sender - or receiver report. Also see BYE so allow this... */ + or receiver report. + - allow BYE because this happens anyway + - allow APP because TBCP ("PoC1") packets aren't compound... */ if (!((packet_type == RTCP_SR) || (packet_type == RTCP_RR) || - packet_type == RTCP_BYE)) + packet_type == RTCP_BYE) || (packet_type == RTCP_APP)) { return FALSE; } @@ -2258,7 +2260,7 @@ proto_register_rtcp(void) "Last SR timestamp", "rtcp.ssrc.lsr", FT_UINT32, - BASE_DEC, + BASE_DEC_HEX, NULL, 0x0, "", HFILL |