aboutsummaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2013-06-30 15:27:10 +0200
committerHolger Hans Peter Freyther <holger@moiji-mobile.com>2013-10-06 15:50:36 +0200
commit359fb8caf417570856ca61d6ff90df1fc452d659 (patch)
treefa52c08a470319a3d6a9a6dcf7b359290989c890 /src/common
parentb77ae3bc601f9c70c6f9d41d70b063a769506322 (diff)
abis: Use OML remote (BSC) address if RSL CONNECT contains no IP
This introduces a new get_signlink_remote_ip() function whcih we also use in the RSL code to determine the RTP remote address if the CRCX/MDCX contains no remote IP address IE.
Diffstat (limited to 'src/common')
-rw-r--r--src/common/abis.c21
-rw-r--r--src/common/oml.c3
-rw-r--r--src/common/rsl.c6
3 files changed, 23 insertions, 7 deletions
diff --git a/src/common/abis.c b/src/common/abis.c
index 596184ad..2017f0a4 100644
--- a/src/common/abis.c
+++ b/src/common/abis.c
@@ -139,6 +139,27 @@ static int sign_link_cb(struct msgb *msg)
return 0;
}
+uint32_t get_signlink_remote_ip(struct e1inp_sign_link *link)
+{
+ int fd = link->ts->driver.ipaccess.fd.fd;
+ struct sockaddr_in sin;
+ socklen_t slen = sizeof(sin);
+ int rc;
+
+ rc = getpeername(fd, (struct sockaddr *)&sin, &slen);
+ if (rc < 0) {
+ LOGP(DOML, LOGL_ERROR, "Cannot determine remote IP Addr: %s\n",
+ strerror(errno));
+ return 0;
+ }
+
+ /* we assume that the soket is AF_INET. As Abis/IP contains
+ * lots of hard-coded IPv4 addresses, this safe */
+ OSMO_ASSERT(sin.sin_family == AF_INET);
+
+ return ntohl(sin.sin_addr.s_addr);
+}
+
#include <sys/ioctl.h>
#include <net/if.h>
diff --git a/src/common/oml.c b/src/common/oml.c
index f00b2f1e..1c38c666 100644
--- a/src/common/oml.c
+++ b/src/common/oml.c
@@ -991,13 +991,12 @@ static int oml_ipa_set_attr(struct gsm_bts *bts, struct msgb *msg)
return oml_fom_ack_nack(msg, rc);
}
-
static int rx_oml_ipa_rsl_connect(struct gsm_bts_trx *trx, struct msgb *msg,
struct tlv_parsed *tp)
{
struct e1inp_sign_link *oml_link = trx->bts->oml_link;
uint16_t port = IPA_TCP_PORT_RSL;
- uint32_t ip;//FIXME = oml_link->ip;
+ uint32_t ip = get_signlink_remote_ip(oml_link);
struct in_addr in;
int rc;
diff --git a/src/common/rsl.c b/src/common/rsl.c
index d17d4e8b..0bcb6202 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -1364,12 +1364,8 @@ static int rsl_rx_ipac_XXcx(struct msgb *msg)
if (connect_ip == 0) {
struct e1inp_sign_link *sign_link =
lchan->ts->trx->rsl_link;
- int rsl_fd = sign_link->ts->driver.ipaccess.fd.fd;
- struct sockaddr_in sin;
- socklen_t slen = sizeof(sin);
- getpeername(rsl_fd, (struct sockaddr *)&sin, &slen);
- ia = sin.sin_addr;
+ ia.s_addr = htonl(get_signlink_remote_ip(sign_link));
} else
ia.s_addr = connect_ip;
rc = osmo_rtp_socket_connect(lchan->abis_ip.rtp_socket,