diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-01-26 19:51:48 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-01-26 19:51:48 +0000 |
| commit | e1d434ee6a56f86ad9e79e2f127382e3bc4409e6 (patch) | |
| tree | 60dfbfa55e0b364d2caae8193486767a61fe8baf /asn1/sabp | |
| parent | 6981aa2c2a465247d0b418d5d6c42325b5a595ad (diff) | |
From Mike Morrin:
Add dissectors for GSM and UMTS Cell Broadcast protocols.
( - the patch for gsmtap )
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6770
svn path=/trunk/; revision=40735
Diffstat (limited to 'asn1/sabp')
| -rw-r--r-- | asn1/sabp/packet-sabp-template.c | 5 | ||||
| -rw-r--r-- | asn1/sabp/sabp.cnf | 36 |
2 files changed, 40 insertions, 1 deletions
diff --git a/asn1/sabp/packet-sabp-template.c b/asn1/sabp/packet-sabp-template.c index 7c735114fa..b8fb84e762 100644 --- a/asn1/sabp/packet-sabp-template.c +++ b/asn1/sabp/packet-sabp-template.c @@ -40,6 +40,7 @@ #include "packet-gsm_map.h" #include "packet-gsm_sms.h" #include <epan/sctpppids.h> +#include "packet-cell_broadcast.h" #define PNAME "UTRAN IuBC interface SABP signaling" #define PSNAME "SABP" @@ -58,6 +59,8 @@ static int ett_sabp = -1; static int ett_sabp_e212 = -1; static int ett_sabp_cbs_data_coding = -1; static int ett_sabp_bcast_msg = -1; +static int ett_sabp_cbs_serial_number = -1; +static int ett_sabp_cbs_new_serial_number = -1; #include "packet-sabp-ett.c" @@ -182,6 +185,8 @@ void proto_register_sabp(void) { &ett_sabp_e212, &ett_sabp_cbs_data_coding, &ett_sabp_bcast_msg, + &ett_sabp_cbs_serial_number, + &ett_sabp_cbs_new_serial_number, #include "packet-sabp-ettarr.c" }; diff --git a/asn1/sabp/sabp.cnf b/asn1/sabp/sabp.cnf index cb6a2d64db..c3f3738cc7 100644 --- a/asn1/sabp/sabp.cnf +++ b/asn1/sabp/sabp.cnf @@ -178,6 +178,40 @@ Error-Indication N sabp.proc.imsg id-Error-Indication if (!parameter_tvb) return offset; subtree = proto_item_add_subtree(actx->created_item, ett_sabp_cbs_data_coding); - sms_encoding = dissect_cbs_data_coding_scheme(parameter_tvb, actx->pinfo, subtree); + sms_encoding = dissect_cbs_data_coding_scheme(parameter_tvb, actx->pinfo, subtree, 0); +#.FN_BODY Message-Identifier VAL_PTR = ¶meter_tvb + tvbuff_t *parameter_tvb=NULL; + +%(DEFAULT_BODY)s + if (!parameter_tvb) + return offset; + dissect_cbs_message_identifier(parameter_tvb, tree, 0); + +#.FN_BODY Serial-Number VAL_PTR = ¶meter_tvb + tvbuff_t *parameter_tvb=NULL; + proto_tree *subtree; + +%(DEFAULT_BODY)s + if (!parameter_tvb) + return offset; + subtree = proto_item_add_subtree(actx->created_item, ett_sabp_cbs_serial_number); + dissect_cbs_serial_number(parameter_tvb, subtree, 0); +#.FN_BODY New-Serial-Number VAL_PTR = ¶meter_tvb + tvbuff_t *parameter_tvb=NULL; + proto_tree *subtree; + +%(DEFAULT_BODY)s + if (!parameter_tvb) + return offset; + subtree = proto_item_add_subtree(actx->created_item, ett_sabp_cbs_new_serial_number); + dissect_cbs_serial_number(parameter_tvb, subtree, 0); + +#.FN_BODY Broadcast-Message-Content VAL_PTR = ¶meter_tvb + tvbuff_t *parameter_tvb=NULL; + +%(DEFAULT_BODY)s + if (!parameter_tvb) + return offset; + dissect_umts_cell_broadcast_message(parameter_tvb, actx->pinfo, proto_tree_get_root(tree)); |