summaryrefslogtreecommitdiffstats
path: root/tests/lapd
diff options
context:
space:
mode:
Diffstat (limited to 'tests/lapd')
-rw-r--r--tests/lapd/lapd_test.c8
-rw-r--r--tests/lapd/lapd_test.ok2
2 files changed, 2 insertions, 8 deletions
diff --git a/tests/lapd/lapd_test.c b/tests/lapd/lapd_test.c
index fd92cac3..e627ba68 100644
--- a/tests/lapd/lapd_test.c
+++ b/tests/lapd/lapd_test.c
@@ -350,19 +350,13 @@ static int ms_to_bts_tx_cb(struct msgb *msg, struct lapdm_entity *le, void *_ctx
struct abis_rsl_rll_hdr hdr;
printf("MS: Verifying incoming primitive.\n");
- OSMO_ASSERT(msg->len == sizeof(struct abis_rsl_rll_hdr) + 3);
+ OSMO_ASSERT(msg->len == sizeof(struct abis_rsl_rll_hdr));
/* verify the header */
memset(&hdr, 0, sizeof(hdr));
rsl_init_rll_hdr(&hdr, RSL_MT_EST_CONF);
hdr.c.msg_discr |= ABIS_RSL_MDISC_TRANSP;
OSMO_ASSERT(memcmp(msg->data, &hdr, sizeof(hdr)) == 0);
-
- /* Verify the added RSL_IE_L3_INFO but we have a bug here */
- OSMO_ASSERT(msg->data[6] == RSL_IE_L3_INFO);
- #pragma message ("RSL_IE_L3_INFO 16 bit length is wrong")
- /* This should be okay but it is actually 0x0, 0x9c on ia-32 */
- /* OSMO_ASSERT(msg->data[7] == 0x0 && msg->data[8] == 0x0); */
} else if (state->ms_read == 1) {
printf("MS: Verifying incoming MM message: %d\n", msgb_l3len(msg));
OSMO_ASSERT(msgb_l3len(msg) == 3);
diff --git a/tests/lapd/lapd_test.ok b/tests/lapd/lapd_test.ok
index e188e27e..835ca2b3 100644
--- a/tests/lapd/lapd_test.ok
+++ b/tests/lapd/lapd_test.ok
@@ -7,7 +7,7 @@ BTS: Verifying CM request.
Confirming
Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x00
Message: [L2]> 01 73 41 [L3]> 05 24 31 03 50 18 93 08 29 47 80 00 00 00 00 80 2b 2b 2b 2b
-ms_to_bts_tx_cb: BTS->MS(us) message 9
+ms_to_bts_tx_cb: BTS->MS(us) message 6
MS: Verifying incoming primitive.
Sending back to MS