[Pkg-voip-commits] r9891 - in /kamailio/trunk/debian: changelog patches/series patches/upstream/0003-modules-lcr-Fixed-to-from_gw-tests-when-proto-parame.patch

Wed Jul 4 14:28:23 UTC 2012

Author: maniac-guest
Date: Wed Jul  4 14:28:22 2012
New Revision: 9891

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

Added:
    kamailio/trunk/debian/patches/upstream/0003-modules-lcr-Fixed-to-from_gw-tests-when-proto-parame.patch
Modified:
    kamailio/trunk/debian/changelog
    kamailio/trunk/debian/patches/series

Modified: kamailio/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/changelog?rev=9891&op=diff
==============================================================================

--- kamailio/trunk/debian/changelog (original)
+++ kamailio/trunk/debian/changelog Wed Jul  4 14:28:22 2012
@@ -7,8 +7,10 @@
   * debian/backports/squeeze:
     + remove call to dpkg-buildflags
     + do not apply hardening_flags.patch
-
- -- Victor Seva <linuxmaniac at torreviejawireless.org>  Wed, 04 Jul 2012 14:39:39 +0200
+  * debian/patches:
+    + upstream/0003-modules-lcr-Fixed-to-from_gw-tests-when-proto-parame.patch
+
+ -- Victor Seva <linuxmaniac at torreviejawireless.org>  Wed, 04 Jul 2012 16:26:48 +0200
 
 kamailio (3.3.0-1) unstable; urgency=low
 

Modified: kamailio/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/series?rev=9891&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/series (original)
+++ kamailio/trunk/debian/patches/series Wed Jul  4 14:28:22 2012
@@ -1,5 +1,6 @@
 upstream/0001-dialog-k-proper-unlock-of-profile-for-mi-list-comman.patch
 upstream/0002-modules_k-presence_xml-Xcap-auth-reason-when-user-de.patch
+upstream/0003-modules-lcr-Fixed-to-from_gw-tests-when-proto-parame.patch
 multiarch_support.patch
 no_INSTALL_file.patch
 hardening_flags.patch

Added: kamailio/trunk/debian/patches/upstream/0003-modules-lcr-Fixed-to-from_gw-tests-when-proto-parame.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0003-modules-lcr-Fixed-to-from_gw-tests-when-proto-parame.patch?rev=9891&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0003-modules-lcr-Fixed-to-from_gw-tests-when-proto-parame.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0003-modules-lcr-Fixed-to-from_gw-tests-when-proto-parame.patch Wed Jul  4 14:28:22 2012
@@ -1,0 +1,70 @@
+From 948df15d215e7d12ad404dec7dfdbb41d58bea3e Mon Sep 17 00:00:00 2001
+From: Juha Heinanen <jh at tutpro.com>
+Date: Wed, 4 Jul 2012 17:15:43 +0300
+Subject: [PATCH] modules/lcr: Fixed to/from_gw tests when proto parameter is
+ 0 (ANY)
+
+- Also, updated README regarding handling of NULL value in lcr_gw
+  transport column.
+(cherry picked from commit 1382c30da7ffd8831479affafde4d8e038a41240)
+---
+ modules/lcr/README            |    4 ++--
+ modules/lcr/doc/lcr_admin.xml |    2 +-
+ modules/lcr/lcr_mod.c         |    6 ++----
+ 3 files changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/modules/lcr/README b/modules/lcr/README
+index 3676a55..178f265 100644
+--- a/modules/lcr/README
++++ b/modules/lcr/README
+@@ -268,8 +268,8 @@ Chapter 1. Admin Guide
+    scheme, IP address, port, and transport protocol.
+ 
+    Valid URI scheme values are NULL = sip, 1 = sip and 2 = sips. Currently
+-   valid transport protocol values are NULL = none, 1 = udp, 2 = tcp, 3 =
+-   tls, and 4 = sctp.
++   valid transport protocol values are NULL and 0 = none, 1 = udp, 2 =
++   tcp, 3 = tls, and 4 = sctp.
+ 
+    As a side effect of gateway selection, selected gateway's tag and flags
+    (that may contain information about the gateway and its capabilities)
+diff --git a/modules/lcr/doc/lcr_admin.xml b/modules/lcr/doc/lcr_admin.xml
+index 39aa980..d498904 100644
+--- a/modules/lcr/doc/lcr_admin.xml
++++ b/modules/lcr/doc/lcr_admin.xml
+@@ -103,7 +103,7 @@
+ 	</para>
+         <para>
+         Valid URI scheme values are NULL = sip, 1 = sip and 2
+-	= sips.  Currently valid transport protocol values are NULL =
++	= sips.  Currently valid transport protocol values are NULL and 0 =
+ 	none, 1 = udp, 2 = tcp, 3 = tls, and 4 = sctp.
+ 	</para>
+ 	<para>
+diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c
+index 370e973..3bdcc98 100644
+--- a/modules/lcr/lcr_mod.c
++++ b/modules/lcr/lcr_mod.c
+@@ -2309,8 +2309,7 @@ static int do_from_gw(struct sip_msg* _m, unsigned int lcr_id,
+ 
+     /* Store tag and flags and return result */
+     if ((res != NULL) &&
+-	((res->transport == transport) ||
+-	 ((res->transport == PROTO_NONE) && (transport == PROTO_UDP)))) {
++  	((transport == PROTO_NONE) || (res->transport == transport))) {
+ 	LM_DBG("request game from gw\n");
+ 	if (tag_avp_param) {
+ 	    val.s.s = res->tag;
+@@ -2499,8 +2498,7 @@ static int do_to_gw(struct sip_msg* _m, unsigned int lcr_id,
+ 
+     /* Return result */
+     if ((res != NULL) &&
+-	((res->transport == transport) ||
+-	 ((transport == PROTO_NONE) && (res->transport == PROTO_UDP)))) {
++  	((transport == PROTO_NONE) || (res->transport == transport))) {
+ 	LM_DBG("request goes to gw\n");
+ 	return 1;
+     } else {
+-- 
+1.7.9.5
+


