aboutsummaryrefslogtreecommitdiffstats
path: root/asn1
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2007-01-13 23:02:06 +0000
committerAnders Broman <anders.broman@ericsson.com>2007-01-13 23:02:06 +0000
commitff5d1745e3b3ce381d7f9e46b0a490624bdfc1ae (patch)
treeb46e20208c9021c97b0d885c784c3c731e25ba43 /asn1
parent623ca476f1495f85f823e8c3b23f5a6b0fcb8b2a (diff)
Handle the case ehere TCAP identifier isn't present.
svn path=/trunk/; revision=20421
Diffstat (limited to 'asn1')
-rw-r--r--asn1/ansi_map/ansi_map.asn2
-rw-r--r--asn1/ansi_map/ansi_map.cnf2
-rw-r--r--asn1/ansi_map/packet-ansi_map-template.c5
3 files changed, 7 insertions, 2 deletions
diff --git a/asn1/ansi_map/ansi_map.asn b/asn1/ansi_map/ansi_map.asn
index 3a64c2895d..680b558a19 100644
--- a/asn1/ansi_map/ansi_map.asn
+++ b/asn1/ansi_map/ansi_map.asn
@@ -6595,7 +6595,7 @@ CallRecoveryIDList ::= SET OF [303] IMPLICIT CallRecoveryID
-- callRecoveryIDopt [303] IMPLICIT CallRecoveryID OPTIONAL,
-- }
--- 6.5.2.ei
+-- 6.5.2.ei TIA/EIA-41.5-D Modifications N.S0018Re
-- 1 0 0 1 1 1 1 1 (0x9f)
-- 1 0 0 0 0 0 1 0 (0x82)
-- 0 0 1 1 0 0 0 1 (0x31)(305)
diff --git a/asn1/ansi_map/ansi_map.cnf b/asn1/ansi_map/ansi_map.cnf
index c8b0c77bd5..c7ae8ca049 100644
--- a/asn1/ansi_map/ansi_map.cnf
+++ b/asn1/ansi_map/ansi_map.cnf
@@ -29,7 +29,7 @@ OriginationRequestRes
opcode = g_malloc(sizeof(gint));
OperationCode = OperationCode&0x00ff;
*opcode = OperationCode;
- if (!pinfo->fd->flags.visited)
+ if ((!pinfo->fd->flags.visited)&&(p_private_tcap->TransactionID_str))
/* Only do this once XXX I hope its the right thing to do */
g_hash_table_insert(TransactionId_table, g_strdup(p_private_tcap->TransactionID_str), opcode);
}
diff --git a/asn1/ansi_map/packet-ansi_map-template.c b/asn1/ansi_map/packet-ansi_map-template.c
index 4d67e7d601..0892ce8045 100644
--- a/asn1/ansi_map/packet-ansi_map-template.c
+++ b/asn1/ansi_map/packet-ansi_map-template.c
@@ -3206,6 +3206,11 @@ dissect_ansi_map_winoperationscapability(tvbuff_t *tvb, packet_info *pinfo, prot
}
+/* 6.5.2.ei TIA/EIA-41.5-D Modifications N.S0018Re */
+/* Octet 1,2 1st MarketID */
+/* Octet 3 1st MarketSegmentID */
+/* Octet 4,5 1st DMH_ServiceID value */
+/* Second marcet ID etc */
/* 6.5.2.ek ControlNetworkID N.S0018*/
static void
dissect_ansi_map_controlnetworkid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){