aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Kluchnikov <kluchnikovi@gmail.com>2016-04-25 18:19:22 +0300
committerIvan Kluchnikov <kluchnikovi@gmail.com>2016-04-25 18:19:22 +0300
commit8a8ae549684d301682fdfff7f7246c532f9ef459 (patch)
tree752c9a09b6f4fe515466d1322fbc7ee6156193b7
parentb78554342cb2344b13c17bfeaada0509cac5b51c (diff)
trx_if: don't use connect function for data socketfairwaves/eq
In case of using external equalizer, osmo-bts receives data from equalizer, but sends data directly to osmo-trx. So osmo-bts should be able to use different ports for receiving and sending data.
-rw-r--r--src/osmo-bts-trx/trx_if.c28
1 files changed, 19 insertions, 9 deletions
diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c
index 69ad841..0c44bf5 100644
--- a/src/osmo-bts-trx/trx_if.c
+++ b/src/osmo-bts-trx/trx_if.c
@@ -26,6 +26,8 @@
#include <errno.h>
#include <string.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
#include <netinet/in.h>
#include <osmocom/core/select.h>
@@ -57,7 +59,7 @@ static uint16_t base_port_local = 5800;
/* open socket */
static int trx_udp_open(void *priv, struct osmo_fd *ofd, uint16_t port,
- int (*cb)(struct osmo_fd *fd, unsigned int what))
+ int (*cb)(struct osmo_fd *fd, unsigned int what), unsigned int flags)
{
struct sockaddr_storage sas;
struct sockaddr *sa = (struct sockaddr *)&sas;
@@ -92,11 +94,12 @@ static int trx_udp_open(void *priv, struct osmo_fd *ofd, uint16_t port,
return -EINVAL;
}
- rc = connect(ofd->fd, sa, sa_len);
- if (rc)
- return rc;
+ if (flags & OSMO_SOCK_F_CONNECT) {
+ rc = connect(ofd->fd, sa, sa_len);
+ if (rc)
+ return rc;
+ }
-
return 0;
}
@@ -462,6 +465,8 @@ static int trx_data_read_cb(struct osmo_fd *ofd, unsigned int what)
int trx_if_data(struct trx_l1h *l1h, uint8_t tn, uint32_t fn, uint8_t pwr,
const ubit_t *bits)
{
+ struct sockaddr_in rem_addr;
+ char *rem_ip = "127.0.0.1";
uint8_t buf[256];
LOGP(DTRX, LOGL_DEBUG, "TX burst tn=%u fn=%u pwr=%u\n", tn, fn, pwr);
@@ -476,10 +481,15 @@ int trx_if_data(struct trx_l1h *l1h, uint8_t tn, uint32_t fn, uint8_t pwr,
/* copy ubits {0,1} */
memcpy(buf + 6, bits, 148);
+ memset((char *) &rem_addr, 0, sizeof(rem_addr));
+ rem_addr.sin_family = AF_INET;
+ rem_addr.sin_port = htons(base_port_local - 100 + (l1h->trx->nr << 1) + 2);
+ inet_aton(rem_ip, &rem_addr.sin_addr);
+
/* we must be sure that we have clock, and we have sent all control
* data */
if (transceiver_available && llist_empty(&l1h->trx_ctrl_list)) {
- send(l1h->trx_ofd_data.fd, buf, 154, 0);
+ sendto(l1h->trx_ofd_data.fd, buf, 154, 0, (struct sockaddr *)&rem_addr, sizeof(rem_addr));
} else
LOGP(DTRX, LOGL_DEBUG, "Ignoring TX data, transceiver "
"offline.\n");
@@ -504,17 +514,17 @@ int trx_if_open(struct trx_l1h *l1h)
/* open sockets */
if (l1h->trx->nr == 0) {
rc = trx_udp_open(NULL, &trx_ofd_clk, base_port_local,
- trx_clk_read_cb);
+ trx_clk_read_cb, OSMO_SOCK_F_CONNECT);
if (rc < 0)
return rc;
LOGP(DTRX, LOGL_NOTICE, "Waiting for transceiver send clock\n");
}
rc = trx_udp_open(l1h, &l1h->trx_ofd_ctrl,
- base_port_local + (l1h->trx->nr << 1) + 1, trx_ctrl_read_cb);
+ base_port_local + (l1h->trx->nr << 1) + 1, trx_ctrl_read_cb, OSMO_SOCK_F_CONNECT);
if (rc < 0)
goto err;
rc = trx_udp_open(l1h, &l1h->trx_ofd_data,
- base_port_local + (l1h->trx->nr << 1) + 2, trx_data_read_cb);
+ base_port_local + (l1h->trx->nr << 1) + 2, trx_data_read_cb, OSMO_SOCK_F_BIND);
if (rc < 0)
goto err;