summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2017-12-17 20:50:34 +0100
committerHarald Welte <laforge@gnumonks.org>2017-12-17 20:51:48 +0100
commit62e40855c2b1b50627dba5b187be8869e2cb2054 (patch)
tree216d9a083fc3a91db44eab26c4c7080835e8b1b6
parent84ea2e037490a9ad6c0a192cf237f88fd83cdd88 (diff)
gsm0808_create_cipher_reject: Fix encoding of Cause IE
The Cause IE in the 08.08 CIPHER MODE REJECT is a normal TLV IE, and not just a value. Let's make sure we encode the cause value properly. Change-Id: I4f5b231edf6dcb0a9c2bbafb2a59f301f3b2402b Closes: OS#2766
-rw-r--r--src/gsm/gsm0808.c3
-rw-r--r--tests/gsm0808/gsm0808_test.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c
index 2396a106..abf3d251 100644
--- a/src/gsm/gsm0808.c
+++ b/src/gsm/gsm0808.c
@@ -240,7 +240,8 @@ struct msgb *gsm0808_create_cipher_reject(uint8_t cause)
if (!msg)
return NULL;
- msgb_tv_put(msg, BSS_MAP_MSG_CIPHER_MODE_REJECT, cause);
+ msgb_v_put(msg, BSS_MAP_MSG_CIPHER_MODE_REJECT);
+ msgb_tlv_put(msg, GSM0808_IE_CAUSE, 1, &cause);
msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));
diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c
index 28bd7f72..189d5483 100644
--- a/tests/gsm0808/gsm0808_test.c
+++ b/tests/gsm0808/gsm0808_test.c
@@ -233,7 +233,7 @@ static void test_create_cipher_complete()
static void test_create_cipher_reject()
{
- static const uint8_t res[] = { 0x00, 0x02, 0x59, 0x23 };
+ static const uint8_t res[] = { 0x00, 0x04, 0x59, 0x04, 0x01, 0x23 };
struct msgb *msg;
printf("Testing creating Cipher Reject\n");