aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2018-06-08 20:33:22 +0200
committerHarald Welte <laforge@gnumonks.org>2018-06-08 20:35:35 +0200
commitcd326b3c20af9bd56f973ccab52030b74b6dc520 (patch)
treed1084e670ab242cdaca761640682f00a8c1f9dfe
parentbc4f542d1db912c6d63abcc38a9ed31a558009f4 (diff)
Explicitly register CTRL-over-IPA callback with libosmo-sigtran
In Change-Id OSI6b7354f3b23a26bb4eab12213ca3d3b614c8154f we introduced a function called osmo_ss7_asp_rx_unknown() which was supposed ot override a weak symbol in libosmo-sigtran. However, the related change in libosmo-sigtran (I8616f914192000df0ec6547ff4ada80e0f9042a2) was modified later on to use explicit registration of a call-back function instead of weak symbol override. Let's adopt the osmo-bsc code to make use of this explict call-back registration. Change-Id: Id5880ec90dfa00b29cbb0ffea8c8dd50e24742bd Related: OS#2012
-rw-r--r--src/osmo-bsc/osmo_bsc_sigtran.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c
index 608c3fbca..72ee50f4c 100644
--- a/src/osmo-bsc/osmo_bsc_sigtran.c
+++ b/src/osmo-bsc/osmo_bsc_sigtran.c
@@ -409,6 +409,8 @@ static void osmo_bsc_sigtran_reset_cb(const void *priv)
/* Default point-code to be used as remote address (MSC) */
#define MSC_DEFAULT_PC "0.23.1"
+static int asp_rx_unknown(struct osmo_ss7_asp *asp, int ppid_mux, struct msgb *msg);
+
/* Initalize osmo sigtran backhaul */
int osmo_bsc_sigtran_init(struct llist_head *mscs)
{
@@ -419,6 +421,8 @@ int osmo_bsc_sigtran_init(struct llist_head *mscs)
char msc_name[32];
uint32_t default_pc;
+ osmo_ss7_register_rx_unknown_cb(&asp_rx_unknown);
+
OSMO_ASSERT(mscs);
msc_list = mscs;
@@ -515,7 +519,7 @@ fail_auto_cofiguration:
/* this function receives all messages received on an ASP for a PPID / StreamID that
* libosmo-sigtran doesn't know about, such as piggy-backed CTRL and/or MGCP */
-int osmo_ss7_asp_rx_unknown(struct osmo_ss7_asp *asp, int ppid_mux, struct msgb *msg)
+static int asp_rx_unknown(struct osmo_ss7_asp *asp, int ppid_mux, struct msgb *msg)
{
struct ipaccess_head *iph;
struct ipaccess_head_ext *iph_ext;