aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-09-07 17:04:08 +0200
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-09-16 02:41:38 +0200
commit7b48749783827ebad52483278df287ece6e7d279 (patch)
tree3bcee364aed9cacff48b5b4fbfdde798b45165a6
parent30f534f887c3b16043362c5aa4a0e21fdbc71e71 (diff)
ranap: include port in RTP TransportLayerInformation
Remove an #if 0 to properly include the port information (verified to work). Adjust test expectations. Change-Id: I45fb134959dea9bcdfbfd9d8a061e67c3cc80fb7
-rw-r--r--src/ranap_msg_factory.c5
-rw-r--r--src/tests/test-ranap.ok8
2 files changed, 4 insertions, 9 deletions
diff --git a/src/ranap_msg_factory.c b/src/ranap_msg_factory.c
index 695a6be..94eb1c5 100644
--- a/src/ranap_msg_factory.c
+++ b/src/ranap_msg_factory.c
@@ -653,14 +653,9 @@ static RANAP_TransportLayerInformation_t *new_transp_info_rtp(uint32_t ip, uint1
RANAP_TransportLayerInformation_t *tli = CALLOC(1, sizeof(*tli));
uint8_t binding_id[4];
-#if 0
binding_id[0] = port >> 8;
binding_id[1] = port & 0xff;
binding_id[2] = binding_id[3] = 0;
-#else
- binding_id[0] = binding_id[1] = binding_id[2] = 0;
- binding_id[3] = 1;
-#endif
new_transp_layer_addr(&tli->transportLayerAddress, ip, use_x213_nsap);
tli->iuTransportAssociation.present = RANAP_IuTransportAssociation_PR_bindingID;
diff --git a/src/tests/test-ranap.ok b/src/tests/test-ranap.ok
index 841edad..2ad19e6 100644
--- a/src/tests/test-ranap.ok
+++ b/src/tests/test-ranap.ok
@@ -91,7 +91,7 @@ Decoded Cause Misc=115
38 02 D8 01 2F A7 20 2F A8 00 00 F4 4C 08 0A 02
80 00 51 40 00 27 20 28 14 00 67 40 00 00 22 28
14 00 3C 40 00 00 00 50 3D 02 00 02 0D C0 35 00
- 01 0A 0B 0C 0D 40 00 00 00 01
+ 01 0A 0B 0C 0D 40 09 26 00 00
</firstValue>
<secondCriticality><ignore/></secondCriticality>
<secondValue>00</secondValue>
@@ -103,11 +103,11 @@ Decoded Cause Misc=115
00 00 01 00 35 00 3A 38 02 D8 01 2F A7 20 2F A8
00 00 F4 4C 08 0A 02 80 00 51 40 00 27 20 28 14
00 67 40 00 00 22 28 14 00 3C 40 00 00 00 50 3D
- 02 00 02 0D C0 35 00 01 0A 0B 0C 0D 40 00 00 00
- 01 40 01 00
+ 02 00 02 0D C0 35 00 01 0A 0B 0C 0D 40 09 26 00
+ 00 40 01 00
</value>
</RANAP_IE>
-00 00 00 4b 00 00 01 00 36 40 44 00 00 01 00 35 00 3a 38 02 d8 01 2f a7 20 2f a8 00 00 f4 4c 08 0a 02 80 00 51 40 00 27 20 28 14 00 67 40 00 00 22 28 14 00 3c 40 00 00 00 50 3d 02 00 02 0d c0 35 00 01 0a 0b 0c 0d 40 00 00 00 01 40 01 00
+00 00 00 4b 00 00 01 00 36 40 44 00 00 01 00 35 00 3a 38 02 d8 01 2f a7 20 2f a8 00 00 f4 4c 08 0a 02 80 00 51 40 00 27 20 28 14 00 67 40 00 00 22 28 14 00 3c 40 00 00 00 50 3d 02 00 02 0d c0 35 00 01 0a 0b 0c 0d 40 09 26 00 00 40 01 00
==> RAB ASSIGNMENT COMMAND (DATA)
<RANAP_ProtocolIE-FieldPair>