diff options
| author | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-05-20 20:40:34 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-09-29 13:20:45 +0200 |
| commit | 17395b6c34ac6a78c60961d26ad84c4015b3e5d9 (patch) | |
| tree | 54aad24a18de98789275d4c7be01bef6f158b319 | |
| parent | 9df6c1b9826fc7a5cee6b86693fb93951a76ac37 (diff) | |
Use new msc_tx_dtap() instead of gsm0808_submit_dtap()
Aim: msc_tx_dtap() shall redirect to IuCS or A interfaces depending on subscr
conn.
Change-Id: I30d961f16eb7b9c0ab9cc3f43198098d3f1a909f
| -rw-r--r-- | openbsc/src/libmsc/gsm_04_08.c | 2 | ||||
| -rw-r--r-- | openbsc/src/libmsc/gsm_04_11.c | 4 | ||||
| -rw-r--r-- | openbsc/src/libmsc/gsm_04_80.c | 10 | ||||
| -rw-r--r-- | openbsc/src/osmo-nitb/Makefile.am | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c index 34b0c7747..0fddbf363 100644 --- a/openbsc/src/libmsc/gsm_04_08.c +++ b/openbsc/src/libmsc/gsm_04_08.c @@ -134,7 +134,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_tx_dtap(conn, msg); } int gsm48_cc_tx_notify_ss(struct gsm_trans *trans, const char *message) diff --git a/openbsc/src/libmsc/gsm_04_11.c b/openbsc/src/libmsc/gsm_04_11.c index 4952810dd..729d2162d 100644 --- a/openbsc/src/libmsc/gsm_04_11.c +++ b/openbsc/src/libmsc/gsm_04_11.c @@ -54,7 +54,7 @@ #include <openbsc/paging.h> #include <openbsc/bsc_rll.h> #include <openbsc/chan_alloc.h> -#include <openbsc/bsc_api.h> +#include <openbsc/msc_ifaces.h> #ifdef BUILD_SMPP #include "smpp_smsc.h" @@ -125,7 +125,7 @@ static int gsm411_sendmsg(struct gsm_subscriber_connection *conn, struct msgb *m { DEBUGP(DLSMS, "GSM4.11 TX %s\n", osmo_hexdump(msg->data, msg->len)); msg->l3h = msg->data; - return gsm0808_submit_dtap(conn, msg, UM_SAPI_SMS, 1); + return msc_tx_dtap(conn, msg); } /* Prefix msg with a 04.08/04.11 CP header */ diff --git a/openbsc/src/libmsc/gsm_04_80.c b/openbsc/src/libmsc/gsm_04_80.c index b8d950f17..2ffb1dc96 100644 --- a/openbsc/src/libmsc/gsm_04_80.c +++ b/openbsc/src/libmsc/gsm_04_80.c @@ -32,7 +32,7 @@ #include <openbsc/gsm_data.h> #include <openbsc/gsm_04_08.h> #include <openbsc/gsm_04_80.h> -#include <openbsc/bsc_api.h> +#include <openbsc/msc_ifaces.h> #include <osmocom/gsm/gsm0480.h> #include <osmocom/gsm/gsm_utils.h> @@ -106,7 +106,7 @@ int gsm0480_send_ussd_response(struct gsm_subscriber_connection *conn, | (1<<7); /* TI direction = 1 */ gh->msg_type = GSM0480_MTYPE_RELEASE_COMPLETE; - return gsm0808_submit_dtap(conn, msg, 0, 0); + return msc_tx_dtap(conn, msg); } int gsm0480_send_ussd_reject(struct gsm_subscriber_connection *conn, @@ -135,7 +135,7 @@ int gsm0480_send_ussd_reject(struct gsm_subscriber_connection *conn, gh->proto_discr |= req->transaction_id | (1<<7); /* TI direction = 1 */ gh->msg_type = GSM0480_MTYPE_RELEASE_COMPLETE; - return gsm0808_submit_dtap(conn, msg, 0, 0); + return msc_tx_dtap(conn, msg); } int msc_gsm0480_send_ussdNotify(struct gsm_subscriber_connection *conn, int level, const char *text) @@ -143,7 +143,7 @@ int msc_gsm0480_send_ussdNotify(struct gsm_subscriber_connection *conn, int leve struct msgb *msg = gsm0480_gen_ussdNotify(level, text); if (!msg) return -1; - return gsm0808_submit_dtap(conn, msg, 0, 0); + return msc_tx_dtap(conn, msg); } int msc_gsm0480_send_releaseComplete(struct gsm_subscriber_connection *conn) @@ -151,5 +151,5 @@ int msc_gsm0480_send_releaseComplete(struct gsm_subscriber_connection *conn) struct msgb *msg = gsm0480_gen_releaseComplete(); if (!msg) return -1; - return gsm0808_submit_dtap(conn, msg, 0, 0); + return msc_tx_dtap(conn, msg); } diff --git a/openbsc/src/osmo-nitb/Makefile.am b/openbsc/src/osmo-nitb/Makefile.am index 50634230e..3b1b531ad 100644 --- a/openbsc/src/osmo-nitb/Makefile.am +++ b/openbsc/src/osmo-nitb/Makefile.am @@ -25,7 +25,9 @@ bin_PROGRAMS = \ osmo_nitb_SOURCES = \ bsc_hack.c \ + $(top_builddir)/tests/libiudummy/iudummy.c \ $(NULL) +# libiudummy is temporary until iu_tx() and the ranap libs are linked osmo_nitb_LDADD = \ $(top_builddir)/src/libbsc/libbsc.a \ |