src: port openBSC over libosmo-abis
This is a big patch that ports openBSC over libosmo-abis.
Sorry, the changes that are included here are all dependent
of libosmo-abis, splitting them into smaller pieces would
leave the repository in some intermediate state, which is
not desired.
The main changes are:
- The directory libabis/ has been removed as it now lives in
libosmo-abis.
- new configuration file format for nanoBTS and HSL femto, we
need to define the virtual e1_line and attach it to the OML
link.
- all the existing BTS drivers (nanoBTS, hsl femto, Nokia site,
BS11 and rbs2000) now use the new libosmo-abis framework.
- use r232 input driver available in libosmo-abis for bs11_config.
- use ipa_msg_recv instead of old ipaccess_read_msg function.
- delete definition of gsm_e1_subslot and input_signal_data.
These structures now lives in libosmo-abis.
Most of this patch are deletions of libabis/ which has been
moved to libosmo-abis.
This patch also modifies openBSC to use all the new definitions
available in libosmocore and libosmo-abis. In order to do that,
we have replaced the following:
- DINP, DMI, DMIB and DMUX by their respective DL* correspondences.
- SS_GLOBAL by SS_L_GLOBAL
- SS_INPUT by SS_L_INPUT
- S_GLOBAL_SHUTDOWN by S_L_GLOBAL_SHUTDOWN
- SS_INPUT by SS_L_INPUT
- S_INP_* by S_L_INP_* sub-signals
- E1INP_NODE by L_E1INP_NODE vty node
This patch has been tested with:
- one nanoBTS
- the HSL femto with the examples available under libosmo-abis
- BS11 with both dahdi and misdn drivers.
diff --git a/openbsc/src/libtrau/rtp_proxy.c b/openbsc/src/libtrau/rtp_proxy.c
index 4c5f12e..2aa3a1e 100644
--- a/openbsc/src/libtrau/rtp_proxy.c
+++ b/openbsc/src/libtrau/rtp_proxy.c
@@ -111,25 +111,25 @@
int x_len;
if (msg->len < 12) {
- DEBUGPC(DMUX, "received RTP frame too short (len = %d)\n",
+ DEBUGPC(DLMUX, "received RTP frame too short (len = %d)\n",
msg->len);
return -EINVAL;
}
if (rtph->version != RTP_VERSION) {
- DEBUGPC(DMUX, "received RTP version %d not supported.\n",
+ DEBUGPC(DLMUX, "received RTP version %d not supported.\n",
rtph->version);
return -EINVAL;
}
payload = msg->data + sizeof(struct rtp_hdr) + (rtph->csrc_count << 2);
payload_len = msg->len - sizeof(struct rtp_hdr) - (rtph->csrc_count << 2);
if (payload_len < 0) {
- DEBUGPC(DMUX, "received RTP frame too short (len = %d, "
+ DEBUGPC(DLMUX, "received RTP frame too short (len = %d, "
"csrc count = %d)\n", msg->len, rtph->csrc_count);
return -EINVAL;
}
if (rtph->extension) {
if (payload_len < sizeof(struct rtp_x_hdr)) {
- DEBUGPC(DMUX, "received RTP frame too short for "
+ DEBUGPC(DLMUX, "received RTP frame too short for "
"extension header\n");
return -EINVAL;
}
@@ -138,20 +138,20 @@
payload += x_len;
payload_len -= x_len;
if (payload_len < 0) {
- DEBUGPC(DMUX, "received RTP frame too short, "
+ DEBUGPC(DLMUX, "received RTP frame too short, "
"extension header exceeds frame length\n");
return -EINVAL;
}
}
if (rtph->padding) {
if (payload_len < 0) {
- DEBUGPC(DMUX, "received RTP frame too short for "
+ DEBUGPC(DLMUX, "received RTP frame too short for "
"padding length\n");
return -EINVAL;
}
payload_len -= payload[payload_len - 1];
if (payload_len < 0) {
- DEBUGPC(DMUX, "received RTP frame with padding "
+ DEBUGPC(DLMUX, "received RTP frame with padding "
"greater than payload\n");
return -EINVAL;
}
@@ -161,7 +161,7 @@
case RTP_PT_GSM_FULL:
msg_type = GSM_TCHF_FRAME;
if (payload_len != 33) {
- DEBUGPC(DMUX, "received RTP full rate frame with "
+ DEBUGPC(DLMUX, "received RTP full rate frame with "
"payload length != 32 (len = %d)\n",
payload_len);
return -EINVAL;
@@ -171,7 +171,7 @@
msg_type = GSM_TCHF_FRAME_EFR;
break;
default:
- DEBUGPC(DMUX, "received RTP frame with unknown payload "
+ DEBUGPC(DLMUX, "received RTP frame with unknown payload "
"type %d\n", rtph->payload_type);
return -EINVAL;
}
@@ -235,7 +235,7 @@
duration = 160;
break;
default:
- DEBUGPC(DMUX, "unsupported message type %d\n",
+ DEBUGPC(DLMUX, "unsupported message type %d\n",
frame->msg_type);
return -EINVAL;
}
@@ -254,7 +254,7 @@
if (abs(frame_diff) > 1) {
long int frame_diff_excess = frame_diff - 1;
- LOGP(DMUX, LOGL_NOTICE,
+ LOGP(DLMUX, LOGL_NOTICE,
"Correcting frame difference of %ld frames\n", frame_diff_excess);
rs->transmit.sequence += frame_diff_excess;
rs->transmit.timestamp += frame_diff_excess * duration;
@@ -355,7 +355,7 @@
while ((void *)rtph + sizeof(*rtph) <= (void *)msg->data + msg->len) {
old_len = (ntohs(rtph->length) + 1) * 4;
if ((void *)rtph + old_len > (void *)msg->data + msg->len) {
- DEBUGPC(DMUX, "received RTCP packet too short for "
+ DEBUGPC(DLMUX, "received RTCP packet too short for "
"length element\n");
return -EINVAL;
}
@@ -471,7 +471,7 @@
written = write(rss->bfd.fd, msg->data, msg->len);
if (written < msg->len) {
- LOGP(DMIB, LOGL_ERROR, "short write");
+ LOGP(DLMIB, LOGL_ERROR, "short write");
msgb_free(msg);
return -EIO;
}
@@ -523,7 +523,7 @@
int rc;
struct rtp_socket *rs;
- DEBUGP(DMUX, "rtp_socket_create(): ");
+ DEBUGP(DLMUX, "rtp_socket_create(): ");
rs = talloc_zero(tall_bsc_ctx, struct rtp_socket);
if (!rs)
@@ -550,7 +550,7 @@
if (rc < 0)
goto out_rtcp_socket;
- DEBUGPC(DMUX, "success\n");
+ DEBUGPC(DLMUX, "success\n");
rc = rtp_socket_bind(rs, INADDR_ANY);
if (rc < 0)
@@ -568,7 +568,7 @@
close(rs->rtp.bfd.fd);
out_free:
talloc_free(rs);
- DEBUGPC(DMUX, "failed\n");
+ DEBUGPC(DLMUX, "failed\n");
return NULL;
}
@@ -604,7 +604,7 @@
struct in_addr ia;
ia.s_addr = htonl(ip);
- DEBUGP(DMUX, "rtp_socket_bind(rs=%p, IP=%s): ", rs,
+ DEBUGP(DLMUX, "rtp_socket_bind(rs=%p, IP=%s): ", rs,
inet_ntoa(ia));
/* try to bind to a consecutive pair of ports */
@@ -619,12 +619,12 @@
break;
}
if (rc < 0) {
- DEBUGPC(DMUX, "failed\n");
+ DEBUGPC(DLMUX, "failed\n");
return rc;
}
ia.s_addr = rs->rtp.sin_local.sin_addr.s_addr;
- DEBUGPC(DMUX, "BOUND_IP=%s, BOUND_PORT=%u\n",
+ DEBUGPC(DLMUX, "BOUND_IP=%s, BOUND_PORT=%u\n",
inet_ntoa(ia), ntohs(rs->rtp.sin_local.sin_port));
return ntohs(rs->rtp.sin_local.sin_port);
}
@@ -655,7 +655,7 @@
struct in_addr ia;
ia.s_addr = htonl(ip);
- DEBUGP(DMUX, "rtp_socket_connect(rs=%p, ip=%s, port=%u)\n",
+ DEBUGP(DLMUX, "rtp_socket_connect(rs=%p, ip=%s, port=%u)\n",
rs, inet_ntoa(ia), port);
rc = rtp_sub_socket_connect(&rs->rtp, ip, port);
@@ -668,7 +668,7 @@
/* bind two RTP/RTCP sockets together */
int rtp_socket_proxy(struct rtp_socket *this, struct rtp_socket *other)
{
- DEBUGP(DMUX, "rtp_socket_proxy(this=%p, other=%p)\n",
+ DEBUGP(DLMUX, "rtp_socket_proxy(this=%p, other=%p)\n",
this, other);
this->rx_action = RTP_PROXY;
@@ -684,7 +684,7 @@
int rtp_socket_upstream(struct rtp_socket *this, struct gsm_network *net,
uint32_t callref)
{
- DEBUGP(DMUX, "rtp_socket_proxy(this=%p, callref=%u)\n",
+ DEBUGP(DLMUX, "rtp_socket_proxy(this=%p, callref=%u)\n",
this, callref);
if (callref) {
@@ -707,7 +707,7 @@
int rtp_socket_free(struct rtp_socket *rs)
{
- DEBUGP(DMUX, "rtp_socket_free(rs=%p)\n", rs);
+ DEBUGP(DLMUX, "rtp_socket_free(rs=%p)\n", rs);
/* make sure we don't leave references dangling to us */
if (rs->rx_action == RTP_PROXY &&