[CAMEL] Dissect additionalCallingPartyNumber.

Ping-Bug: 10914
Change-Id: I28eb9d7b5192a02f82fe604d20e57aedd706f528
Reviewed-on: https://code.wireshark.org/review/6946
Reviewed-by: Anders Broman <a.broman58@gmail.com>

2 files changed, 29 insertions, 0 deletions

diff --git a/asn1/camel/camel.cnf b/asn1/camel/camel.cnf
index 2342c1933d..b12b0fbc59 100644
--- a/asn1/camel/camel.cnf
+++ b/asn1/camel/camel.cnf
@@ -662,6 +662,33 @@ proto_tree *subtree;
 
 #.END
 
+#.FN_BODY AdditionalCallingPartyNumber VAL_PTR = &parameter_tvb
+/*
+* Digits {PARAMETERS-BOUND : bound} ::= OCTET STRING (SIZE(
+*	bound.&minDigitsLength .. bound.&maxDigitsLength))
+*-- Indicates the address signalling digits.
+*-- Refer to ETSI EN 300 356 1 [23] Generic Number & Generic Digits parameters for encoding.
+*-- The coding of the subfields 'NumberQualifier' in Generic Number and 'TypeOfDigits' in
+*-- Generic Digits are irrelevant to the CAP;
+*-- the ASN.1 tags are sufficient to identify the parameter.
+*-- The ISUP format does not allow to exclude these subfields,
+*-- therefore the value is network operator specific.
+*--
+*-- The following parameters shall use Generic Number:
+*--  - AdditionalCallingPartyNumber for InitialDP
+*
+*/
+ tvbuff_t	*parameter_tvb;
+ proto_tree *subtree;
+
+  offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
+                                       &parameter_tvb);
+
+  if (!parameter_tvb)
+	return offset;
+  subtree = proto_item_add_subtree(actx->created_item, ett_camel_additionalcallingpartynumber);
+  dissect_isup_generic_number_parameter(parameter_tvb, actx->pinfo, subtree, NULL);
+
 #.TYPE_ATTR
 PDPTypeOrganization TYPE = FT_UINT8  DISPLAY = BASE_DEC  BITMASK = 0x0f STRINGS = VALS(gsm_map_PDP_Type_Organisation_vals)
 DateAndTime	TYPE = FT_STRING DISPLAY = BASE_NONE
diff --git a/asn1/camel/packet-camel-template.c b/asn1/camel/packet-camel-template.c
index 8c204d44fb..4488eee513 100644
--- a/asn1/camel/packet-camel-template.c
+++ b/asn1/camel/packet-camel-template.c
@@ -137,6 +137,7 @@ static gint ett_camel_stat = -1;
 static gint ett_camel_calledpartybcdnumber = -1;
 static gint ett_camel_callingpartynumber = -1;
 static gint ett_camel_locationnumber = -1;
+static gint ett_camel_additionalcallingpartynumber = -1;
 
 #include "packet-camel-ett.c"
 
@@ -1403,6 +1404,7 @@ void proto_register_camel(void) {
 	&ett_camel_calledpartybcdnumber,
 	&ett_camel_callingpartynumber,
 	&ett_camel_locationnumber,
+	&ett_camel_additionalcallingpartynumber,
 
 #include "packet-camel-ettarr.c"
   };