aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2018-02-23 01:37:57 +0100
committerNeels Hofmeyr <neels@hofmeyr.de>2018-03-05 22:04:39 +0100
commite3698106befe482eea4c1f3af1597ba56732c894 (patch)
tree4a88bb1ec2f6478c9dc8ab35c6c9e537316d98e0
parentebc3fe5b00e7e8c95d33ec3ddb0dd486b503d933 (diff)
trying to get handover_test.c to compile
-rw-r--r--src/libbsc/Makefile.am1
-rw-r--r--src/libbsc/bsc_subscr_conn_fsm.c (renamed from src/osmo-bsc/bsc_subscr_conn_fsm.c)0
-rw-r--r--src/osmo-bsc/Makefile.am1
-rw-r--r--tests/handover/Makefile.am4
-rw-r--r--tests/handover/handover_test.c5
5 files changed, 8 insertions, 3 deletions
diff --git a/src/libbsc/Makefile.am b/src/libbsc/Makefile.am
index 805a7ee1f..719ac936f 100644
--- a/src/libbsc/Makefile.am
+++ b/src/libbsc/Makefile.am
@@ -62,5 +62,6 @@ libbsc_a_SOURCES = \
handover_cfg.c \
penalty_timers.c \
handover_decision_2.c \
+ bsc_subscr_conn_fsm.c \
$(NULL)
diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/libbsc/bsc_subscr_conn_fsm.c
index 569921342..569921342 100644
--- a/src/osmo-bsc/bsc_subscr_conn_fsm.c
+++ b/src/libbsc/bsc_subscr_conn_fsm.c
diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am
index 422546acb..cc9674396 100644
--- a/src/osmo-bsc/Makefile.am
+++ b/src/osmo-bsc/Makefile.am
@@ -26,7 +26,6 @@ bin_PROGRAMS = \
$(NULL)
osmo_bsc_SOURCES = \
- bsc_subscr_conn_fsm.c \
osmo_bsc_main.c \
osmo_bsc_vty.c \
osmo_bsc_api.c \
diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am
index 7133fcddc..e2e1f0a00 100644
--- a/tests/handover/Makefile.am
+++ b/tests/handover/Makefile.am
@@ -9,6 +9,8 @@ AM_CFLAGS = \
$(LIBOSMOCORE_CFLAGS) \
$(LIBOSMOGSM_CFLAGS) \
$(LIBOSMOABIS_CFLAGS) \
+ $(LIBOSMOSIGTRAN_CFLAGS) \
+ $(LIBOSMOMGCPCLIENT_CFLAGS) \
$(NULL)
AM_LDFLAGS = \
@@ -36,4 +38,6 @@ handover_test_LDADD = \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(LIBOSMOABIS_LIBS) \
+ $(LIBOSMOSIGTRAN_LIBS) \
+ $(LIBOSMOMGCPCLIENT_LIBS) \
$(NULL)
diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c
index bf7350c62..7a2e9645d 100644
--- a/tests/handover/handover_test.c
+++ b/tests/handover/handover_test.c
@@ -186,7 +186,8 @@ static struct gsm_bts *create_bts(int arfcn)
void create_conn(struct gsm_lchan *lchan)
{
- lchan->conn = bsc_subscr_con_allocate(lchan);
+ lchan->conn = bsc_subscr_con_allocate(lchan->ts->trx->bts->network);
+ lchan->conn->lchan = lchan;
}
/* create lchan */
@@ -1592,7 +1593,7 @@ int main(int argc, char **argv)
struct gsm_subscriber_connection *conn = lchan[i]->conn;
lchan[i]->conn = NULL;
conn->lchan = NULL;
- bsc_subscr_con_free(conn);
+ osmo_fsm_inst_term(conn->fi, OSMO_FSM_TERM_REGULAR, NULL);
lchan_free(lchan[i]);
}