[sr-dev] git:5.1:797705e4: rtpengine: fix error output on send_rtpp_command()

Module: kamailio Branch: 5.1 Commit: 797705e42896c9bcef6b4b45d631d643bf07efe5 URL: https://github.com/kamailio/kamailio/commit/797705e42896c9bcef6b4b45d631d64… Author: Victor Seva &lt;linuxmaniac(a)torreviejawireless.org&gt; Committer: Victor Seva &lt;linuxmaniac(a)torreviejawireless.org&gt; Date: 2019-07-15T12:39:17+02:00 rtpengine: fix error output on send_rtpp_command() * rename out variable to cmd due to We already have an out goto label (cherry picked from commit 262068940ba8dbd1b9fd93847f83f40c038d988c) --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/797705e42896c9bcef6b4b45d631d64… Patch: https://github.com/kamailio/kamailio/commit/797705e42896c9bcef6b4b45d631d64… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index f11d03d3f9..00f0f0aff1 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -2442,7 +2442,7 @@ send_rtpp_command(struct rtpp_node *node, bencode_item_t *dict, int *outlen) static char buf[0x10000]; struct pollfd fds[1]; struct iovec *v; - str out = STR_NULL; + str cmd = STR_NULL; v = bencode_iovec(dict, &vcnt, 1, 0); if (!v) { @@ -2507,8 +2507,9 @@ send_rtpp_command(struct rtpp_node *node, bencode_item_t *dict, int *outlen) len = writev(rtpp_socks[node->idx], v, vcnt + 1); } while (len == -1 && (errno == EINTR || errno == ENOBUFS)); if (len <= 0) { - bencode_get_str(bencode_dictionary_get(dict, "command"), &out); - LM_ERR("can't send command \"%.*s\" to RTP proxy <%s>\n", out.len, out.s, node->rn_url.s); + bencode_get_str(bencode_dictionary_get(dict, "command"), &cmd); + LM_ERR("can't send command \"%.*s\" to RTP proxy <%s>\n", + cmd.len, cmd.s, node->rn_url.s); goto badproxy; } rtpengine_tout_ms = cfg_get(rtpengine,rtpengine_cfg,rtpengine_tout_ms); @@ -2518,7 +2519,9 @@ send_rtpp_command(struct rtpp_node *node, bencode_item_t *dict, int *outlen) len = recv(rtpp_socks[node->idx], buf, sizeof(buf)-1, 0); } while (len == -1 && errno == EINTR); if (len <= 0) { - LM_ERR("can't read reply for command \"%.*s\" from RTP proxy <%s>\n", out.len, out.s, node->rn_url.s); + bencode_get_str(bencode_dictionary_get(dict, "command"), &cmd); + LM_ERR("can't read reply for command \"%.*s\" from RTP proxy <%s>\n", + cmd.len, cmd.s, node->rn_url.s); goto badproxy; } if (len >= (v[0].iov_len - 1) && @@ -2535,7 +2538,9 @@ send_rtpp_command(struct rtpp_node *node, bencode_item_t *dict, int *outlen) } } if (i == rtpengine_retr) { - LM_ERR("timeout waiting reply for command \"%.*s\" from RTP proxy <%s>\n", out.len, out.s, node->rn_url.s); + bencode_get_str(bencode_dictionary_get(dict, "command"), &cmd); + LM_ERR("timeout waiting reply for command \"%.*s\" from RTP proxy <%s>\n", + cmd.len, cmd.s, node->rn_url.s); goto badproxy; } }