pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35175?usp=email )

Change subject: mgcp_network: Improve err logging when rtp pkt from unexpected origin comes in ......................................................................

mgcp_network: Improve err logging when rtp pkt from unexpected origin comes in

Change-Id: Id9b60395df667ae9898c23cbc2afe56ac7e8b0e5 --- M src/libosmo-mgcp/mgcp_network.c 1 file changed, 18 insertions(+), 17 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/75/35175/1

diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 46d0cb4..b1bce97 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -845,9 +845,8 @@ * sends the RAB Assignment Response. Hence, if the remote address is 0.0.0.0 and the * MGCP port is in loopback mode, allow looping back the packet to any source. */ LOGPCONN(conn->conn, DRTP, LOGL_ERROR, - "In loopback mode and remote address not set:" - " allowing data from address: %s\n", - osmo_sockaddr_ntop(&addr->u.sa, ipbuf)); + "In loopback mode and remote address not set: allowing data from address: %s\n", + osmo_sockaddr_to_str(addr)); return 0;

default: @@ -855,9 +854,8 @@ * this as an error that occurs on every call, keep it more low profile to not * confuse humans with expected errors. */ LOGPCONN(conn->conn, DRTP, LOGL_INFO, - "Rx RTP from %s, but remote address not set:" - " dropping early media\n", - osmo_sockaddr_ntop(&addr->u.sa, ipbuf)); + "Rx RTP from %s, but remote address not set: dropping early media\n", + osmo_sockaddr_to_str(addr)); return -1; } } @@ -871,11 +869,8 @@ memcmp(&conn->end.addr.u.sin6.sin6_addr, &addr->u.sin6.sin6_addr, sizeof(struct in6_addr)))) { LOGPCONN(conn->conn, DRTP, LOGL_ERROR, - "data from wrong address: %s, ", - osmo_sockaddr_ntop(&addr->u.sa, ipbuf)); - LOGPC(DRTP, LOGL_ERROR, "expected: %s\n", - osmo_sockaddr_ntop(&conn->end.addr.u.sa, ipbuf)); - LOGPCONN(conn->conn, DRTP, LOGL_ERROR, "packet tossed\n"); + "data from wrong src %s, expected IP Address %s. Packet tossed.\n", + osmo_sockaddr_to_str(addr), osmo_sockaddr_ntop(&conn->end.addr.u.sa, ipbuf)); return -1; }

@@ -886,12 +881,9 @@ if (osmo_sockaddr_port(&conn->end.addr.u.sa) != osmo_sockaddr_port(&addr->u.sa) && ntohs(conn->end.rtcp_port) != osmo_sockaddr_port(&addr->u.sa)) { LOGPCONN(conn->conn, DRTP, LOGL_ERROR, - "data from wrong source port: %d, ", - osmo_sockaddr_port(&addr->u.sa)); - LOGPC(DRTP, LOGL_ERROR, - "expected: %d for RTP or %d for RTCP\n", - osmo_sockaddr_port(&conn->end.addr.u.sa), ntohs(conn->end.rtcp_port)); - LOGPCONN(conn->conn, DRTP, LOGL_ERROR, "packet tossed\n"); + "data from wrong src %s, expected port: %u for RTP or %u for RTCP. Packet tossed.\n", + osmo_sockaddr_to_str(addr), osmo_sockaddr_port(&conn->end.addr.u.sa), + ntohs(conn->end.rtcp_port)); return -1; }