diff --git a/AUTHORS b/AUTHORS index 223a023689..1375c88f26 100644 --- a/AUTHORS +++ b/AUTHORS @@ -2121,7 +2121,7 @@ Martin Mathieson { Catapult DCT2000 file support UMTS FP support LTE: MAC, RLC and PDCP support - LTE MAC Stats + LTE MAC and RLC Stats } Christian Wagner { diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index 5b52755ccb..d996bd778e 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -807,7 +807,7 @@ static void dissect_ccpri_lte(tvbuff_t *tvb, gint offset, /* Top-level opcode */ top_ti = proto_tree_add_item(tree, hf_catapult_dct2000_lte_ccpri_opcode, - tvb, offset, 1, FALSE); + tvb, offset, 1, FALSE); opcode = tvb_get_guint8(tvb, offset++); /* Skip 2-byte length field */ @@ -815,7 +815,7 @@ static void dissect_ccpri_lte(tvbuff_t *tvb, gint offset, /* Cell-id */ proto_tree_add_item(tree, hf_catapult_dct2000_lte_cellid, - tvb, offset, 2, FALSE); + tvb, offset, 2, FALSE); offset += 2; /* Status (ind only) */ @@ -823,7 +823,7 @@ static void dissect_ccpri_lte(tvbuff_t *tvb, gint offset, proto_item *ti; guint8 status = tvb_get_guint8(tvb, offset); ti = proto_tree_add_item(tree, hf_catapult_dct2000_lte_ccpri_status, - tvb, offset, 1, FALSE); + tvb, offset, 1, FALSE); offset++; if (status != 0) { @@ -1826,7 +1826,6 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /**********************************************************/ /* Show context.port in src or dest column as appropriate */ - /* TODO: doesn't work at the moment... */ if (direction == 0) { col_add_fstr(pinfo->cinfo, COL_DEF_SRC, "%s.%u", diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c index 17fad0f059..1102fcedbe 100644 --- a/epan/dissectors/packet-mac-lte.c +++ b/epan/dissectors/packet-mac-lte.c @@ -936,7 +936,7 @@ static void write_pdu_label_and_info(proto_item *ti1, proto_item *ti2, { #define MAX_INFO_BUFFER 256 static char info_buffer[MAX_INFO_BUFFER]; - + va_list ap; va_start(ap, format); @@ -1333,7 +1333,6 @@ static void dissect_bch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, val_to_str_const(p_mac_lte_info->rntiType, bch_transport_channel_vals, "Unknown")); - /* Show which transport layer it came in on (inferred from RNTI type) */ ti = proto_tree_add_uint(tree, hf_mac_lte_context_bch_transport_channel, @@ -3086,8 +3085,6 @@ void dissect_mac_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Queue tap info */ - /* TODO: if any of above (esp RRC dissection) throws exception, this isn't reached, - but if call too early, won't have details... */ tap_queue_packet(mac_lte_tap, pinfo, &tap_info); } diff --git a/epan/dissectors/packet-rlc-lte.c b/epan/dissectors/packet-rlc-lte.c index 02d3500086..f51cc9a02a 100644 --- a/epan/dissectors/packet-rlc-lte.c +++ b/epan/dissectors/packet-rlc-lte.c @@ -1115,9 +1115,9 @@ static void dissect_rlc_lte_tm(tvbuff_t *tvb, packet_info *pinfo, case CHANNEL_TYPE_SRB: case CHANNEL_TYPE_DRB: + default: - /* Shouldn't happen, just return... - TODO: should flag an error? */ + /* Shouldn't happen, just return... */ return; }