Review at https://gerrit.osmocom.org/5146
rsl.c: Log RTP socket related errors as DRTP, not DRSL
The respective errors/events occur as a result of calling osmo_rtp_*
API, and are clearly more fitting into the DRTP category than the DRSL,
even though the respective actions are triggered by RSL.
Change-Id: I52e6f9865492a2f757a37860eb92a3dc49e174ef
---
M src/common/rsl.c
1 file changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/46/5146/1
diff --git a/src/common/rsl.c b/src/common/rsl.c
index 1ebc8b2..461b21d 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -1061,7 +1061,7 @@
if (lchan->abis_ip.rtp_socket) {
rsl_tx_ipac_dlcx_ind(lchan, RSL_ERR_NORMAL_UNSPEC);
- osmo_rtp_socket_log_stats(lchan->abis_ip.rtp_socket, DRSL,
LOGL_INFO,
+ osmo_rtp_socket_log_stats(lchan->abis_ip.rtp_socket, DRTP,
LOGL_INFO,
"Closing RTP socket on Channel Release ");
osmo_rtp_socket_free(lchan->abis_ip.rtp_socket);
lchan->abis_ip.rtp_socket = NULL;
@@ -1682,7 +1682,7 @@
lchan->abis_ip.rtp_socket =
osmo_rtp_socket_create(lchan->ts->trx,
OSMO_RTP_F_POLL);
if (!lchan->abis_ip.rtp_socket) {
- LOGP(DRSL, LOGL_ERROR,
+ LOGP(DRTP, LOGL_ERROR,
"%s IPAC Failed to create RTP/RTCP sockets\n",
gsm_lchan_name(lchan));
oml_fail_rep(OSMO_EVT_CRIT_RTP_TOUT,
@@ -1697,11 +1697,11 @@
OSMO_RTP_P_JITBUF,
btsb->rtp_jitter_buf_ms);
if (rc < 0)
- LOGP(DRSL, LOGL_ERROR,
+ LOGP(DRTP, LOGL_ERROR,
"%s IPAC Failed to set RTP socket parameters:
%s\n",
gsm_lchan_name(lchan), strerror(-rc));
else
- LOGP(DRSL, LOGL_INFO,
+ LOGP(DRTP, LOGL_INFO,
"%s IPAC set RTP socket parameters: %d\n",
gsm_lchan_name(lchan), rc);
lchan->abis_ip.rtp_socket->priv = lchan;
@@ -1724,7 +1724,7 @@
rc = osmo_rtp_socket_bind(lchan->abis_ip.rtp_socket,
ipstr, -1);
if (rc < 0) {
- LOGP(DRSL, LOGL_ERROR,
+ LOGP(DRTP, LOGL_ERROR,
"%s IPAC Failed to bind RTP/RTCP sockets\n",
gsm_lchan_name(lchan));
oml_fail_rep(OSMO_EVT_CRIT_RTP_TOUT,
@@ -1761,7 +1761,7 @@
rc = osmo_rtp_socket_connect(lchan->abis_ip.rtp_socket,
inet_ntoa(ia), ntohs(connect_port));
if (rc < 0) {
- LOGP(DRSL, LOGL_ERROR,
+ LOGP(DRTP, LOGL_ERROR,
"%s Failed to connect RTP/RTCP sockets\n",
gsm_lchan_name(lchan));
osmo_rtp_socket_free(lchan->abis_ip.rtp_socket);
@@ -1778,7 +1778,7 @@
&lchan->abis_ip.bound_ip,
&port);
if (rc < 0)
- LOGP(DRSL, LOGL_ERROR, "%s IPAC cannot obtain "
+ LOGP(DRTP, LOGL_ERROR, "%s IPAC cannot obtain "
"locally bound IP/port: %d\n",
gsm_lchan_name(lchan), rc);
lchan->abis_ip.bound_port = port;
@@ -1819,7 +1819,7 @@
inc_conn_id = 1;
rc = rsl_tx_ipac_dlcx_ack(lchan, inc_conn_id);
- osmo_rtp_socket_log_stats(lchan->abis_ip.rtp_socket, DRSL, LOGL_INFO,
+ osmo_rtp_socket_log_stats(lchan->abis_ip.rtp_socket, DRTP, LOGL_INFO,
"Closing RTP socket on DLCX ");
osmo_rtp_socket_free(lchan->abis_ip.rtp_socket);
lchan->abis_ip.rtp_socket = NULL;
--
To view, visit https://gerrit.osmocom.org/5146
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I52e6f9865492a2f757a37860eb92a3dc49e174ef
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <[email protected]>
