pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39185?usp=email )
Change subject: mgw: mgcp_network.c: Simplify use of conn_rtp ptr ......................................................................
mgw: mgcp_network.c: Simplify use of conn_rtp ptr
Change-Id: I5bab15fc793434173660769a8e60dae4ae4aa4c6 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 9 insertions(+), 9 deletions(-)
Approvals: pespin: Looks good to me, approved daniel: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve
diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index fd27e9a..f0111cd 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -1343,13 +1343,13 @@ * packets back to their origin. We will use the originating * address data from the UDP packet header to patch the * outgoing address in connection on the fly */ - if (osmo_sockaddr_port(&conn->u.rtp.end.addr.u.sa) == 0) { - memcpy(&conn->u.rtp.end.addr, from_addr, - sizeof(conn->u.rtp.end.addr)); + if (osmo_sockaddr_port(&conn_src->end.addr.u.sa) == 0) { + memcpy(&conn_src->end.addr, from_addr, + sizeof(conn_src->end.addr)); LOG_CONN_RTP(conn_src, LOGL_NOTICE, "loopback mode: implicitly using source address (%s:%u) as destination address\n", osmo_sockaddr_ntop(&from_addr->u.sa, ipbuf), - osmo_sockaddr_port(&conn->u.rtp.end.addr.u.sa)); + osmo_sockaddr_port(&conn_src->end.addr.u.sa)); } return mgcp_conn_rtp_dispatch_rtp(conn_src, msg); } @@ -1428,19 +1428,19 @@ * packets back to their origin. We will use the originating * address data from the UDP packet header to patch the * outgoing address in connection on the fly */ - if (osmo_sockaddr_port(&conn->u.rtp.end.addr.u.sa) == 0) { - memcpy(&conn->u.rtp.end.addr, from_addr, - sizeof(conn->u.rtp.end.addr)); + if (osmo_sockaddr_port(&conn_src->end.addr.u.sa) == 0) { + memcpy(&conn_src->end.addr, from_addr, + sizeof(conn_src->end.addr)); LOG_CONN_RTP(conn_src, LOGL_NOTICE, "loopback mode: implicitly using source address (%s:%u) as destination address\n", osmo_sockaddr_ntop(&from_addr->u.sa, ipbuf), - osmo_sockaddr_port(&conn->u.rtp.end.addr.u.sa)); + osmo_sockaddr_port(&conn_src->end.addr.u.sa)); } return mgcp_conn_rtp_dispatch_rtp(conn_src, msg); }
/* Forward to E1 */ - return mgcp_e1_send_rtp(conn->endp, conn->u.rtp.end.codec, msg); + return mgcp_e1_send_rtp(conn->endp, conn_src->end.codec, msg); }
/*! cleanup an endpoint when a connection on an RTP bridge endpoint is removed.
-
pespin