[Pkg-voip-commits] r9922 - in /kamailio/trunk/debian/patches: series upstream/0014-modules-lcr-Fix-printing-of-IPv4-addresses-in-lcr.du.patch

[maniac-guest at alioth.debian.org]

Author: maniac-guest
Date: Thu Jul 26 14:23:11 2012
New Revision: 9922

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

Added:
    kamailio/trunk/debian/patches/upstream/0014-modules-lcr-Fix-printing-of-IPv4-addresses-in-lcr.du.patch
Modified:
    kamailio/trunk/debian/patches/series

Modified: kamailio/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/series?rev=9922&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/series (original)
+++ kamailio/trunk/debian/patches/series Thu Jul 26 14:23:11 2012
@@ -9,6 +9,7 @@
 upstream/0010-modules_k-registrar-Fixed-some-errors-in-module-docu.patch
 upstream/0012-Remove-duplicate-entry-of-default_domain-in-docs.patch
 upstream/0013-modules-matrix-Fixed-MI-command-not-exported.patch
+upstream/0014-modules-lcr-Fix-printing-of-IPv4-addresses-in-lcr.du.patch
 multiarch_support.patch
 no_INSTALL_file.patch
 hardening_flags.patch

Added: kamailio/trunk/debian/patches/upstream/0014-modules-lcr-Fix-printing-of-IPv4-addresses-in-lcr.du.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0014-modules-lcr-Fix-printing-of-IPv4-addresses-in-lcr.du.patch?rev=9922&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0014-modules-lcr-Fix-printing-of-IPv4-addresses-in-lcr.du.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0014-modules-lcr-Fix-printing-of-IPv4-addresses-in-lcr.du.patch Thu Jul 26 14:23:11 2012
@@ -1,0 +1,52 @@
+From 28be16549831df46dd1b8312da223b02359d8a9c Mon Sep 17 00:00:00 2001
+From: Richard Fuchs <rfuchs at sipwise.com>
+Date: Thu, 26 Jul 2012 09:41:26 -0400
+Subject: [PATCH] modules/lcr: Fix printing of IPv4 addresses in lcr.dump_gws
+
+IPv4 addresses were printed incorrectly. Also add special handling for
+null gw addresses and print them as 0.0.0.0 for backwards compatibility.
+---
+ modules/lcr/lcr_rpc.c |   19 +++++++++++++------
+ 1 file changed, 13 insertions(+), 6 deletions(-)
+
+diff --git a/modules/lcr/lcr_rpc.c b/modules/lcr/lcr_rpc.c
+index 5aec547..698b89f 100644
+--- a/modules/lcr/lcr_rpc.c
++++ b/modules/lcr/lcr_rpc.c
+@@ -87,13 +87,15 @@ static void dump_gws(rpc_t* rpc, void* c)
+ 	    } else {
+ 		rpc->struct_add(st, "s", "scheme", "sips");
+ 	    }
+-	    if (gws[i].ip_addr.af == AF_INET)
++	    switch (gws[i].ip_addr.af) {
++	    case AF_INET:
+ 		rpc->struct_printf(st, "ip_addr", "%d.%d.%d.%d",
+-					gws[i].ip_addr.u.addr32[0],
+-					gws[i].ip_addr.u.addr32[1],
+-					gws[i].ip_addr.u.addr32[2],
+-					gws[i].ip_addr.u.addr32[3]);
+-	    else /* AF_INET6 */
++					gws[i].ip_addr.u.addr[0],
++					gws[i].ip_addr.u.addr[1],
++					gws[i].ip_addr.u.addr[2],
++					gws[i].ip_addr.u.addr[3]);
++		break;
++	    case AF_INET6:
+ 		rpc->struct_printf(st, "ip_addr", "%x:%x:%x:%x:%x:%x:%x:%x",
+ 					gws[i].ip_addr.u.addr16[0],
+ 					gws[i].ip_addr.u.addr16[1],
+@@ -103,6 +105,11 @@ static void dump_gws(rpc_t* rpc, void* c)
+ 					gws[i].ip_addr.u.addr16[5],
+ 					gws[i].ip_addr.u.addr16[6],
+ 					gws[i].ip_addr.u.addr16[7]);
++		break;
++	    case 0:
++		rpc->struct_add(st, "s", "ip_addr", "0.0.0.0");
++		break;
++	    }
+ 	    hostname.s=gws[i].hostname;
+ 	    hostname.len=gws[i].hostname_len;
+ 	    rpc->struct_add(st, "S", "hostname", &hostname);
+-- 
+1.7.9.5
+