LCLS: enc/dec entire parameter set instead of GCR
In 3GPP TS 48.008 the Global Call Reference IE is only used in HANDOVER
REQUEST (§3.2.1.8) and ASSIGNMENT REQUEST (§3.2.1.1) messages which
also include LCLS Config and CSC parameters. Hence, there's no point in
using GCR encode/decode functions alone.
Introduce gsm0808_dec_lcls() and gsm0808_enc_lcls() as trivial wrappers
on top of GCR enc/dec routines which are made static. Adjust tests
accordingly. Test output intentionally left unchanged.
Change-Id: Icfbb2404e1a1d500243e2071173299b557369335
diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c
index ebdfc29..40e2b87 100644
--- a/tests/gsm0808/gsm0808_test.c
+++ b/tests/gsm0808/gsm0808_test.c
@@ -668,7 +668,7 @@
msgb_free(in_msg);
}
-static void test_enc_dec_gcr()
+static void test_enc_dec_lcls()
{
static const uint8_t res[] = {
GSM0808_IE_GLOBAL_CALL_REF,
@@ -690,11 +690,18 @@
};
int rc;
struct tlv_parsed tp;
- msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "global call reference");
+ struct osmo_lcls lcls_out = { .gcr = &p }, lcls_in = {
+ .gcr = &g,
+ .config = GSM0808_LCLS_CFG_NA,
+ .control = GSM0808_LCLS_CSC_NA,
+ .corr_needed = true,
+ };
+
+ msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "LCLS IE");
if (!msg)
return;
- len = gsm0808_enc_gcr(msg, &g);
+ len = gsm0808_enc_lcls(msg, &lcls_in);
printf("Testing Global Call Reference IE encoder...\n\t%d bytes added: %s\n",
len, len == ARRAY_SIZE(res) ? "OK" : "FAIL");
@@ -707,29 +714,29 @@
abort();
}
- rc = gsm0808_dec_gcr(&p, &tp);
+ rc = gsm0808_dec_lcls(&lcls_out, &tp);
if (rc < 0) {
printf("decoding failed: %s [%s]\n", strerror(-rc), msgb_hexdump(msg));
abort();
}
- if (p.net_len != g.net_len) {
- printf("Network ID length parsed wrong: %u != %u\n", p.net_len, g.net_len);
+ if (lcls_out.gcr->net_len != g.net_len) {
+ printf("Network ID length parsed wrong: %u != %u\n", lcls_out.gcr->net_len, g.net_len);
abort();
}
- if (p.node != g.node) {
- printf("Node ID parsed wrong: 0x%X != 0x%X\n", p.node, g.node);
+ if (lcls_out.gcr->node != g.node) {
+ printf("Node ID parsed wrong: 0x%X != 0x%X\n", lcls_out.gcr->node, g.node);
abort();
}
- if (memcmp(p.net, g.net, g.net_len) != 0) {
- printf("Network ID parsed wrong: %s\n", osmo_hexdump(p.net, p.net_len));
+ if (memcmp(lcls_out.gcr->net, g.net, g.net_len) != 0) {
+ printf("Network ID parsed wrong: %s\n", osmo_hexdump(lcls_out.gcr->net, lcls_out.gcr->net_len));
abort();
}
- if (memcmp(p.cr, g.cr, 5) != 0) {
- printf("Call ref. ID parsed wrong: %s\n", osmo_hexdump(p.cr, 5));
+ if (memcmp(lcls_out.gcr->cr, g.cr, 5) != 0) {
+ printf("Call ref. ID parsed wrong: %s\n", osmo_hexdump(lcls_out.gcr->cr, 5));
abort();
}
@@ -1959,7 +1966,7 @@
test_create_dtap();
test_prepend_dtap();
- test_enc_dec_gcr();
+ test_enc_dec_lcls();
test_enc_dec_aoip_trasp_addr_v4();
test_enc_dec_aoip_trasp_addr_v6();