aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac1
-rw-r--r--include/osmo-bts/Makefile.am2
-rw-r--r--src/common/Makefile.am4
-rw-r--r--src/common/rsl.c329
-rw-r--r--src/osmo-bts-sysmo/Makefile.am4
-rw-r--r--src/osmo-bts-sysmo/main.c2
6 files changed, 235 insertions, 107 deletions
diff --git a/configure.ac b/configure.ac
index 29d58afb..e72734cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,6 +20,7 @@ dnl Checks for typedefs, structures and compiler characteristics
dnl checks for libraries
PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.3.0)
PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty)
+PKG_CHECK_MODULES(LIBOSMOTRAU, libosmotrau)
PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.3.3)
AC_MSG_CHECKING([whether to enable sysmocom-bts hardware support])
diff --git a/include/osmo-bts/Makefile.am b/include/osmo-bts/Makefile.am
index 4f8753dd..ad9409e3 100644
--- a/include/osmo-bts/Makefile.am
+++ b/include/osmo-bts/Makefile.am
@@ -1,2 +1,2 @@
noinst_HEADERS = abis.h bts.h bts_model.h gsm_data.h logging.h measurement.h \
- oml.h paging.h rsl.h rtp.h signal.h vty.h
+ oml.h paging.h rsl.h signal.h vty.h
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 495dd05a..8726b005 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -1,6 +1,6 @@
INCLUDES = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS)
-LDADD = $(LIBOSMOCORE_LIBS)
+AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOTRAU_CFLAGS)
+LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOTRAU_LIBS)
noinst_LIBRARIES = libbts.a
libbts_a_SOURCES = gsm_data_shared.c sysinfo.c logging.c abis.c oml.c bts.c \
diff --git a/src/common/rsl.c b/src/common/rsl.c
index bfa1055d..98907d58 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -30,11 +30,11 @@
#include <osmocom/gsm/rsl.h>
#include <osmocom/gsm/lapdm.h>
#include <osmocom/gsm/protocol/gsm_12_21.h>
+#include <osmocom/trau/rtp.h>
#include <osmo-bts/logging.h>
#include <osmo-bts/gsm_data.h>
#include <osmo-bts/abis.h>
-#include <osmo-bts/rtp.h>
#include <osmo-bts/bts.h>
#include <osmo-bts/rsl.h>
#include <osmo-bts/oml.h>
@@ -635,16 +635,19 @@ static int rsl_rx_chan_activ(struct msgb *msg)
}
/* 8.4.14 RF CHANnel RELease is received */
-static int rsl_rx_rf_chan_rel(struct msgb *msg)
+static int rsl_rx_rf_chan_rel(struct gsm_lchan *lchan)
{
int rc;
-#if 0
- if (lchan->rtp.socket_created)
+
+ if (lchan->abis_ip.rtp_socket) {
rsl_tx_ipac_dlcx_ind(lchan, RSL_ERR_NORMAL_UNSPEC);
-#endif
- rc = bts_model_rsl_chan_rel(msg->lchan);
+ rtp_socket_free(lchan->abis_ip.rtp_socket);
+ lchan->abis_ip.rtp_socket = NULL;
+ }
+
+ rc = bts_model_rsl_chan_rel(lchan);
- lapdm_channel_reset(&msg->lchan->lapdm_ch);
+ lapdm_channel_reset(&lchan->lapdm_ch);
return rc;
}
@@ -833,160 +836,274 @@ static int rsl_rx_sacch_inf_mod(struct msgb *msg)
return 0;
}
-#if 0
/*
* ip.access related messages
*/
-int rsl_tx_ipac_dlcx_ind(struct osmobts_lchan *lchan, uint8_t cause)
+int rsl_tx_ipac_dlcx_ind(struct gsm_lchan *lchan, uint8_t cause)
{
struct msgb *nmsg;
- struct gsm_bts_trx *trx = lchan->slot->trx;
- LOGP(DRSL, LOGL_NOTICE, "Sending RTP delete indication: cause=%d\n", cause);
+ LOGP(DRSL, LOGL_NOTICE, "%s Sending RTP delete indication: cause=%d\n",
+ gsm_lchan_name(lchan), cause);
nmsg = rsl_msgb_alloc(sizeof(struct abis_rsl_common_hdr));
if (!nmsg)
return -ENOMEM;
+
msgb_tlv_put(nmsg, RSL_IE_CAUSE, 1, &cause);
rsl_trx_push_hdr(nmsg, RSL_MT_IPAC_DLCX_IND);
- msg->trx = trx;
+
+ nmsg->trx = lchan->ts->trx;
return abis_rsl_sendmsg(nmsg);
}
-static int rsl_tx_ipac_cx_ack(struct gsm_bts_trx *trx, struct msgb *msg, uint32_t ip, uint16_t port, uint16_t *conn_id)
+/* transmit an CRCX ACK for the lchan */
+static int rsl_tx_ipac_XXcx_ack(struct gsm_lchan *lchan, int inc_pt2,
+ uint8_t orig_msgt)
{
- struct abis_rsl_dchan_hdr *dch = msgb_l2(msg);
- uint8_t chan_nr = dch->chan_nr;
- uint8_t msg_type = dch->c.msg_type;
- uint8_t *ie;
+ struct msgb *msg = rsl_msgb_alloc(sizeof(struct abis_rsl_dchan_hdr));
+ uint8_t chan_nr = gsm_lchan2chan_nr(lchan);
+ uint32_t *att_ip;
+ const char *name;
+ struct in_addr ia;
- LOGP(DRSL, LOGL_NOTICE, "Sending RTP connection request ACK\n");
+ if (orig_msgt == RSL_MT_IPAC_CRCX)
+ name = "CRCX";
+ else
+ name = "MDCX";
- msg->len = 0;
- msg->data = msg->tail = msg->l3h;
+ ia.s_addr = lchan->abis_ip.bound_ip;
+ LOGP(DRSL, LOGL_INFO, "%s RSL Tx IPAC_%s_ACK (local %s:%u)\n",
+ gsm_lchan_name(lchan), name, inet_ntoa(ia),
+ ntohs(lchan->abis_ip.bound_port));
- if (conn_id)
- msgb_tv16_put(msg, RSL_IE_IPAC_CONN_ID, htons(*conn_id));
- ie = msgb_put(msg, 5);
- ie[0] = RSL_IE_IPAC_LOCAL_IP;
- *((uint32_t *)(ie + 1)) = htonl(ip);
- msgb_tv16_put(msg, RSL_IE_IPAC_LOCAL_PORT, htons(port));
+ /* Connection ID */
+ msgb_tv16_put(msg, RSL_IE_IPAC_CONN_ID, htons(lchan->abis_ip.conn_id));
- rsl_dch_push_hdr(msg, msg_type + 1, chan_nr);
- msg->trx = trx;
+ /* locally bound IP */
+ msgb_v_put(msg, RSL_IE_IPAC_LOCAL_IP);
+ att_ip = (uint32_t *) msgb_put(msg, sizeof(uint32_t));
+ *att_ip = htonl(lchan->abis_ip.bound_ip);
+
+ /* locally bound port */
+ msgb_tv16_put(msg, RSL_IE_IPAC_LOCAL_PORT,
+ htons(lchan->abis_ip.bound_port));
+
+ if (inc_pt2) {
+ /* RTP Payload Type 2 */
+ msgb_tv_put(msg, RSL_IE_IPAC_RTP_PAYLOAD2,
+ lchan->abis_ip.rtp_payload2);
+ }
+
+ /* push the header in front */
+ rsl_dch_push_hdr(msg, orig_msgt + 1, chan_nr);
+ msg->trx = lchan->ts->trx;
return abis_rsl_sendmsg(msg);
}
-static int rsl_tx_ipac_cx_nack(struct gsm_bts_trx *trx, struct msgb *msg, uint8_t cause)
+static int rsl_tx_ipac_dlcx_ack(struct gsm_lchan *lchan, int inc_conn_id)
{
- struct abis_rsl_dchan_hdr *dch = msgb_l2(msg);
- uint8_t chan_nr = dch->chan_nr;
- uint8_t msg_type = dch->c.msg_type;
+ struct msgb *msg = rsl_msgb_alloc(sizeof(struct abis_rsl_dchan_hdr));
+ uint8_t chan_nr = gsm_lchan2chan_nr(lchan);
- LOGP(DRSL, LOGL_NOTICE, "Sending RTP connection request NACK: cause=%d\n", cause);
+ LOGP(DRSL, LOGL_INFO, "%s RSL Tx IPAC_DLCX_ACK\n",
+ gsm_lchan_name(lchan));
- msg->len = 0;
- msg->data = msg->tail = msg->l3h;
+ if (inc_conn_id)
+ msgb_tv_put(msg, RSL_IE_IPAC_CONN_ID, lchan->abis_ip.conn_id);
+
+ rsl_dch_push_hdr(msg, RSL_MT_IPAC_DLCX_ACK, chan_nr);
+ msg->trx = lchan->ts->trx;
+
+ return abis_rsl_sendmsg(msg);
+}
+
+static int rsl_tx_ipac_dlcx_nack(struct gsm_lchan *lchan, int inc_conn_id,
+ uint8_t cause)
+{
+ struct msgb *msg = rsl_msgb_alloc(sizeof(struct abis_rsl_dchan_hdr));
+ uint8_t chan_nr = gsm_lchan2chan_nr(lchan);
+
+ LOGP(DRSL, LOGL_INFO, "%s RSL Tx IPAC_DLCX_NACK\n",
+ gsm_lchan_name(lchan));
+
+ if (inc_conn_id)
+ msgb_tv_put(msg, RSL_IE_IPAC_CONN_ID, lchan->abis_ip.conn_id);
+
+ msgb_tlv_put(msg, RSL_IE_CAUSE, 1, &cause);
+
+ rsl_dch_push_hdr(msg, RSL_MT_IPAC_DLCX_NACK, chan_nr);
+ msg->trx = lchan->ts->trx;
+
+ return abis_rsl_sendmsg(msg);
+
+}
+
+
+/* transmit an CRCX NACK for the lchan */
+static int tx_ipac_XXcx_nack(struct gsm_lchan *lchan, uint8_t cause,
+ int inc_ipport, uint8_t orig_msgtype)
+{
+ struct msgb *msg = rsl_msgb_alloc(sizeof(struct abis_rsl_dchan_hdr));
+ uint8_t chan_nr = gsm_lchan2chan_nr(lchan);
+
+ /* FIXME: allocate new msgb and copy old over */
+ LOGP(DRSL, LOGL_NOTICE, "%s RSL Tx IPAC_BIND_NACK\n",
+ gsm_lchan_name(lchan));
+
+ if (inc_ipport) {
+ uint32_t *att_ip;
+ /* remote IP */
+ msgb_v_put(msg, RSL_IE_IPAC_REMOTE_IP);
+ att_ip = (uint32_t *) msgb_put(msg, sizeof(uint32_t));
+ *att_ip = htonl(lchan->abis_ip.connect_ip);
+
+ /* remote port */
+ msgb_tv16_put(msg, RSL_IE_IPAC_REMOTE_PORT,
+ htons(lchan->abis_ip.connect_port));
+ }
/* 9.3.26 Cause */
msgb_tlv_put(msg, RSL_IE_CAUSE, 1, &cause);
- rsl_dch_push_hdr(msg, msg_type + 2, chan_nr);
- msg->trx = trx;
+
+ /* push the header in front */
+ rsl_dch_push_hdr(msg, orig_msgtype + 2, chan_nr);
+ msg->trx = lchan->ts->trx;
return abis_rsl_sendmsg(msg);
}
-static int rsl_rx_ipac_crcx_mdcx(struct gsm_bts_trx *trx, struct msgb *msg)
+static int rsl_rx_ipac_XXcx(struct msgb *msg)
{
struct abis_rsl_dchan_hdr *dch = msgb_l2(msg);
struct tlv_parsed tp;
- struct osmobts_lchan *lchan;
- uint32_t *ip = NULL;
- uint16_t *port = NULL;
- uint8_t *speech_mode = NULL, *payload_type = NULL;
- uint16_t conn_id;
- int rc;
+ struct gsm_lchan *lchan = msg->lchan;
+ const uint8_t *payload_type, *speech_mode, *payload_type2;
+ const uint32_t *connect_ip;
+ const uint16_t *connect_port;
+ int rc, inc_ip_port = 0;
+ char *name;
if (dch->c.msg_type == RSL_MT_IPAC_CRCX)
- LOGP(DRSL, LOGL_INFO, "Request of creating RTP connection:\n");
+ name = "CRCX";
else
- LOGP(DRSL, LOGL_INFO, "Request of modding RTP connection:\n");
-
- lchan = rsl_lchan_lookup(trx, dch->chan_nr);
- if (!lchan)
- return rsl_tx_ipac_cx_nack(trx, msg, RSL_ERR_MAND_IE_ERROR);
-
- rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg));
-
- if (TLVP_PRESENT(&tp, RSL_IE_IPAC_SPEECH_MODE)) {
- speech_mode = (uint8_t *) TLVP_VAL(&tp, RSL_IE_IPAC_SPEECH_MODE);
- }
- if (TLVP_PRESENT(&tp, RSL_IE_IPAC_RTP_PAYLOAD)) {
- payload_type = (uint8_t *) TLVP_VAL(&tp, RSL_IE_IPAC_RTP_PAYLOAD);
- }
- if (TLVP_PRESENT(&tp, RSL_IE_IPAC_REMOTE_IP)) {
- ip = (uint32_t *) TLVP_VAL(&tp, RSL_IE_IPAC_REMOTE_IP);
- }
- if (TLVP_PRESENT(&tp, RSL_IE_IPAC_REMOTE_PORT)) {
- port = (uint16_t *) TLVP_VAL(&tp, RSL_IE_IPAC_REMOTE_PORT);
+ name = "MDCX";
+
+ rc = rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg));
+ if (rc < 0)
+ return tx_ipac_XXcx_nack(lchan, RSL_ERR_MAND_IE_ERROR,
+ 0, dch->c.msg_type);
+
+ /* any of these can be NULL!! */
+ speech_mode = TLVP_VAL(&tp, RSL_IE_IPAC_SPEECH_MODE);
+ payload_type = TLVP_VAL(&tp, RSL_IE_IPAC_RTP_PAYLOAD);
+ payload_type2 = TLVP_VAL(&tp, RSL_IE_IPAC_RTP_PAYLOAD2);
+ connect_ip = (uint32_t *) TLVP_VAL(&tp, RSL_IE_IPAC_REMOTE_IP);
+ connect_port = (uint16_t *) TLVP_VAL(&tp, RSL_IE_IPAC_REMOTE_PORT);
+
+ if (dch->c.msg_type == RSL_MT_IPAC_CRCX && connect_ip && connect_port)
+ inc_ip_port = 1;
+
+ if (payload_type && payload_type2) {
+ LOGP(DRSL, LOGL_ERROR, "%s Rx RSL IPAC %s, "
+ "RTP_PT and RTP_PT2 in same msg !?!\n",
+ gsm_lchan_name(lchan), name);
+ return tx_ipac_XXcx_nack(lchan, RSL_ERR_MAND_IE_ERROR,
+ inc_ip_port, dch->c.msg_type);
}
- if (!lchan->rtp.socket_created) {
- if (dch->c.msg_type == RSL_MT_IPAC_CRCX && !payload_type) {
- LOGP(DRSL, LOGL_ERROR, "Missing payload type IE.\n");
- return rsl_tx_ipac_cx_nack(trx, msg, RSL_ERR_MAND_IE_ERROR);
+ if (dch->c.msg_type == RSL_MT_IPAC_CRCX) {
+ if (lchan->abis_ip.rtp_socket) {
+ LOGP(DRSL, LOGL_ERROR, "%s Rx RSL IPAC CRCX, "
+ "but we already have socket!\n",
+ gsm_lchan_name(lchan));
+ return tx_ipac_XXcx_nack(lchan, RSL_ERR_RES_UNAVAIL,
+ inc_ip_port, dch->c.msg_type);
}
- rc = rtp_create_socket(lchan, &lchan->rtp);
- if (rc < 0) {
- LOGP(DRSL, LOGL_ERROR, "Failed to create RTP/RTCP sockets.\n");
- return rsl_tx_ipac_cx_nack(trx, msg, RSL_ERR_RES_UNAVAIL);
+ /* FIXME: select default value depending on speech_mode */
+ //if (!payload_type)
+ lchan->abis_ip.rtp_socket = rtp_socket_create(lchan->ts->trx);
+ if (!lchan->abis_ip.rtp_socket) {
+ LOGP(DRSL, LOGL_ERROR,
+ "%s IPAC Failed to create RTP/RTCP sockets\n",
+ gsm_lchan_name(lchan));
+ return tx_ipac_XXcx_nack(lchan, RSL_ERR_RES_UNAVAIL,
+ inc_ip_port, dch->c.msg_type);
}
- rc = rtp_bind_socket(&lchan->rtp);
+ rc = rtp_socket_bind(lchan->abis_ip.rtp_socket, INADDR_ANY);
if (rc < 0) {
- LOGP(DRSL, LOGL_ERROR, "Failed to bind RTP/RTCP sockets.\n");
- rtp_close_socket(&lchan->rtp);
- return rsl_tx_ipac_cx_nack(trx, msg, RSL_ERR_RES_UNAVAIL);
+ LOGP(DRSL, LOGL_ERROR,
+ "%s IPAC Failed to bind RTP/RTCP sockets\n",
+ gsm_lchan_name(lchan));
+ rtp_socket_free(lchan->abis_ip.rtp_socket);
+ lchan->abis_ip.rtp_socket = NULL;
+ return tx_ipac_XXcx_nack(lchan, RSL_ERR_RES_UNAVAIL,
+ inc_ip_port, dch->c.msg_type);
+ }
+ /* FIXME: multiplex connection, BSC proxy */
+ } else {
+ /* MDCX */
+ if (!lchan->abis_ip.rtp_socket) {
+ LOGP(DRSL, LOGL_ERROR, "%s Rx RSL IPAC MDCX, "
+ "but we have no RTP socket!\n");
+ return tx_ipac_XXcx_nack(lchan, RSL_ERR_RES_UNAVAIL,
+ inc_ip_port, dch->c.msg_type);
}
}
- if (payload_type)
- lchan->rtp.payload_type = *payload_type;
- if (ip && port) {
- rc = rtp_connect_socket(&lchan->rtp, ntohl(*ip), ntohs(*port));
+ if (connect_ip && connect_port) {
+ rc = rtp_socket_connect(lchan->abis_ip.rtp_socket,
+ ntohl(*connect_ip), ntohs(*connect_port));
if (rc < 0) {
- LOGP(DRSL, LOGL_ERROR, "Failed to connect RTP/RTCP sockets.\n");
- rtp_close_socket(&lchan->rtp);
- return rsl_tx_ipac_cx_nack(trx, msg, RSL_ERR_RES_UNAVAIL);
+ LOGP(DRSL, LOGL_ERROR,
+ "%s Failed to connect RTP/RTCP sockets\n",
+ gsm_lchan_name(lchan));
+ rtp_socket_free(lchan->abis_ip.rtp_socket);
+ lchan->abis_ip.rtp_socket = NULL;
+ return tx_ipac_XXcx_nack(lchan, RSL_ERR_RES_UNAVAIL,
+ inc_ip_port, dch->c.msg_type);
}
+ /* save IP address and port number */
+ lchan->abis_ip.connect_ip = *connect_ip;
+ lchan->abis_ip.connect_port = *connect_port;
}
+ /* Everything has succeeded, we can store new values in lchan */
+ if (payload_type)
+ lchan->abis_ip.rtp_payload = *payload_type;
+ if (payload_type2)
+ lchan->abis_ip.rtp_payload2 = *payload_type2;
+ if (speech_mode)
+ lchan->abis_ip.speech_mode = *speech_mode;
+
+ /* FIXME: CSD, jitterbuffer, compression */
- conn_id = 0; // FIXME: what the hack is conn_id for?
- return rsl_tx_ipac_cx_ack(trx, msg, ntohl(lchan->rtp.rtp_udp.sin_local.sin_addr.s_addr), ntohs(lchan->rtp.rtp_udp.sin_local.sin_port), &conn_id);
+ return rsl_tx_ipac_XXcx_ack(lchan, payload_type2 ? 1 : 0,
+ dch->c.msg_type);
}
-static int rsl_rx_ipac_dlcx(struct gsm_bts_trx *trx, struct msgb *msg)
+static int rsl_rx_ipac_dlcx(struct msgb *msg)
{
struct abis_rsl_dchan_hdr *dch = msgb_l2(msg);
struct tlv_parsed tp;
- struct osmobts_lchan *lchan;
-
- LOGP(DRSL, LOGL_INFO, "Request of deleting RTP connection:\n");
+ struct gsm_lchan *lchan = msg->lchan;
+ int rc, inc_conn_id = 0;
- lchan = rsl_lchan_lookup(trx, dch->chan_nr);
- if (!lchan)
- return rsl_tx_ipac_cx_nack(trx, msg, RSL_ERR_MAND_IE_ERROR);
+ rc = rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg));
+ if (rc < 0)
+ return rsl_tx_ipac_dlcx_nack(lchan, 0, RSL_ERR_MAND_IE_ERROR);
- rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg));
+ if (TLVP_PRESENT(&tp, RSL_IE_IPAC_CONN_ID))
+ inc_conn_id = 1;
- rtp_close_socket(&lchan->rtp);
+ rtp_socket_free(lchan->abis_ip.rtp_socket);
+ lchan->abis_ip.rtp_socket = NULL;
- return rsl_tx_ipac_cx_ack(trx, msg, ntohl(lchan->rtp.rtp_udp.sin_local.sin_addr.s_addr), ntohs(lchan->rtp.rtp_udp.sin_local.sin_port), NULL);
+ return rsl_tx_ipac_dlcx_ack(lchan, inc_conn_id);
}
-#endif
/*
* selecting message
@@ -1197,7 +1314,7 @@ static int rsl_rx_dchan(struct gsm_bts_trx *trx, struct msgb *msg)
ret = rsl_rx_chan_activ(msg);
break;
case RSL_MT_RF_CHAN_REL:
- ret = rsl_rx_rf_chan_rel(msg);
+ ret = rsl_rx_rf_chan_rel(msg->lchan);
break;
case RSL_MT_SACCH_INFO_MODIFY:
ret = rsl_rx_sacch_inf_mod(msg);
@@ -1270,14 +1387,24 @@ static int rsl_rx_ipaccess(struct gsm_bts_trx *trx, struct msgb *msg)
}
msg->l3h = (unsigned char *)dch + sizeof(*dch);
+ msg->lchan = rsl_lchan_lookup(trx, dch->chan_nr);
+ if (!msg->lchan) {
+ LOGP(DRSL, LOGL_ERROR, "Rx RSL %s for unknow lchan\n",
+ rsl_msg_name(dch->c.msg_type));
+ //return rsl_tx_chan_nack(trx, msg, RSL_ERR_MAND_IE_ERROR);
+ }
+
+ LOGP(DRSL, LOGL_INFO, "%s Rx RSL IPA %s\n", gsm_lchan_name(msg->lchan),
+ rsl_msg_name(dch->c.msg_type));
+
switch (dch->c.msg_type) {
-#if 0
case RSL_MT_IPAC_CRCX:
case RSL_MT_IPAC_MDCX:
- return rsl_rx_ipac_crcx_mdcx(trx, msg);
+ ret = rsl_rx_ipac_XXcx(msg);
+ break;
case RSL_MT_IPAC_DLCX:
- return rsl_rx_ipac_dlcx(trx, msg);
-#endif
+ ret = rsl_rx_ipac_dlcx(msg);
+ break;
default:
LOGP(DRSL, LOGL_NOTICE, "unsupported RSL ip.access msg_type 0x%02x\n",
dch->c.msg_type);
diff --git a/src/osmo-bts-sysmo/Makefile.am b/src/osmo-bts-sysmo/Makefile.am
index 5fd39071..034a4c58 100644
--- a/src/osmo-bts-sysmo/Makefile.am
+++ b/src/osmo-bts-sysmo/Makefile.am
@@ -1,6 +1,6 @@
INCLUDES = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS)
-LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS)
+AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS)
+LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS)
bin_PROGRAMS = sysmobts sysmobts-remote l1fwd-proxy
diff --git a/src/osmo-bts-sysmo/main.c b/src/osmo-bts-sysmo/main.c
index 0caf44d7..5a170430 100644
--- a/src/osmo-bts-sysmo/main.c
+++ b/src/osmo-bts-sysmo/main.c
@@ -226,7 +226,7 @@ int main(int argc, char **argv)
}
signal(SIGINT, &signal_handler);
- signal(SIGABRT, &signal_handler);
+ //signal(SIGABRT, &signal_handler);
signal(SIGUSR1, &signal_handler);
signal(SIGUSR2, &signal_handler);
osmo_init_ignore_signals();
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 05:03:05 +0000