From 7a70a4f52a837bde0f7fa5f435e302939a2e3d74 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Thu, 11 Feb 2016 01:28:06 +0100 Subject: cscn wip: direct dtap responses to IuCS --- openbsc/src/libmsc/Makefile.am | 3 ++- openbsc/src/libmsc/gsm_04_08.c | 4 +++- openbsc/src/libmsc/msc_api.h | 4 ++++ 3 files changed, 9 insertions(+), 2 deletions(-) (limited to 'openbsc/src/libmsc') diff --git a/openbsc/src/libmsc/Makefile.am b/openbsc/src/libmsc/Makefile.am index ffa0c8623..c0a09a356 100644 --- a/openbsc/src/libmsc/Makefile.am +++ b/openbsc/src/libmsc/Makefile.am @@ -20,7 +20,8 @@ libmsc_a_SOURCES = auth.c \ ussd.c \ vty_interface_layer3.c \ transaction.c \ - osmo_msc.c ctrl_commands.c meas_feed.c + osmo_msc.c ctrl_commands.c meas_feed.c \ + msc_api.c if BUILD_SMPP noinst_HEADERS += smpp_smsc.h diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c index 17c53e044..8c4ae063c 100644 --- a/openbsc/src/libmsc/gsm_04_08.c +++ b/openbsc/src/libmsc/gsm_04_08.c @@ -65,6 +65,8 @@ #include +#include "msc_api.h" + /* These debug statements were removed during the BSC/MSC split. It may make * sense to replace them with debug statements that do not access BTS data. */ #define BEFORE_MSCSPLIT 0 @@ -102,7 +104,7 @@ static int gsm48_conn_sendmsg(struct msgb *msg, struct gsm_subscriber_connection gh->proto_discr = trans->protocol | (trans->transaction_id << 4); } - return gsm0808_submit_dtap(conn, msg, 0, 0); + return msc_submit_dtap(conn, msg); } int gsm48_cc_tx_notify_ss(struct gsm_trans *trans, const char *message) diff --git a/openbsc/src/libmsc/msc_api.h b/openbsc/src/libmsc/msc_api.h index d736b4d98..2da2e9fce 100644 --- a/openbsc/src/libmsc/msc_api.h +++ b/openbsc/src/libmsc/msc_api.h @@ -6,3 +6,7 @@ /* TODO does this belong to openbsc/gsm_04_08.h ?? */ int msc_compl_l3(struct gsm_subscriber_connection *conn, struct msgb *msg, uint16_t chosen_channel); + +/* Depending on conn->via_iface (A or IuCS), submit msg to the proper link api. */ +extern int msc_submit_dtap(struct gsm_subscriber_connection *conn, + struct msgb *msg); -- cgit v1.2.3