aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2019-05-13 17:32:47 +0200
committerPau Espin Pedrol <pespin@sysmocom.de>2019-05-14 11:36:33 +0200
commit295570c6314faf11968b6c63b689b927830f8379 (patch)
treeed7c554b2fddab49848c83aeebb43c595926c93b
parenta93c6e9263955e83e819e41ef3a595b034dbfc1f (diff)
osmux: Use remote port to send osmux frames
Previously the local one was used but nobody cared because probably everybody was using default 1984 on different IP addresses. Change-Id: I01e590465fa247185d74103578681e9041249099
-rw-r--r--src/libosmo-mgcp/mgcp_osmux.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c
index 7290ba34e..9bbc1b273 100644
--- a/src/libosmo-mgcp/mgcp_osmux.c
+++ b/src/libosmo-mgcp/mgcp_osmux.c
@@ -323,7 +323,7 @@ static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct mgcp_conn_r
{
switch(conn->osmux.state) {
case OSMUX_STATE_ACTIVATING:
- if (osmux_enable_conn(endp, conn, &conn->end.addr, htons(endp->cfg->osmux_port)) < 0) {
+ if (osmux_enable_conn(endp, conn, &conn->end.addr, conn->end.rtp_port) < 0) {
LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR,
"Could not enable osmux for conn:%s\n",
mgcp_conn_dump(conn->conn));
@@ -332,7 +332,7 @@ static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct mgcp_conn_r
LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR,
"Osmux CID %u for %s:%u is now enabled\n",
conn->osmux.cid, inet_ntoa(conn->end.addr),
- endp->cfg->osmux_port);
+ ntohs(conn->end.rtp_port));
return 0;
case OSMUX_STATE_ENABLED:
return 0;
@@ -701,7 +701,7 @@ int osmux_send_dummy(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn)
inet_ntoa(conn->end.addr), conn->osmux.cid);
return mgcp_udp_send(osmux_fd.fd, &conn->end.addr,
- htons(endp->cfg->osmux_port), buf, sizeof(buf));
+ conn->end.rtp_port, buf, sizeof(buf));
}
/* bsc-nat allocates/releases the Osmux circuit ID. +7 to round up to 8 bit boundary. */