commit 86c1db63387bd0dde439a6625c40e9e653b1cf4d
author Holger Hans Peter Freyther <zecke@selfish.org> Fri Feb 25 17:10:25 2011 +0100
committer Holger Hans Peter Freyther <zecke@selfish.org> Sat Feb 26 10:38:52 2011 +0100
tree d53238031a3d923aff9572b5c6666771225b3181
parent ed500e3877375bde3c0ec33825d513f9fd69c757

nat: Verify that we are not assigning 0x1f as endpoint.

On a classic BSC we have 32 channels but one is reserved for
signalling. Make sure that we are not assigning 0x1f as we
assume that this is the signalling channel. This means that
from 32 possible voice channels we are only going to use 30
as we are already not using the 0x0.

openbsc/tests/bsc-nat/bsc_nat_test.c

diff --git a/openbsc/tests/bsc-nat/bsc_nat_test.c b/openbsc/tests/bsc-nat/bsc_nat_test.c
index d5b1ab1..83d75ed 100644
--- a/openbsc/tests/bsc-nat/bsc_nat_test.c
+++ b/openbsc/tests/bsc-nat/bsc_nat_test.c
@@ -450,7 +450,7 @@
 	bsc = bsc_connection_alloc(nat);
 	bsc->cfg = bsc_config_alloc(nat, "foo");
 	bsc_config_add_lac(bsc->cfg, 2323);
-	bsc->last_endpoint = 0x1a;
+	bsc->last_endpoint = 0x1e;
 	con.bsc = bsc;
 
 	msg = msgb_alloc(4096, "foo");
@@ -475,17 +475,17 @@
 		abort();
 	}
 
-	if (con.bsc_endp != 0x1b) {
+	if (con.bsc_endp != 0x1) {
 		fprintf(stderr, "Assigned timeslot should have been 1.\n");
 		abort();
 	}
-	if (con.bsc->_endpoint_status[0x1b] != 1) {
+	if (con.bsc->_endpoint_status[0x1] != 1) {
 		fprintf(stderr, "The status on the BSC is wrong.\n");
 		abort();
 	}
 
 	int multiplex, timeslot;
-	mgcp_endpoint_to_timeslot(0x1b, &multiplex, &timeslot);
+	mgcp_endpoint_to_timeslot(0x1, &multiplex, &timeslot);
 
 	uint16_t cic = htons(timeslot & 0x1f);
 	if (memcmp(&cic, &msg->l2h[16], sizeof(cic)) != 0) {
@@ -498,7 +498,7 @@
 
 	bsc_mgcp_dlcx(&con);
 	if (con.bsc_endp != -1 || con.msc_endp != -1 ||
-	    con.bsc->_endpoint_status[1] != 0 || con.bsc->last_endpoint != 0x1b) {
+	    con.bsc->_endpoint_status[1] != 0 || con.bsc->last_endpoint != 0x1) {
 		fprintf(stderr, "Clearing should remove the mapping.\n");
 		abort();
 	}