diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-09-03 19:59:26 +0200 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2016-09-03 19:06:37 +0000 |
commit | 4a3b320c98febdd8fae2d3bb8f017b1aa46f1b75 (patch) | |
tree | 80ec3d19b276f8e8231739a75738510d603e266c /epan/dissectors/asn1/s1ap/packet-s1ap-template.c | |
parent | 8f5ab27b4fd0d7cf92a85416ce26c4f9136273e5 (diff) | |
download | wireshark-4a3b320c98febdd8fae2d3bb8f017b1aa46f1b75.tar.gz |
S1AP: add more LTE-RRC transparent containers dissection
Change-Id: I08246d3fa97ceafefd3a1ab5c36de50a5728fd19
Reviewed-on: https://code.wireshark.org/review/17474
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/asn1/s1ap/packet-s1ap-template.c')
-rw-r--r-- | epan/dissectors/asn1/s1ap/packet-s1ap-template.c | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/epan/dissectors/asn1/s1ap/packet-s1ap-template.c b/epan/dissectors/asn1/s1ap/packet-s1ap-template.c index 0cbb471863..0de9f1f343 100644 --- a/epan/dissectors/asn1/s1ap/packet-s1ap-template.c +++ b/epan/dissectors/asn1/s1ap/packet-s1ap-template.c @@ -1,6 +1,6 @@ /* packet-s1ap.c * Routines for E-UTRAN S1 Application Protocol (S1AP) packet dissection - * Copyright 2007-2010, Anders Broman <anders.broman@ericsson.com> + * Copyright 2007-2016, Anders Broman <anders.broman@ericsson.com> * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -22,7 +22,7 @@ * * Based on the RANAP dissector * - * References: 3GPP TS 36.413 V9.2.0 (2010-03) + * References: 3GPP TS 36.413 V13.3.0 (2016-06) */ #include "config.h" @@ -83,6 +83,10 @@ static int ett_s1ap_RIMInformation = -1; static int ett_s1ap_Cdma2000PDU = -1; static int ett_s1ap_Cdma2000SectorID = -1; static int ett_s1ap_UERadioPagingInformation = -1; +static int ett_s1ap_UE_HistoryInformationFromTheUE = -1; +static int ett_s1ap_CELevel = -1; +static int ett_s1ap_UE_RLF_Report_Container = -1; +static int ett_s1ap_UE_RLF_Report_Container_for_extended_bands = -1; #include "packet-s1ap-ett.c" @@ -135,6 +139,18 @@ static int dissect_SourceBSS_ToTargetBSS_TransparentContainer_PDU(tvbuff_t *tvb, static int dissect_TargetBSS_ToSourceBSS_TransparentContainer_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); #endif +static void +s1ap_Threshold_RSRP_fmt(gchar *s, guint32 v) +{ + g_snprintf(s, ITEM_LABEL_LENGTH, "%ddBm (%u)", (gint32)v-140, v); +} + +static void +s1ap_Threshold_RSRQ_fmt(gchar *s, guint32 v) +{ + g_snprintf(s, ITEM_LABEL_LENGTH, "%.1fdB (%u)", ((float)v/2)-20, v); +} + #include "packet-s1ap-fn.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) @@ -264,6 +280,10 @@ void proto_register_s1ap(void) { &ett_s1ap_Cdma2000PDU, &ett_s1ap_Cdma2000SectorID, &ett_s1ap_UERadioPagingInformation, + &ett_s1ap_UE_HistoryInformationFromTheUE, + &ett_s1ap_CELevel, + &ett_s1ap_UE_RLF_Report_Container, + &ett_s1ap_UE_RLF_Report_Container_for_extended_bands, #include "packet-s1ap-ettarr.c" }; |