diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2010-11-17 08:18:30 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2010-11-17 08:18:30 +0000 |
| commit | 1913b3dd3e5c68a4cf2e9cf75d10bb54d08d860c (patch) | |
| tree | 7417b44d61321c7909d2dd5c28929b029297a720 /asn1 | |
| parent | 62067368a0bc8dd3ac966d17b8a44d7c53061787 (diff) | |
- Use SABP:s SCTP ppid.
- Use value_string_ext.
svn path=/trunk/; revision=34924
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/sabp/packet-sabp-template.c | 2 | ||||
| -rw-r--r-- | asn1/sabp/sabp.cnf | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/asn1/sabp/packet-sabp-template.c b/asn1/sabp/packet-sabp-template.c index d322a7e3b8..ba6f9de5fc 100644 --- a/asn1/sabp/packet-sabp-template.c +++ b/asn1/sabp/packet-sabp-template.c @@ -39,6 +39,7 @@ #include "packet-e212.h" #include "packet-gsm_map.h" #include "packet-gsm_sms.h" +#include <epan/sctpppids.h> #define PNAME "UTRAN IuBC interface SABP signaling" #define PSNAME "SABP" @@ -216,6 +217,7 @@ proto_reg_handoff_sabp(void) sabp_tcp_handle = find_dissector("sabp.tcp"); dissector_add("udp.port", 3452, sabp_handle); dissector_add("tcp.port", 3452, sabp_tcp_handle); + dissector_add("sctp.ppi", SABP_PAYLOAD_PROTOCOL_ID, sabp_handle); #include "packet-sabp-dis-tab.c" diff --git a/asn1/sabp/sabp.cnf b/asn1/sabp/sabp.cnf index e0d8a8cbce..cb6a2d64db 100644 --- a/asn1/sabp/sabp.cnf +++ b/asn1/sabp/sabp.cnf @@ -18,6 +18,11 @@ SABP-PDU ProcedureCode ProtocolIE-ID +#.USE_VALS_EXT +ProcedureCode +ProtocolIE-ID +Cause + #.OMIT_ASSIGNMENT Presence ProtocolIE-ContainerList @@ -39,7 +44,7 @@ MessageStructure/_item/repetitionNumber repetitionNumber1 #.FN_PARS ProtocolIE-ID VAL_PTR=&ProtocolIE_ID #.FN_FTR ProtocolIE-ID if (tree) { - proto_item_append_text(proto_item_get_parent_nth(actx->created_item, 2), ": %s", val_to_str(ProtocolIE_ID, VALS(sabp_ProtocolIE_ID_vals), "unknown (%d)")); + proto_item_append_text(proto_item_get_parent_nth(actx->created_item, 2), ": %s", val_to_str_ext(ProtocolIE_ID, &sabp_ProtocolIE_ID_vals_ext, "unknown (%d)")); } #.END @@ -51,9 +56,8 @@ MessageStructure/_item/repetitionNumber repetitionNumber1 #.FN_PARS ProcedureCode VAL_PTR = &ProcedureCode #.FN_FTR ProcedureCode - if (check_col(actx->pinfo->cinfo, COL_INFO)) col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", - val_to_str(ProcedureCode, sabp_ProcedureCode_vals, + val_to_str_ext(ProcedureCode, &sabp_ProcedureCode_vals_ext, "unknown message")); #.END |