[Pkg-voip-commits] r9807 - in /kamailio/trunk/debian: changelog patches/series patches/upstream/0013-drouting-reset-the-content-of-routing-tree-if-root-p.patch patches/upstream/0014-dialog-k-proper-local-linking-of-profile-before-dlg-.patch

Wed Jun 20 07:03:22 UTC 2012

Author: maniac-guest
Date: Wed Jun 20 07:03:19 2012
New Revision: 9807

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9807
Log:
Upstream fixes

Added:
    kamailio/trunk/debian/patches/upstream/0013-drouting-reset-the-content-of-routing-tree-if-root-p.patch
    kamailio/trunk/debian/patches/upstream/0014-dialog-k-proper-local-linking-of-profile-before-dlg-.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=9807&op=diff
==============================================================================

--- kamailio/trunk/debian/changelog (original)
+++ kamailio/trunk/debian/changelog Wed Jun 20 07:03:19 2012
@@ -27,7 +27,7 @@
   * debian/backports
     + added squeeze script
 
- -- Victor Seva <linuxmaniac at torreviejawireless.org>  Wed, 06 Jun 2012 15:31:31 +0200
+ -- Victor Seva <linuxmaniac at torreviejawireless.org>  Wed, 20 Jun 2012 09:02:00 +0200
 
 kamailio (1.5.1-2) unstable; urgency=low
 

Modified: kamailio/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/series?rev=9807&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/series (original)
+++ kamailio/trunk/debian/patches/series Wed Jun 20 07:03:19 2012
@@ -10,6 +10,8 @@
 upstream/0010-modules_k-registrar-Fixed-memory-leak-in-reg_fetch_c.patch
 upstream/0011-modules_k-siptrace-fixed-function-pipport2su.-error-.patch
 upstream/0012-usrloc-k-safety-check-for-first-record-in-udomain-sl.patch
+upstream/0013-drouting-reset-the-content-of-routing-tree-if-root-p.patch
+upstream/0014-dialog-k-proper-local-linking-of-profile-before-dlg-.patch
 upstream/lua.patch
 multiarch_support.patch
 no_INSTALL_file.patch

Added: kamailio/trunk/debian/patches/upstream/0013-drouting-reset-the-content-of-routing-tree-if-root-p.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0013-drouting-reset-the-content-of-routing-tree-if-root-p.patch?rev=9807&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0013-drouting-reset-the-content-of-routing-tree-if-root-p.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0013-drouting-reset-the-content-of-routing-tree-if-root-p.patch Wed Jun 20 07:03:19 2012
@@ -1,0 +1,29 @@
+From 231017d40132dd2d2e21d715d12101ed67b51d45 Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Wed, 13 Jun 2012 11:51:57 +0200
+Subject: [PATCH] drouting: reset the content of routing tree if root pointer
+ is not freed
+
+- reported by Yufei Tao
+(cherry picked from commit c737ff95bb2e742981d81088169baa60d4605b85)
+---
+ modules_k/drouting/routing.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/modules_k/drouting/routing.c b/modules_k/drouting/routing.c
+index 1ff7629..f54709e 100644
+--- a/modules_k/drouting/routing.c
++++ b/modules_k/drouting/routing.c
+@@ -460,7 +460,8 @@ free_rt_data(
+ 			shm_free(rt_data->noprefix.rg);
+ 			rt_data->noprefix.rg = 0;
+ 		}
+-		/* del top level */
++		/* del top level or reset to 0 it's content */
+ 		if (all) shm_free(rt_data);
++		else memset(rt_data, 0, sizeof(rt_data_t));
+ 	}
+ }
+-- 
+1.7.9.5
+

Added: kamailio/trunk/debian/patches/upstream/0014-dialog-k-proper-local-linking-of-profile-before-dlg-.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0014-dialog-k-proper-local-linking-of-profile-before-dlg-.patch?rev=9807&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0014-dialog-k-proper-local-linking-of-profile-before-dlg-.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0014-dialog-k-proper-local-linking-of-profile-before-dlg-.patch Wed Jun 20 07:03:19 2012
@@ -1,0 +1,33 @@
+From 72899d84896a32d6a1598e3a4b2db61da4283327 Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Fri, 15 Jun 2012 17:17:07 +0200
+Subject: [PATCH] dialog(k): proper local linking of profile before dlg is
+ created
+
+- reported by Nick R.
+(cherry picked from commit 80c4f4b1d9ff31e79c999b82db35c3b9abc56e22)
+---
+ modules_k/dialog/dlg_profile.c |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/modules_k/dialog/dlg_profile.c b/modules_k/dialog/dlg_profile.c
+index 4765763..b1e3078 100644
+--- a/modules_k/dialog/dlg_profile.c
++++ b/modules_k/dialog/dlg_profile.c
+@@ -467,6 +467,13 @@ int set_dlg_profile(struct sip_msg *msg, str *value, struct dlg_profile_table *p
+ 		/* add linker directly to the dialog and profile */
+ 		link_dlg_profile( linker, dlg);
+ 	} else {
++		/* if existing linkers are not from current request, just discard them */
++		if (msg->id!=current_dlg_msg_id || msg->pid!=current_dlg_msg_pid) {
++			current_dlg_msg_id = msg->id;
++			current_dlg_msg_pid = msg->pid;
++			destroy_linkers(current_pending_linkers);
++			current_pending_linkers = NULL;
++		}
+ 		/* no dialog yet -> set linker as pending */
+ 		linker->next = current_pending_linkers;
+ 		current_pending_linkers = linker;
+-- 
+1.7.9.5
+


