release 1.7.0-fw.5

Change-Id: Ic3dd759e7c22b3148320bc9ac2aad3f5c98eb367
rtp_bridge: Demote a chatty ERROR log message to DEBUG level.
2025-11-02 04:53:24 +00:00 · 2020-05-13 02:27:42 +03:00 · 2020-05-11 18:14:31 +03:00 · 2020-05-11 18:13:53 +03:00 · 2020-05-09 19:15:50 +02:00
4 changed files with 13 additions and 7 deletions
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+osmo-mgw (1.7.0-fw.5) unstable; urgency=medium
+
+  * master:ebb9bf3f12
+
+ -- Kirill Zakharenko <kirill.zakharenko@fairwaves.co>  Tue, 12 May 2020 23:26:34 +0000
+
 osmo-mgw (1.7.0) unstable; urgency=medium

  [ Neels Hofmeyr ]
--- a/src/libosmo-mgcp-client/mgcp_client.c
+++ b/src/libosmo-mgcp-client/mgcp_client.c
@@ -829,7 +829,7 @@ int mgcp_client_connect(struct mgcp_client *mgcp)
 	mgcp->remote_addr = htonl(addr.sin_addr.s_addr);

 	osmo_wqueue_init(wq, 1024);
-	wq->bfd.when = BSC_FD_READ;
+	wq->bfd.when = OSMO_FD_READ;
 	wq->bfd.data = mgcp;
 	wq->read_cb = mgcp_do_read;
 	wq->write_cb = mgcp_do_write;
--- a/src/libosmo-mgcp/mgcp_network.c
+++ b/src/libosmo-mgcp/mgcp_network.c
@@ -1271,7 +1271,7 @@ int mgcp_dispatch_rtp_bridge_cb(int proto, struct sockaddr_in *addr, char *buf,
 	struct mgcp_conn *conn_dst;

 	/*! NOTE: This callback function implements the endpoint specific
-	 *  dispatch bahviour of an rtp bridge/proxy endpoint. It is assumed
+	 *  dispatch behaviour of an rtp bridge/proxy endpoint. It is assumed
 	 *  that the endpoint will hold only two connections. This premise
 	 *  is used to determine the opposite connection (it is always the
 	 *  connection that is not the originating connection). Once the
@@ -1310,8 +1310,8 @@ int mgcp_dispatch_rtp_bridge_cb(int proto, struct sockaddr_in *addr, char *buf,

 	/* There is no destination conn, stop here */
 	if (!conn_dst) {
-		LOGPCONN(conn, DRTP, LOGL_ERROR,
-			 "unable to find destination conn\n");
+		LOGPCONN(conn, DRTP, LOGL_DEBUG,
+			 "no connection to forward an incoming RTP packet to\n");
 		return -1;
 	}

@@ -1462,7 +1462,7 @@ static int bind_rtp(struct mgcp_config *cfg, const char *source_addr,
 	mgcp_set_ip_tos(rtp_end->rtp.fd, cfg->endp_dscp);
 	mgcp_set_ip_tos(rtp_end->rtcp.fd, cfg->endp_dscp);

-	rtp_end->rtp.when = BSC_FD_READ;
+	rtp_end->rtp.when = OSMO_FD_READ;
 	if (osmo_fd_register(&rtp_end->rtp) != 0) {
 		LOGPENDP(endp, DRTP, LOGL_ERROR,
 			 "failed to register RTP port %d\n",
@@ -1470,7 +1470,7 @@ static int bind_rtp(struct mgcp_config *cfg, const char *source_addr,
 		goto cleanup2;
 	}

-	rtp_end->rtcp.when = BSC_FD_READ;
+	rtp_end->rtcp.when = OSMO_FD_READ;
 	if (osmo_fd_register(&rtp_end->rtcp) != 0) {
 		LOGPENDP(endp, DRTP, LOGL_ERROR,
 			 "failed to register RTCP port %d\n",
--- a/src/libosmo-mgcp/mgcp_osmux.c
+++ b/src/libosmo-mgcp/mgcp_osmux.c
@@ -406,7 +406,7 @@ int osmux_init(int role, struct mgcp_config *cfg)
 		return ret;
 	}
 	mgcp_set_ip_tos(osmux_fd.fd, cfg->endp_dscp);
-	osmux_fd.when |= BSC_FD_READ;
+	osmux_fd.when |= OSMO_FD_READ;

 	ret = osmo_fd_register(&osmux_fd);
 	if (ret < 0) {
Author	SHA1	Message	Date
Kirill Zakharenko	55b85a5da4	release 1.7.0-fw.5 Change-Id: Ic3dd759e7c22b3148320bc9ac2aad3f5c98eb367	2020-05-13 02:27:42 +03:00
Alexander Chemeris	ebb9bf3f12	rtp_bridge: Demote a chatty ERROR log message to DEBUG level. Not having a second leg of an MGCP endpoint is a normal situtation and can't be treated as an ERROR message, especially not as an ERROR message logged on every RTP packet. This happens routinely at the beginning of call setup and we get tens of ERROR messages in the logs for every call. Change-Id: If741a742208772bda4e59236345d7ae650368d5a	2020-05-11 18:14:31 +03:00
Alexander Chemeris	61cf9bb5f1	mgcp_network: Fix a typo in the comment bahviour -> behaviour Change-Id: I59a06b95e9bbf90c038c5c9234f5c857315d5f07	2020-05-11 18:13:53 +03:00
Pau Espin Pedrol	a7152e055a	Use OSMO_FD_* instead of deprecated BSC_FD_* New define is available since libosmocore 1.1.0, and we already require 1.1.0, so no need to update dependenices. Let's change it to avoid people re-using old BSC_FD_* symbols when copy-pasting somewhere else. Change-Id: I9b6463af713f76c06a144bdbf202c0d91eef4d21	2020-05-09 19:15:50 +02:00