[Pkg-voip-commits] [sngrep] 04/06: add upstream fix

[Victor Seva Lopez]

This is an automated email from the git hooks/post-receive script.

maniac-guest pushed a commit to branch vseva/1.1.0
in repository sngrep.

commit 16b52211e61a6ac20ed155390cabae76de087906
Author: Victor Seva <linuxmaniac at torreviejawireless.org>
Date:   Mon Nov 9 22:17:54 2015 +0100

    add upstream fix
---
 .../1515f8ea06aa7b57b1a5210537ad45f567904dca.patch | 78 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 79 insertions(+)

diff --git a/debian/patches/1515f8ea06aa7b57b1a5210537ad45f567904dca.patch b/debian/patches/1515f8ea06aa7b57b1a5210537ad45f567904dca.patch
new file mode 100644
index 0000000..e0c703e
--- /dev/null
+++ b/debian/patches/1515f8ea06aa7b57b1a5210537ad45f567904dca.patch
@@ -0,0 +1,78 @@
+From 1515f8ea06aa7b57b1a5210537ad45f567904dca Mon Sep 17 00:00:00 2001
+From: Kaian <kaian at irontec.com>
+Date: Mon, 9 Nov 2015 13:53:02 +0100
+Subject: [PATCH] Fix RTP/RTCP arrows when src and dst belongs to the same
+ network
+
+---
+ src/ui_call_flow.c | 24 ++++++++++++++++--------
+ 1 file changed, 16 insertions(+), 8 deletions(-)
+
+diff --git a/src/ui_call_flow.c b/src/ui_call_flow.c
+index 518058c..64407e7 100644
+--- a/src/ui_call_flow.c
++++ b/src/ui_call_flow.c
+@@ -553,13 +553,17 @@ call_flow_draw_rtp_stream(PANEL *panel, call_flow_arrow_t *arrow, int cline)
+     // Get message data
+     msg_get_attribute(stream->media->msg, SIP_ATTR_SRC, msg_src);
+     msg_get_attribute(stream->media->msg, SIP_ATTR_DST, msg_dst);
++    // Remove port from address. We only look for columns no matter if it matches port or not
++    sip_address_strip_port(msg_src);
++    sip_address_strip_port(msg_dst);
++
+     callid = stream->media->msg->call->callid;
+ 
+     // Get origin column for this stream.
+     // If we share the same Address from its setup SIP packet, use that column instead.
+-    if (!strncmp(stream->ip_src, msg_src, strlen(stream->ip_src))) {
++    if (!strcmp(stream->ip_src, msg_src)) {
+         column1 = call_flow_column_get(panel, callid, msg_src);
+-    } else if (!strncmp(stream->ip_src, msg_dst, strlen(stream->ip_src))) {
++    } else if (!strcmp(stream->ip_src, msg_dst)) {
+         column1 = call_flow_column_get(panel, callid, msg_dst);
+     } else {
+         column1 = call_flow_column_get(panel, 0, stream->ip_src);
+@@ -567,9 +571,9 @@ call_flow_draw_rtp_stream(PANEL *panel, call_flow_arrow_t *arrow, int cline)
+ 
+     // Get destination column for this stream.
+     // If we share the same Address from its setup SIP packet, use that column instead.
+-    if (!strncmp(stream->ip_dst, msg_dst, strlen(stream->ip_dst))) {
++    if (!strcmp(stream->ip_dst, msg_dst)) {
+         column2 = call_flow_column_get(panel, callid, msg_dst);
+-    } else if (!strncmp(stream->ip_dst, msg_src, strlen(stream->ip_dst))) {
++    } else if (!strcmp(stream->ip_dst, msg_src)) {
+         column2 = call_flow_column_get(panel, callid, msg_src);
+     } else {
+         column2 = call_flow_column_get(panel, 0, stream->ip_dst);
+@@ -689,13 +693,17 @@ call_flow_draw_rtcp_stream(PANEL *panel, call_flow_arrow_t *arrow, int cline)
+     // Get message data
+     msg_get_attribute(stream->media->msg, SIP_ATTR_SRC, msg_src);
+     msg_get_attribute(stream->media->msg, SIP_ATTR_DST, msg_dst);
++    // Remove port from address. We only look for columns no matter if it matches port or not
++    sip_address_strip_port(msg_src);
++    sip_address_strip_port(msg_dst);
++
+     callid = stream->media->msg->call->callid;
+ 
+     // Get origin column for this stream.
+     // If we share the same Address from its setup SIP packet, use that column instead.
+-    if (!strncmp(stream->ip_src, msg_src, strlen(stream->ip_src))) {
++    if (!strcmp(stream->ip_src, msg_src)) {
+         column1 = call_flow_column_get(panel, callid, msg_src);
+-    } else if (!strncmp(stream->ip_src, msg_dst, strlen(stream->ip_src))) {
++    } else if (!strcmp(stream->ip_src, msg_dst)) {
+         column1 = call_flow_column_get(panel, callid, msg_dst);
+     } else {
+         column1 = call_flow_column_get(panel, 0, stream->ip_src);
+@@ -703,9 +711,9 @@ call_flow_draw_rtcp_stream(PANEL *panel, call_flow_arrow_t *arrow, int cline)
+ 
+     // Get destination column for this stream.
+     // If we share the same Address from its setup SIP packet, use that column instead.
+-    if (!strncmp(stream->ip_dst, msg_dst, strlen(stream->ip_dst))) {
++    if (!strcmp(stream->ip_dst, msg_dst)) {
+         column2 = call_flow_column_get(panel, callid, msg_dst);
+-    } else if (!strncmp(stream->ip_dst, msg_src, strlen(stream->ip_dst))) {
++    } else if (!strcmp(stream->ip_dst, msg_src)) {
+         column2 = call_flow_column_get(panel, callid, msg_src);
+     } else {
+         column2 = call_flow_column_get(panel, 0, stream->ip_dst);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..049de21
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+1515f8ea06aa7b57b1a5210537ad45f567904dca.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/sngrep.git