[Pkg-voip-commits] r9605 - in /kamailio/trunk/debian: changelog patches/upstream/0006-rtpproxy-proper-iovec-size-for-rtpproxy-commands.patch

[maniac-guest at alioth.debian.org]

Author: maniac-guest
Date: Mon Mar 26 06:34:22 2012
New Revision: 9605

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9605
Log:
upstream fix

Added:
    kamailio/trunk/debian/patches/upstream/0006-rtpproxy-proper-iovec-size-for-rtpproxy-commands.patch
Modified:
    kamailio/trunk/debian/changelog

Modified: kamailio/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/changelog?rev=9605&op=diff
==============================================================================
--- kamailio/trunk/debian/changelog (original)
+++ kamailio/trunk/debian/changelog Mon Mar 26 06:34:22 2012
@@ -24,7 +24,7 @@
   * debian/copyright
     + using copyright-format/1.0/
 
- -- Victor Seva <linuxmaniac at torreviejawireless.org>  Tue, 20 Mar 2012 14:56:09 +0100
+ -- Victor Seva <linuxmaniac at torreviejawireless.org>  Mon, 26 Mar 2012 08:33:42 +0200
 
 kamailio (1.5.1-2) unstable; urgency=low
 

Added: kamailio/trunk/debian/patches/upstream/0006-rtpproxy-proper-iovec-size-for-rtpproxy-commands.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0006-rtpproxy-proper-iovec-size-for-rtpproxy-commands.patch?rev=9605&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0006-rtpproxy-proper-iovec-size-for-rtpproxy-commands.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0006-rtpproxy-proper-iovec-size-for-rtpproxy-commands.patch Mon Mar 26 06:34:22 2012
@@ -1,0 +1,31 @@
+From 2357e54ecfba7a86b993e5a0e864fd232e1730ba Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Fri, 23 Mar 2012 12:14:07 +0100
+Subject: [PATCH] rtpproxy: proper iovec size for rtpproxy commands
+
+- issue introduced with the last fix for timeout socket parameter
+- reported by Laurent Schweizer
+(cherry picked from commit 7c7e9f1051148887b7c5a578a9d09d66bf9586ce)
+---
+ modules/rtpproxy/rtpproxy.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c
+index 277f639..b6aa316 100644
+--- a/modules/rtpproxy/rtpproxy.c
++++ b/modules/rtpproxy/rtpproxy.c
+@@ -2222,9 +2222,9 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer, int forc
+ 				} else {
+ 					v[3].iov_len = 0;
+ 				}
+-				if (opts.s.s[0] == 'U' && to_tag.len > 0) {
++				if (to_tag.len > 0) {
+ 					iovec_param_count = 18;
+-					if (timeout_socket_str.len > 0) {
++					if (opts.s.s[0] == 'U' && timeout_socket_str.len > 0) {
+ 						iovec_param_count = 20;
+ 						STR2IOVEC(timeout_socket_str, v[19]);
+ 					}
+-- 
+1.7.5.4
+