[Pkg-voip-commits] r9929 - /kamailio/branches/wheezy/debian/patches/upstream/
maniac-guest at alioth.debian.org
maniac-guest at alioth.debian.org
Sun Aug 5 14:24:19 UTC 2012
Author: maniac-guest
Date: Sun Aug 5 14:24:19 2012
New Revision: 9929
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9929
Log:
add upstream patches until 3.3.1 release. Not applied. WIP
Added:
kamailio/branches/wheezy/debian/patches/upstream/0003-modules-lcr-Fixed-to-from_gw-tests-when-proto-parame.patch
kamailio/branches/wheezy/debian/patches/upstream/0004-modules_k-uac-fix-handling-of-empty-display-part.patch
kamailio/branches/wheezy/debian/patches/upstream/0005-kamdbctl-add-domain_attrs-table-to-standard-tables.patch
kamailio/branches/wheezy/debian/patches/upstream/0006-Makefile-SCTP-library-check-doesn-t-look-in-usr-lib6.patch
kamailio/branches/wheezy/debian/patches/upstream/0007-modules_k-presence-Added-missing-use_table-call.patch
kamailio/branches/wheezy/debian/patches/upstream/0008-core-update-printing-of-socket-lists-to-show-the-adv.patch
kamailio/branches/wheezy/debian/patches/upstream/0009-modules-sl-Fixed-segmentation-fault-and-corrected-lo.patch
kamailio/branches/wheezy/debian/patches/upstream/0010-modules_k-registrar-Fixed-some-errors-in-module-docu.patch
kamailio/branches/wheezy/debian/patches/upstream/0012-Remove-duplicate-entry-of-default_domain-in-docs.patch
kamailio/branches/wheezy/debian/patches/upstream/0013-modules-matrix-Fixed-MI-command-not-exported.patch
kamailio/branches/wheezy/debian/patches/upstream/0014-modules-lcr-Fix-printing-of-IPv4-addresses-in-lcr.du.patch
kamailio/branches/wheezy/debian/patches/upstream/0015-modules-lcr-improved-documentation-of-lcr_count-modu.patch
kamailio/branches/wheezy/debian/patches/upstream/0016-dispatcher-k-allow-set-id-0-for-OPTIONS-callback.patch
kamailio/branches/wheezy/debian/patches/upstream/0017-p_usrloc-added-missing-usrloc-API-members.patch
kamailio/branches/wheezy/debian/patches/upstream/0018-kamailio.cfg-removed-sample-db_mode-parameter-for-do.patch
kamailio/branches/wheezy/debian/patches/upstream/0019-kamdbctl-mtree-tables-were-not-in-the-list-for-db-cr.patch
kamailio/branches/wheezy/debian/patches/upstream/0020-tls-set-function-to-return-the-id.patch
kamailio/branches/wheezy/debian/patches/upstream/0021-usrloc-k-on-ul-update-re-clone-uri-and-callid-if-ins.patch
kamailio/branches/wheezy/debian/patches/upstream/0022-register-k-pack-contact-info-based-on-header-for-sea.patch
Added: kamailio/branches/wheezy/debian/patches/upstream/0003-modules-lcr-Fixed-to-from_gw-tests-when-proto-parame.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/branches/wheezy/debian/patches/upstream/0003-modules-lcr-Fixed-to-from_gw-tests-when-proto-parame.patch?rev=9929&op=file
==============================================================================
--- kamailio/branches/wheezy/debian/patches/upstream/0003-modules-lcr-Fixed-to-from_gw-tests-when-proto-parame.patch (added)
+++ kamailio/branches/wheezy/debian/patches/upstream/0003-modules-lcr-Fixed-to-from_gw-tests-when-proto-parame.patch Sun Aug 5 14:24:19 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
+
Added: kamailio/branches/wheezy/debian/patches/upstream/0004-modules_k-uac-fix-handling-of-empty-display-part.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/branches/wheezy/debian/patches/upstream/0004-modules_k-uac-fix-handling-of-empty-display-part.patch?rev=9929&op=file
==============================================================================
--- kamailio/branches/wheezy/debian/patches/upstream/0004-modules_k-uac-fix-handling-of-empty-display-part.patch (added)
+++ kamailio/branches/wheezy/debian/patches/upstream/0004-modules_k-uac-fix-handling-of-empty-display-part.patch Sun Aug 5 14:24:19 2012
@@ -1,0 +1,37 @@
+From 66240e60d99b6bf9fc8f06c05cb7f4ecf6d8d1ad Mon Sep 17 00:00:00 2001
+From: Andreas Granig <agranig at sipwise.com>
+Date: Wed, 11 Jul 2012 12:52:38 +0200
+Subject: [PATCH] modules_k/uac: fix handling of empty display-part.
+
+This re-enables the feature to strip the display name by setting
+an empty string, like uac_replace_from("", "$var(from)");
+---
+ modules_k/uac/uac.c | 11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/modules_k/uac/uac.c b/modules_k/uac/uac.c
+index 8de09b1..763dd5a 100644
+--- a/modules_k/uac/uac.c
++++ b/modules_k/uac/uac.c
+@@ -435,14 +435,11 @@ static int fixup_replace_disp_uri(void** param, int param_no)
+ s.len += 2;
+ }
+ }
+- if(s.len!=0)
++ if(pv_parse_format(&s ,&model)<0)
+ {
+- if(pv_parse_format(&s ,&model)<0)
+- {
+- LM_ERR("wrong format [%s] for param no %d!\n", s.s, param_no);
+- pkg_free(s.s);
+- return E_UNSPEC;
+- }
++ LM_ERR("wrong format [%s] for param no %d!\n", s.s, param_no);
++ pkg_free(s.s);
++ return E_UNSPEC;
+ }
+ *param = (void*)model;
+
+--
+1.7.9.5
+
Added: kamailio/branches/wheezy/debian/patches/upstream/0005-kamdbctl-add-domain_attrs-table-to-standard-tables.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/branches/wheezy/debian/patches/upstream/0005-kamdbctl-add-domain_attrs-table-to-standard-tables.patch?rev=9929&op=file
==============================================================================
--- kamailio/branches/wheezy/debian/patches/upstream/0005-kamdbctl-add-domain_attrs-table-to-standard-tables.patch (added)
+++ kamailio/branches/wheezy/debian/patches/upstream/0005-kamdbctl-add-domain_attrs-table-to-standard-tables.patch Sun Aug 5 14:24:19 2012
@@ -1,0 +1,27 @@
+From 671b52a37e3811bf89c74d83e6438739a67f50a7 Mon Sep 17 00:00:00 2001
+From: Klaus Darilion <klaus.mailinglists at pernau.at>
+Date: Wed, 11 Jul 2012 12:30:51 +0000
+Subject: [PATCH] kamdbctl: add domain_attrs table to standard tables (cherry
+ picked from commit
+ 699526ddb3b02cb5766bc7ad6f1c7a1861006d4c)
+
+---
+ utils/kamctl/kamdbctl.base | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utils/kamctl/kamdbctl.base b/utils/kamctl/kamdbctl.base
+index 1de9e32..c8a78fa 100644
+--- a/utils/kamctl/kamdbctl.base
++++ b/utils/kamctl/kamdbctl.base
+@@ -32,7 +32,7 @@ INSTALL_PRESENCE_TABLES=${INSTALL_PRESENCE_TABLES:-ask}
+
+ # Used by dbtext and db_berkeley to define tables to be created, used by
+ # postgres to do the grants
+-STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases domain grp
++STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases domain domain_attrs grp
+ uri speed_dial lcr_gw lcr_rule lcr_rule_target pdt subscriber
+ location re_grp trusted address missed_calls usr_preferences
+ aliases silo dialog dialog_vars dispatcher dialplan}
+--
+1.7.9.5
+
Added: kamailio/branches/wheezy/debian/patches/upstream/0006-Makefile-SCTP-library-check-doesn-t-look-in-usr-lib6.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/branches/wheezy/debian/patches/upstream/0006-Makefile-SCTP-library-check-doesn-t-look-in-usr-lib6.patch?rev=9929&op=file
==============================================================================
--- kamailio/branches/wheezy/debian/patches/upstream/0006-Makefile-SCTP-library-check-doesn-t-look-in-usr-lib6.patch (added)
+++ kamailio/branches/wheezy/debian/patches/upstream/0006-Makefile-SCTP-library-check-doesn-t-look-in-usr-lib6.patch Sun Aug 5 14:24:19 2012
@@ -1,0 +1,27 @@
+From 4570fc02082f69dd036ab7a3deea57ee8cffa411 Mon Sep 17 00:00:00 2001
+From: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
+Date: Thu, 12 Jul 2012 16:26:38 +0100
+Subject: [PATCH] Makefile: SCTP library check doesn't look in /usr/lib64
+
+- This means you can't build Kamailio for a 64-bit OS like CentOS or
+ Fedora.
+(cherry picked from commit f2f8ff72137a39702d284dfe6deb9ef4442e4e78)
+---
+ Makefile.defs | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.defs b/Makefile.defs
+index 0e27865..9d7a49f 100644
+--- a/Makefile.defs
++++ b/Makefile.defs
+@@ -1742,6 +1742,7 @@ ifeq ($(OS), linux)
+ sctp_dev_locations := /usr/include/netinet/sctp.h \
+ $(LOCALBASE)/include/netinet/sctp.h
+ sctp_lib_locations := /usr/lib/libsctp.so \
++ /usr/lib64/libsctp.so \
+ $(LOCALBASE)/usr/local/lib/libsctp.so
+ sctp_dev_path := $(wildcard $(sctp_dev_locations))
+ sctp_lib_path := $(wildcard $(sctp_lib_locations))
+--
+1.7.9.5
+
Added: kamailio/branches/wheezy/debian/patches/upstream/0007-modules_k-presence-Added-missing-use_table-call.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/branches/wheezy/debian/patches/upstream/0007-modules_k-presence-Added-missing-use_table-call.patch?rev=9929&op=file
==============================================================================
--- kamailio/branches/wheezy/debian/patches/upstream/0007-modules_k-presence-Added-missing-use_table-call.patch (added)
+++ kamailio/branches/wheezy/debian/patches/upstream/0007-modules_k-presence-Added-missing-use_table-call.patch Sun Aug 5 14:24:19 2012
@@ -1,0 +1,33 @@
+From ac24a183397924a7dab209c6f205b955936d4379 Mon Sep 17 00:00:00 2001
+From: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
+Date: Thu, 12 Jul 2012 21:20:49 +0100
+Subject: [PATCH] modules_k/presence: Added missing use_table() call (cherry
+ picked from commit
+ 0de5e17770cd5dcfcdd64174eb24f0bcaccef021)
+
+---
+ modules_k/presence/notify.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/modules_k/presence/notify.c b/modules_k/presence/notify.c
+index 73675e1..d6bea37 100644
+--- a/modules_k/presence/notify.c
++++ b/modules_k/presence/notify.c
+@@ -2777,6 +2777,14 @@ int process_dialogs(int round, int presence_winfo)
+ result_cols[updated_winfo_col = n_result_cols++] = &str_updated_winfo_col;
+ result_cols[expires_col = n_result_cols++] = &str_expires_col;
+
++ /* Need to redo this here as we might have switched to the
++ presentity table during a previous iteration. */
++ if (pa_dbf.use_table(pa_db, &active_watchers_table) < 0)
++ {
++ LM_ERR("use table failed\n");
++ goto error;
++ }
++
+ if (pa_dbf.start_transaction)
+ {
+ if (pa_dbf.start_transaction(pa_db) < 0)
+--
+1.7.9.5
+
Added: kamailio/branches/wheezy/debian/patches/upstream/0008-core-update-printing-of-socket-lists-to-show-the-adv.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/branches/wheezy/debian/patches/upstream/0008-core-update-printing-of-socket-lists-to-show-the-adv.patch?rev=9929&op=file
==============================================================================
--- kamailio/branches/wheezy/debian/patches/upstream/0008-core-update-printing-of-socket-lists-to-show-the-adv.patch (added)
+++ kamailio/branches/wheezy/debian/patches/upstream/0008-core-update-printing-of-socket-lists-to-show-the-adv.patch Sun Aug 5 14:24:19 2012
@@ -1,0 +1,35 @@
+From 7e412d720b1747fadac3e94c22d270877087b8a0 Mon Sep 17 00:00:00 2001
+From: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
+Date: Thu, 12 Jul 2012 21:44:45 +0100
+Subject: [PATCH] core: update printing of socket lists to show the advertised
+ address if set for the socket
+
+- useful for diagnosing what is going on with advertised address
+- Enhancement added by Hugh Waite @ Crocodile RCS
+(cherry picked from commit 274969bcca2301c96dbbcc17c5b1d411073c8277)
+---
+ socket_info.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/socket_info.c b/socket_info.c
+index 1ccddfd..7c32a10 100644
+--- a/socket_info.c
++++ b/socket_info.c
+@@ -1998,10 +1998,13 @@ void print_all_socket_lists()
+ si->name.s);
+ if (!si->flags & SI_IS_IP)
+ printf(" [%s]", si->address_str.s);
+- printf( ":%s%s%s\n",
++ printf( ":%s%s%s",
+ si->port_no_str.s,
+ si->flags & SI_IS_MCAST ? " mcast" : "",
+ si->flags & SI_IS_MHOMED? " mhomed" : "");
++ if (si->useinfo.name.s)
++ printf(" advertise %s", si->useinfo.name.s);
++ printf("\n");
+ }
+ }
+ }while((proto=next_proto(proto)));
+--
+1.7.9.5
+
Added: kamailio/branches/wheezy/debian/patches/upstream/0009-modules-sl-Fixed-segmentation-fault-and-corrected-lo.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/branches/wheezy/debian/patches/upstream/0009-modules-sl-Fixed-segmentation-fault-and-corrected-lo.patch?rev=9929&op=file
==============================================================================
--- kamailio/branches/wheezy/debian/patches/upstream/0009-modules-sl-Fixed-segmentation-fault-and-corrected-lo.patch (added)
+++ kamailio/branches/wheezy/debian/patches/upstream/0009-modules-sl-Fixed-segmentation-fault-and-corrected-lo.patch Sun Aug 5 14:24:19 2012
@@ -1,0 +1,51 @@
+From a897251aaa545c8726587412009f4906ff21e2aa Mon Sep 17 00:00:00 2001
+From: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
+Date: Thu, 12 Jul 2012 21:48:08 +0100
+Subject: [PATCH] modules/sl: Fixed segmentation fault and corrected log
+ messages
+
+- Fixes by Hugh Waite @ Crocodile RCS
+(cherry picked from commit e78ff34f1ecfe9a60a52996126032ea04fb490ab)
+---
+ modules/sl/sl.c | 4 ++--
+ modules/sl/sl_funcs.c | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/modules/sl/sl.c b/modules/sl/sl.c
+index 2ca7592..eedb953 100644
+--- a/modules/sl/sl.c
++++ b/modules/sl/sl.c
+@@ -209,7 +209,7 @@ static int w_sl_send_reply(struct sip_msg* msg, char* p1, char* p2)
+ }
+
+ if (get_str_fparam(&reason, msg, (fparam_t*)p2) < 0) {
+- reason = default_reason;;
++ reason = default_reason;
+ }
+
+ if(reason.s[reason.len-1]=='\0') {
+@@ -219,7 +219,7 @@ static int w_sl_send_reply(struct sip_msg* msg, char* p1, char* p2)
+ if (r == NULL) r = default_reason.s;
+ }
+ ret = sl_send_reply(msg, code, r);
+- if (r!=reason.s) pkg_free(r);
++ if ((r!=reason.s) && (r!=default_reason.s)) pkg_free(r);
+ return ret;
+ }
+
+diff --git a/modules/sl/sl_funcs.c b/modules/sl/sl_funcs.c
+index 18d4217..388f79c 100644
+--- a/modules/sl/sl_funcs.c
++++ b/modules/sl/sl_funcs.c
+@@ -183,7 +183,7 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag)
+ }
+ if (!buf.s)
+ {
+- DBG("DEBUG: sl_send_reply: response building failed\n");
++ DBG("DEBUG: sl_reply_helper: response building failed\n");
+ goto error;
+ }
+
+--
+1.7.9.5
+
Added: kamailio/branches/wheezy/debian/patches/upstream/0010-modules_k-registrar-Fixed-some-errors-in-module-docu.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/branches/wheezy/debian/patches/upstream/0010-modules_k-registrar-Fixed-some-errors-in-module-docu.patch?rev=9929&op=file
==============================================================================
--- kamailio/branches/wheezy/debian/patches/upstream/0010-modules_k-registrar-Fixed-some-errors-in-module-docu.patch (added)
+++ kamailio/branches/wheezy/debian/patches/upstream/0010-modules_k-registrar-Fixed-some-errors-in-module-docu.patch Sun Aug 5 14:24:19 2012
@@ -1,0 +1,315 @@
+From 6f47d8ac983cbbd616c7b5b941a8ec671f6e15e6 Mon Sep 17 00:00:00 2001
+From: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
+Date: Thu, 12 Jul 2012 21:46:58 +0100
+Subject: [PATCH] modules_k/registrar: Fixed some errors in module
+ documentation
+
+- Fix by Hugh Waite @ Crocodile RCS
+(cherry picked from commit 6d040935f31be0098a09f4621874268164f3926a)
+---
+ modules_k/registrar/README | 90 +++++++++++++--------------
+ modules_k/registrar/doc/registrar_admin.xml | 6 +-
+ 2 files changed, 48 insertions(+), 48 deletions(-)
+
+diff --git a/modules_k/registrar/README b/modules_k/registrar/README
+index 99b3142..d29e565 100644
+--- a/modules_k/registrar/README
++++ b/modules_k/registrar/README
+@@ -16,7 +16,7 @@ Edited by
+
+ Bogdan-Andre Iancu
+
+- Copyright © 2003 FhG FOKUS
++ Copyright © 2003 FhG FOKUS
+ __________________________________________________________________
+
+ Table of Contents
+@@ -111,9 +111,9 @@ Bogdan-Andre Iancu
+ 1.24. lookup usage
+ 1.25. registered usage
+ 1.26. add_sock_hdr usage
+- 1.27. registered usage
+- 1.28. registered usage
+- 1.29. registered usage
++ 1.27. unregister usage
++ 1.28. reg_fetch_contacts usage
++ 1.29. reg_free_contacts usage
+ 1.30. $ulc(name) usage
+
+ Chapter 1. Admin Guide
+@@ -197,8 +197,8 @@ Chapter 1. Admin Guide
+ * off - stores the value of the Path headers into usrloc without
+ passing it back to the UAC in the reply.
+ * lazy - stores the Path header and passes it back to the UAC if
+- Path-support is indicated by the "path" param in the Supported HF.
+- * strict - rejects the registration with "420 Bad Extension" if
++ Path-support is indicated by the “path†param in the Supported HF.
++ * strict - rejects the registration with “420 Bad Extension†if
+ there's a Path header but no support for it is indicated by the
+ UAC. Otherwise it's stored and passed back to the UAC.
+
+@@ -210,8 +210,8 @@ Chapter 1. Admin Guide
+ client's NAT).
+
+ The whole process is transparent to the user, so no config changes are
+- required beside setting the registrar-parameters "use_path" and
+- "path_mode".
++ required beside setting the registrar-parameters “use_path†and
++ “path_modeâ€.
+
+ 1.2. GRUU Support
+
+@@ -273,7 +273,7 @@ Chapter 1. Admin Guide
+ contact parameters, this value will be used for newly created usrloc
+ records. The parameter contains number of second to expire (for example
+ use 3600 for one hour). If it is set to a lower value than the
+- "min_expires" parameter then it will be ignored. This parameter can be
++ “min_expires†parameter then it will be ignored. This parameter can be
+ modified via ser config framework. A random value in a specific
+ interval can be selected by using the default_expires_range parameter
+
+@@ -287,9 +287,9 @@ modparam("registrar", "default_expires", 1800)
+ 3.2. default_expires_range (integer)
+
+ This parameter specifies that the expiry used for newly created usrloc
+- records are not fixed(when "default_expires" applies), but a random
+- value in the interval "[default_expires-default_expires_range%,
+- default_expires+default_expires_range%]". The value is between 0 and
++ records are not fixed(when “default_expires†applies), but a random
++ value in the interval “[default_expires-default_expires_range%,
++ default_expires+default_expires_range%]â€. The value is between 0 and
+ 100 and represent the maximim percentage from default_expires that will
+ be substracted or added when computing the value. Default in 0, meaning
+ default_expires is left unmodified. This parameter can be modified via
+@@ -507,7 +507,7 @@ modparam("registrar", "method_filtering", 1)
+ 3.17. use_path (integer)
+
+ If set to 1, the Path header is handled according to the parameter This
+- parameter can be modified via ser config framework. "path_mode".
++ parameter can be modified via ser config framework. “path_modeâ€.
+
+ Default value is 0 (disabled).
+
+@@ -524,12 +524,12 @@ modparam("registrar", "use_path", 1)
+ the reply.
+ * 1 - The Path header is saved into usrloc, but is only included in
+ the reply if path support is indicated in the registration request
+- by the "path" option of the "Supported" header.
++ by the “path†option of the “Supported†header.
+ * 2 - The path header is only saved into usrloc, if path support is
+- indicated in the registration request by the "path" option of the
+- "Supported" header. If no path support is indicated, the request is
+- rejected with "420 - Bad Extension" and the header "Unsupported:
+- path" is included in the reply along with the received "Path"
++ indicated in the registration request by the “path†option of the
++ “Supported†header. If no path support is indicated, the request is
++ rejected with “420 - Bad Extension†and the header “Unsupported:
++ path†is included in the reply along with the received “Pathâ€
+ header. This mode is the one recommended by RFC-3327.
+
+ Default value is 2.
+@@ -541,10 +541,10 @@ modparam("registrar", "path_mode", 0)
+
+ 3.19. path_use_received (integer)
+
+- If set to 1, the "received" parameter of the first Path URI of a
++ If set to 1, the “received†parameter of the first Path URI of a
+ registration is set as received-uri and the NAT branch flag is set for
+ this contact. This is useful if the registrar is placed behind a SIP
+- loadbalancer, which passes the nat'ed UAC address as "received"
++ loadbalancer, which passes the nat'ed UAC address as “receivedâ€
+ parameter in it's Path uri.
+
+ Default value is 0 (disabled).
+@@ -605,7 +605,7 @@ modparam("registrar", "xavp_cfg", "ulrcd")
+
+ 3.23. gruu_enabled (integer)
+
+- If set to 1 and GRUU "+sip.instance" parameter to Contact header of
++ If set to 1 and GRUU “+sip.instance†parameter to Contact header of
+ REGISTER is present, then the value of the parameter is saved to
+ location and pub-gruu and temp-gruu addresses are generated.
+
+@@ -628,7 +628,7 @@ modparam("registrar", "gruu_enabled", 0)
+ 4.6. reg_fetch_contacts(domain, uri, profile)
+ 4.7. reg_free_contacts(profile)
+
+-4.1. save(domain, [, flags [, uri]])
++4.1. save(domain, [, flags [, uri]])
+
+ The function processes a REGISTER message. It can add, remove or modify
+ usrloc records depending on Contact and Expires HFs in the REGISTER
+@@ -672,7 +672,7 @@ save("location", "0x01");
+ save("location", "0x00", "sip:test at kamailio.org");
+ ...
+
+-4.2. lookup(domain [, uri])
++4.2. lookup(domain [, uri])
+
+ The functions extracts username from Request-URI and tries to find all
+ contacts for the username in usrloc. If there are no such contacts, -1
+@@ -712,7 +712,7 @@ switch ($retcode) {
+ };
+ ...
+
+-4.3. registered(domain [, uri])
++4.3. registered(domain [, uri])
+
+ The function returns true if the AOR in the Request-URI is registered,
+ false otherwise. The function does not modify the message being
+@@ -734,9 +734,9 @@ if (registered("location")) {
+ };
+ ...
+
+-4.4. add_sock_hdr(hdr_name)
++4.4. add_sock_hdr(hdr_name)
+
+- Adds to the current REGISTER request a new header with "hdr_name" which
++ Adds to the current REGISTER request a new header with “hdr_name†which
+ contains the description of the received socket (proto:ip:port)
+
+ This make sens only in multiple replicated servers scenarios.
+@@ -751,7 +751,7 @@ if (registered("location")) {
+ add_sock_hdr("Sock-Info");
+ ...
+
+-4.5. unregister(domain, uri)
++4.5. unregister(domain, uri)
+
+ The function remove all the contact associated to 'uri'.
+
+@@ -764,13 +764,13 @@ add_sock_hdr("Sock-Info");
+
+ This function can be used from REQUEST_ROUTE, FAILURE_ROUTE.
+
+- Example 1.27. registered usage
++ Example 1.27. unregister usage
+ ...
+ unregister("location", "$ru");
+ unregister("location", "sip:user at kamailio.org");
+ ...
+
+-4.6. reg_fetch_contacts(domain, uri, profile)
++4.6. reg_fetch_contacts(domain, uri, profile)
+
+ The function fetches the contacts for 'uri' from table 'domain' to
+ pseudo-variable $ulc(profile).
+@@ -786,13 +786,13 @@ unregister("location", "sip:user at kamailio.org");
+
+ This function can be used from REQUEST_ROUTE, FAILURE_ROUTE.
+
+- Example 1.28. registered usage
++ Example 1.28. reg_fetch_contacts usage
+ ...
+ reg_fetch_contacts("location", "$ru", "callee");
+ reg_fetch_contacts("location", "sip:user at kamailio.org", "caller");
+ ...
+
+-4.7. reg_free_contacts(profile)
++4.7. reg_free_contacts(profile)
+
+ The function frees the contacts from pseudo-variable $ulc(profile).
+ Should be called to release the content of a profile. Anyhow, fetching
+@@ -805,7 +805,7 @@ reg_fetch_contacts("location", "sip:user at kamailio.org", "caller");
+
+ This function can be used from REQUEST_ROUTE, FAILURE_ROUTE.
+
+- Example 1.29. registered usage
++ Example 1.29. reg_free_contacts usage
+ ...
+ reg_free_contacts("callee");
+ ...
+@@ -845,12 +845,12 @@ reg_free_contacts("callee");
+ 6.1. $ulc(profile=>attr)
+
+ Access the attributes of contact addresses stored in 'profile'. It must
+- be used after a call of "reg_fetch_contacts()".
++ be used after a call of “reg_fetch_contacts()â€.
+
+- The "profile" has to be one of the values used with
+- "reg_fetch_contacts()".
++ The “profile†has to be one of the values used with
++ “reg_fetch_contacts()â€.
+
+- The "attr" can be:
++ The “attr†can be:
+ * aor - address of record
+ * domain - use location domain name
+ * aorhash - hash id for the record
+@@ -903,9 +903,9 @@ if(reg_fetch_contacts("location", "$fu", "caller"))
+
+ Chapter 2. Frequently Asked Questions
+
+- 2.1. What happend with the old "nat_flag" module parameter?
+- 2.2. What happend with the old "use_domain" module parameter?
+- 2.3. What happend with the old "save_noreply" and "save_memory"
++ 2.1. What happend with the old “nat_flag†module parameter?
++ 2.2. What happend with the old “use_domain†module parameter?
++ 2.3. What happend with the old “save_noreply†and “save_memoryâ€
+ functions?
+
+ 2.4. Where can I find more about Kamailio?
+@@ -915,23 +915,23 @@ Chapter 2. Frequently Asked Questions
+
+ 2.1.
+
+- What happend with the old "nat_flag" module parameter?
++ What happend with the old “nat_flag†module parameter?
+
+ In was removed, as the module internally loads this value from the
+- "USRLOC" module (see the "nat_bflag" USRLOC parameter).
++ “USRLOC†module (see the “nat_bflag†USRLOC parameter).
+
+ 2.2.
+
+- What happend with the old "use_domain" module parameter?
++ What happend with the old “use_domain†module parameter?
+
+ In was removed, as the module internally loads this option from the
+- "USRLOC" module. This was done in order to simplify the configuration.
++ “USRLOC†module. This was done in order to simplify the configuration.
+
+ 2.3.
+
+- What happend with the old "save_noreply" and "save_memory" functions?
++ What happend with the old “save_noreply†and “save_memory†functions?
+
+- There functions were merged into the new "save(domain,flags)"
++ There functions were merged into the new “save(domain,flags)â€
+ functions. If a reply should be sent or if the DB should be updated
+ also is controlled via the flags.
+
+diff --git a/modules_k/registrar/doc/registrar_admin.xml b/modules_k/registrar/doc/registrar_admin.xml
+index ed0a41e..b31c4eb 100644
+--- a/modules_k/registrar/doc/registrar_admin.xml
++++ b/modules_k/registrar/doc/registrar_admin.xml
+@@ -985,7 +985,7 @@ add_sock_hdr("Sock-Info");
+ This function can be used from REQUEST_ROUTE, FAILURE_ROUTE.
+ </para>
+ <example>
+- <title><function>registered</function> usage</title>
++ <title><function>unregister</function> usage</title>
+ <programlisting format="linespecific">
+ ...
+ unregister("location", "$ru");
+@@ -1028,7 +1028,7 @@ unregister("location", "sip:user at kamailio.org");
+ This function can be used from REQUEST_ROUTE, FAILURE_ROUTE.
+ </para>
+ <example>
+- <title><function>registered</function> usage</title>
++ <title><function>reg_fetch_contacts</function> usage</title>
+ <programlisting format="linespecific">
+ ...
+ reg_fetch_contacts("location", "$ru", "callee");
+@@ -1060,7 +1060,7 @@ reg_fetch_contacts("location", "sip:user at kamailio.org", "caller");
+ This function can be used from REQUEST_ROUTE, FAILURE_ROUTE.
+ </para>
+ <example>
+- <title><function>registered</function> usage</title>
++ <title><function>reg_free_contacts</function> usage</title>
+ <programlisting format="linespecific">
+ ...
+ reg_free_contacts("callee");
+--
+1.7.9.5
+
Added: kamailio/branches/wheezy/debian/patches/upstream/0012-Remove-duplicate-entry-of-default_domain-in-docs.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/branches/wheezy/debian/patches/upstream/0012-Remove-duplicate-entry-of-default_domain-in-docs.patch?rev=9929&op=file
==============================================================================
--- kamailio/branches/wheezy/debian/patches/upstream/0012-Remove-duplicate-entry-of-default_domain-in-docs.patch (added)
+++ kamailio/branches/wheezy/debian/patches/upstream/0012-Remove-duplicate-entry-of-default_domain-in-docs.patch Sun Aug 5 14:24:19 2012
@@ -1,0 +1,58 @@
+From 32e67eb8ebe8e1ef1190b03151962412ad41dbd3 Mon Sep 17 00:00:00 2001
+From: Carsten Bock <carsten at ng-voice.com>
+Date: Tue, 17 Jul 2012 10:15:46 -0400
+Subject: [PATCH] Remove duplicate entry of "default_domain" in docs. Remove
+ double occurance of the CSeq Attribute in the XML. (closes
+ FS#246 - pua_reginfo adds duplicate cseq field in XML body
+ on the Bugtracker)
+
+Thanks to Andrew Pogrebennyk (apogrebennyk at sipwise.com) for pointing this out.
+---
+ modules_k/pua_reginfo/doc/pua_reginfo_admin.xml | 14 --------------
+ modules_k/pua_reginfo/usrloc_cb.c | 5 -----
+ 2 files changed, 19 deletions(-)
+
+diff --git a/modules_k/pua_reginfo/doc/pua_reginfo_admin.xml b/modules_k/pua_reginfo/doc/pua_reginfo_admin.xml
+index 797fc49..b651f44 100644
+--- a/modules_k/pua_reginfo/doc/pua_reginfo_admin.xml
++++ b/modules_k/pua_reginfo/doc/pua_reginfo_admin.xml
+@@ -105,20 +105,6 @@ modparam("pua_bla", "default_domain", "kamailio.org")
+ </example>
+ </section>
+ <section>
+- <title><varname>default_domain</varname>(str)</title>
+- <para>
+- The domain to be used to publish information about a user.
+- </para>
+- <example>
+- <title>Set <varname>default_domain</varname> parameter</title>
+- <programlisting format="linespecific">
+-...
+-modparam("pua_reginfo", "default_domain", "kamailio.org")
+-...
+-</programlisting>
+- </example>
+- </section>
+- <section>
+ <title><varname>publish_reginfo</varname>(int)</title>
+ <para>
+ Whether or not to generate PUBLISH requests.
+diff --git a/modules_k/pua_reginfo/usrloc_cb.c b/modules_k/pua_reginfo/usrloc_cb.c
+index 1833034..6b1a590 100644
+--- a/modules_k/pua_reginfo/usrloc_cb.c
++++ b/modules_k/pua_reginfo/usrloc_cb.c
+@@ -162,11 +162,6 @@ str* build_reginfo_full(urecord_t * record, str uri, ucontact_t* c, int type) {
+ memset(buf, 0, sizeof(buf));
+ buf_len = snprintf(buf, sizeof(buf), "%.*s", ptr->user_agent.len, ptr->user_agent.s);
+ xmlNewProp(contact_node, BAD_CAST "user_agent", BAD_CAST buf);
+-
+- /* CSeq Attribute */
+- memset(buf, 0, sizeof(buf));
+- buf_len = snprintf(buf, sizeof(buf), "%d", ptr->cseq);
+- xmlNewProp(contact_node, BAD_CAST "cseq", BAD_CAST buf);
+
+ /* URI-Node */
+ memset(buf, 0, sizeof(buf));
+--
+1.7.9.5
+
Added: kamailio/branches/wheezy/debian/patches/upstream/0013-modules-matrix-Fixed-MI-command-not-exported.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/branches/wheezy/debian/patches/upstream/0013-modules-matrix-Fixed-MI-command-not-exported.patch?rev=9929&op=file
==============================================================================
--- kamailio/branches/wheezy/debian/patches/upstream/0013-modules-matrix-Fixed-MI-command-not-exported.patch (added)
+++ kamailio/branches/wheezy/debian/patches/upstream/0013-modules-matrix-Fixed-MI-command-not-exported.patch Sun Aug 5 14:24:19 2012
@@ -1,0 +1,31 @@
+From 3a8288482aa38afd8048193ef45b8ad979cacfab Mon Sep 17 00:00:00 2001
+From: Anca Vamanu <anca.vamanu at 1and1.ro>
+Date: Fri, 20 Jul 2012 16:59:52 +0300
+Subject: [PATCH] modules/matrix Fixed MI command not exported
+
+Added missing register_mi_mod() call in mod_init.
+(cherry picked from commit b26f862322ad311e3c42d899f72eaa1fb665b755)
+---
+ modules/matrix/matrix.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/modules/matrix/matrix.c b/modules/matrix/matrix.c
+index 67d117e..d9fb9cf 100644
+--- a/modules/matrix/matrix.c
++++ b/modules/matrix/matrix.c
+@@ -584,6 +584,12 @@ static int mod_init(void)
+ {
+ matrix_db_vars();
+
++ if(register_mi_mod(exports.name, mi_cmds)!=0)
++ {
++ LM_ERR("failed to register MI commands\n");
++ return -1;
++ }
++
+ if (init_shmlock() != 0) return -1;
+ if (matrix_db_init() != 0) return -1;
+ if (matrix_db_open() != 0) return -1;
+--
+1.7.9.5
+
Added: kamailio/branches/wheezy/debian/patches/upstream/0014-modules-lcr-Fix-printing-of-IPv4-addresses-in-lcr.du.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/branches/wheezy/debian/patches/upstream/0014-modules-lcr-Fix-printing-of-IPv4-addresses-in-lcr.du.patch?rev=9929&op=file
==============================================================================
--- kamailio/branches/wheezy/debian/patches/upstream/0014-modules-lcr-Fix-printing-of-IPv4-addresses-in-lcr.du.patch (added)
+++ kamailio/branches/wheezy/debian/patches/upstream/0014-modules-lcr-Fix-printing-of-IPv4-addresses-in-lcr.du.patch Sun Aug 5 14:24:19 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
+
Added: kamailio/branches/wheezy/debian/patches/upstream/0015-modules-lcr-improved-documentation-of-lcr_count-modu.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/branches/wheezy/debian/patches/upstream/0015-modules-lcr-improved-documentation-of-lcr_count-modu.patch?rev=9929&op=file
==============================================================================
--- kamailio/branches/wheezy/debian/patches/upstream/0015-modules-lcr-improved-documentation-of-lcr_count-modu.patch (added)
+++ kamailio/branches/wheezy/debian/patches/upstream/0015-modules-lcr-improved-documentation-of-lcr_count-modu.patch Sun Aug 5 14:24:19 2012
@@ -1,0 +1,41 @@
+From 85bda41ac007464efe940713426b54c38e5d4303 Mon Sep 17 00:00:00 2001
+From: Juha Heinanen <jh at tutpro.com>
+Date: Fri, 27 Jul 2012 13:08:21 +0300
+Subject: [PATCH] modules/lcr: improved documentation of lcr_count module
+ param (cherry picked from commit
+ 9a1450d99accef8e473cf2324412fdfc09a7cd11)
+
+---
+ modules/lcr/README | 2 +-
+ modules/lcr/doc/lcr_admin.xml | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules/lcr/README b/modules/lcr/README
+index 178f265..081411f 100644
+--- a/modules/lcr/README
++++ b/modules/lcr/README
+@@ -638,7 +638,7 @@ modparam("lcr","weight_column", "target_weight")
+
+ 3.27. lcr_count (integer)
+
+- Number of LCR instances.
++ Maximun value of lcr_id.
+
+ Default value is 1.
+
+diff --git a/modules/lcr/doc/lcr_admin.xml b/modules/lcr/doc/lcr_admin.xml
+index d498904..00627a3 100644
+--- a/modules/lcr/doc/lcr_admin.xml
++++ b/modules/lcr/doc/lcr_admin.xml
+@@ -716,7 +716,7 @@ modparam("lcr","weight_column", "target_weight")
+ <section>
+ <title><varname>lcr_count</varname> (integer)</title>
+ <para>
+- Number of LCR instances.
++ Maximun value of lcr_id.
+ </para>
+ <para>
+ <emphasis>
+--
+1.7.9.5
+
Added: kamailio/branches/wheezy/debian/patches/upstream/0016-dispatcher-k-allow-set-id-0-for-OPTIONS-callback.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/branches/wheezy/debian/patches/upstream/0016-dispatcher-k-allow-set-id-0-for-OPTIONS-callback.patch?rev=9929&op=file
==============================================================================
--- kamailio/branches/wheezy/debian/patches/upstream/0016-dispatcher-k-allow-set-id-0-for-OPTIONS-callback.patch (added)
+++ kamailio/branches/wheezy/debian/patches/upstream/0016-dispatcher-k-allow-set-id-0-for-OPTIONS-callback.patch Sun Aug 5 14:24:19 2012
@@ -1,0 +1,32 @@
+From 81149e30785aa1cc6f04e130afafb643d9163cce Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Mon, 25 Jun 2012 10:36:31 +0200
+Subject: [PATCH] dispatcher(k): allow set id 0 for OPTIONS callback
+
+- set id is provided in param pointer address, 0 being equivalent to
+ NULL
+- reported by Avi Brender
+(cherry picked from commit 2664cb9aa8ffd5d26ef6a0841318ccbcdefbf69b)
+---
+ modules_k/dispatcher/dispatch.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c
+index a60401c..7429e97 100644
+--- a/modules_k/dispatcher/dispatch.c
++++ b/modules_k/dispatcher/dispatch.c
+@@ -2326,9 +2326,9 @@ static void ds_options_callback( struct cell *t, int type,
+ sip_msg_t *fmsg;
+ int state;
+
+- /* The Param does contain the group, in which the failed host
++ /* The param contains the group, in which the failed host
+ * can be found.*/
+- if (!*ps->param)
++ if (ps->param==NULL)
+ {
+ LM_DBG("No parameter provided, OPTIONS-Request was finished"
+ " with code %d\n", ps->code);
+--
+1.7.9.5
+
Added: kamailio/branches/wheezy/debian/patches/upstream/0017-p_usrloc-added-missing-usrloc-API-members.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/branches/wheezy/debian/patches/upstream/0017-p_usrloc-added-missing-usrloc-API-members.patch?rev=9929&op=file
==============================================================================
--- kamailio/branches/wheezy/debian/patches/upstream/0017-p_usrloc-added-missing-usrloc-API-members.patch (added)
+++ kamailio/branches/wheezy/debian/patches/upstream/0017-p_usrloc-added-missing-usrloc-API-members.patch Sun Aug 5 14:24:19 2012
@@ -1,0 +1,43 @@
+From fe8265334cef872d8f3fabe407d3f3d744a45960 Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Thu, 28 Jun 2012 16:24:47 +0200
+Subject: [PATCH] p_usrloc: added missing usrloc API members
+
+- they are set to NULL to get a clean crash, they have to be implemented
+- the missing API members are the functions introduced in 3.3 for
+ handling SIP GRUU and Outbound extensions
+- a proper fix to follow
+- reported by Dan Bogos
+(cherry picked from commit f030b2f274b69526f256e66098de72a074000ed1)
+---
+ modules_k/p_usrloc/usrloc.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/modules_k/p_usrloc/usrloc.c b/modules_k/p_usrloc/usrloc.c
+index 3a1b4fc..b268052 100644
+--- a/modules_k/p_usrloc/usrloc.c
++++ b/modules_k/p_usrloc/usrloc.c
+@@ -65,6 +65,8 @@ int bind_usrloc(usrloc_api_t* api)
+ return -1;
+ }
+
++ memset(api, 0, sizeof(usrloc_api_t));
++
+ api->register_udomain = register_udomain;
+ api->get_all_ucontacts = get_all_ucontacts;
+ api->insert_urecord = insert_urecord;
+@@ -79,6 +81,11 @@ int bind_usrloc(usrloc_api_t* api)
+ api->update_ucontact = update_ucontact;
+ api->register_ulcb = register_ulcb;
+
++ api->get_udomain = 0;
++ api->get_urecord_by_ruid = 0;
++ api->get_ucontact_by_instance = 0;
++ api->get_aorhash = 0;
++
+ api->use_domain = use_domain;
+ api->db_mode = db_mode;
+ api->nat_flag = nat_bflag;
+--
+1.7.9.5
+
Added: kamailio/branches/wheezy/debian/patches/upstream/0018-kamailio.cfg-removed-sample-db_mode-parameter-for-do.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/branches/wheezy/debian/patches/upstream/0018-kamailio.cfg-removed-sample-db_mode-parameter-for-do.patch?rev=9929&op=file
==============================================================================
--- kamailio/branches/wheezy/debian/patches/upstream/0018-kamailio.cfg-removed-sample-db_mode-parameter-for-do.patch (added)
+++ kamailio/branches/wheezy/debian/patches/upstream/0018-kamailio.cfg-removed-sample-db_mode-parameter-for-do.patch Sun Aug 5 14:24:19 2012
@@ -1,0 +1,28 @@
+From 87618b2f1c5d6e3724c3935709b81b151c4645b5 Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Wed, 18 Jul 2012 08:27:52 +0200
+Subject: [PATCH] kamailio.cfg: removed sample db_mode parameter for domain
+ module
+
+- no longer exists since 3.3 domain update
+(cherry picked from commit bb4925540d241eb91cc8b68712bec20f1970b086)
+---
+ etc/kamailio.cfg | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg
+index 158b525..f8b375c 100644
+--- a/etc/kamailio.cfg
++++ b/etc/kamailio.cfg
+@@ -380,8 +380,6 @@ modparam("speeddial", "use_domain", MULTIDOMAIN)
+ # ----- domain params -----
+ #!ifdef WITH_MULTIDOMAIN
+ modparam("domain", "db_url", DBURL)
+-# use caching
+-modparam("domain", "db_mode", 1)
+ # register callback to match myself condition with domains list
+ modparam("domain", "register_myself", 1)
+ #!endif
+--
+1.7.9.5
+
Added: kamailio/branches/wheezy/debian/patches/upstream/0019-kamdbctl-mtree-tables-were-not-in-the-list-for-db-cr.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/branches/wheezy/debian/patches/upstream/0019-kamdbctl-mtree-tables-were-not-in-the-list-for-db-cr.patch?rev=9929&op=file
==============================================================================
--- kamailio/branches/wheezy/debian/patches/upstream/0019-kamdbctl-mtree-tables-were-not-in-the-list-for-db-cr.patch (added)
+++ kamailio/branches/wheezy/debian/patches/upstream/0019-kamdbctl-mtree-tables-were-not-in-the-list-for-db-cr.patch Sun Aug 5 14:24:19 2012
@@ -1,0 +1,36 @@
+From cd50811c1964e4e2227e45ffcb4e5e1f0db04745 Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Wed, 18 Jul 2012 18:51:54 +0200
+Subject: [PATCH] kamdbctl: mtree tables were not in the list for db creation
+ (cherry picked from commit
+ e35e16efbbc6c746a7a4dfeddfc241c2c78d30bc)
+
+---
+ utils/kamctl/kamdbctl.base | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/utils/kamctl/kamdbctl.base b/utils/kamctl/kamdbctl.base
+index c8a78fa..59bc2e7 100644
+--- a/utils/kamctl/kamdbctl.base
++++ b/utils/kamctl/kamdbctl.base
+@@ -38,7 +38,7 @@ STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases domain domain_attrs grp
+ aliases silo dialog dialog_vars dispatcher dialplan}
+ EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy
+ carrierroute carrier_name domain_name carrierfailureroute userblacklist
+- globalblacklist htable purplemap uacreg pl_pipes}
++ globalblacklist htable purplemap uacreg pl_pipes mtree mtrees}
+ PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap
+ pua rls_presentity rls_watchers}
+
+@@ -67,7 +67,7 @@ STANDARD_MODULES=${STANDARD_MODULES:-standard acc lcr domain group permissions
+ speeddial avpops auth_db pdt dialog dispatcher
+ dialplan}
+ EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute
+- userblacklist htable purple uac pipelimit}
++ userblacklist htable purple uac pipelimit mtree}
+
+ ############################################################
+
+--
+1.7.9.5
+
Added: kamailio/branches/wheezy/debian/patches/upstream/0020-tls-set-function-to-return-the-id.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/branches/wheezy/debian/patches/upstream/0020-tls-set-function-to-return-the-id.patch?rev=9929&op=file
==============================================================================
--- kamailio/branches/wheezy/debian/patches/upstream/0020-tls-set-function-to-return-the-id.patch (added)
+++ kamailio/branches/wheezy/debian/patches/upstream/0020-tls-set-function-to-return-the-id.patch Sun Aug 5 14:24:19 2012
@@ -1,0 +1,50 @@
+From 5f8405f577d66069fde48202862f06cac432139b Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Wed, 18 Jul 2012 19:00:38 +0200
+Subject: [PATCH] tls: set function to return the id
+
+- starting with v1.0.0 openssl does not use anymore getpid(), but address
+ of errno which can point to same virtual address in a multi-process
+ application
+- for refrence http://www.openssl.org/docs/crypto/threads.html
+- credits to Jijo on sr-dev mailing list
+(cherry picked from commit 0615826fe602c5183fbc7be7c51de5eb5eb7223c)
+---
+ modules/tls/tls_locking.c | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/modules/tls/tls_locking.c b/modules/tls/tls_locking.c
+index 86bda17..d85b14c 100644
+--- a/modules/tls/tls_locking.c
++++ b/modules/tls/tls_locking.c
+@@ -130,6 +130,10 @@ void tls_destroy_locks()
+ }
+
+
++unsigned long sr_ssl_id_f()
++{
++ return my_pid();
++}
+
+ /* returns -1 on error, 0 on success */
+ int tls_init_locks()
+@@ -163,10 +167,13 @@ int tls_init_locks()
+ CRYPTO_set_dynlock_lock_callback(dyn_lock_f);
+ CRYPTO_set_dynlock_destroy_callback(dyn_destroy_f);
+
+- /* thread id callback: not needed because ser doesn't use thread and
+- * openssl already uses getpid() (by default)
+- * CRYPTO_set_id_callback(id_f);
++ /* starting with v1.0.0 openssl does not use anymore getpid(), but address
++ * of errno which can point to same virtual address in a multi-process
++ * application
++ * - for refrence http://www.openssl.org/docs/crypto/threads.html
+ */
++ CRYPTO_set_id_callback(sr_ssl_id_f);
++
+ /* atomic add -- since for now we don't have atomic_add
+ * (only atomic_inc), fallback to the default use-locks mode
+ * CRYPTO_set_add_lock_callback(atomic_add_f);
+--
+1.7.9.5
+
Added: kamailio/branches/wheezy/debian/patches/upstream/0021-usrloc-k-on-ul-update-re-clone-uri-and-callid-if-ins.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/branches/wheezy/debian/patches/upstream/0021-usrloc-k-on-ul-update-re-clone-uri-and-callid-if-ins.patch?rev=9929&op=file
==============================================================================
--- kamailio/branches/wheezy/debian/patches/upstream/0021-usrloc-k-on-ul-update-re-clone-uri-and-callid-if-ins.patch (added)
+++ kamailio/branches/wheezy/debian/patches/upstream/0021-usrloc-k-on-ul-update-re-clone-uri-and-callid-if-ins.patch Sun Aug 5 14:24:19 2012
@@ -1,0 +1,51 @@
+From b5b534ec77634041d0ed11280241a947b61aff0c Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Mon, 30 Jul 2012 12:55:36 +0200
+Subject: [PATCH] usrloc(k): on ul update, re-clone uri and callid if instance
+ is set
+
+- changes can happen when gruu/ob is enabled as the UA can get different
+ address for same instance
+(cherry picked from commit a7cad776a514b0ec73a5c40b7971af8e0f0da92b)
+---
+ modules_k/usrloc/ucontact.c | 11 ++++++++---
+ modules_k/usrloc/usrloc.h | 1 +
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/modules_k/usrloc/ucontact.c b/modules_k/usrloc/ucontact.c
+index 2d07a26..ac76e9b 100644
+--- a/modules_k/usrloc/ucontact.c
++++ b/modules_k/usrloc/ucontact.c
+@@ -218,9 +218,14 @@ int mem_update_ucontact(ucontact_t* _c, ucontact_info_t* _ci)
+
+ char* ptr;
+
+- /* No need to update Callid as it is constant
+- * per ucontact (set at insert time) -bogdan */
+-
++ if(_ci->instance.s!=NULL && _ci->instance.len>0)
++ {
++ /* when we have instance set, update contact address and call-id */
++ if(_ci->c!=NULL && _ci->c->s!=NULL && _ci->c->len>0)
++ update_str( &_c->c, _ci->c);
++ if(_ci->callid!=NULL && _ci->callid->s!=NULL && _ci->callid->len>0)
++ update_str( &_c->callid, _ci->callid);
++ }
+ update_str( &_c->user_agent, _ci->user_agent);
+
+ if (_ci->received.s && _ci->received.len) {
+diff --git a/modules_k/usrloc/usrloc.h b/modules_k/usrloc/usrloc.h
+index d08632b..bfd225a 100644
+--- a/modules_k/usrloc/usrloc.h
++++ b/modules_k/usrloc/usrloc.h
+@@ -94,6 +94,7 @@ typedef struct ucontact {
+ /*! \brief Informations related to a contact */
+ typedef struct ucontact_info {
+ str ruid; /*!< Pointer to record internal unique id */
++ str *c; /*!< Contact address */
+ str received; /*!< Received interface */
+ str* path; /*!< Path informations */
+ time_t expires; /*!< Contact expires */
+--
+1.7.9.5
+
Added: kamailio/branches/wheezy/debian/patches/upstream/0022-register-k-pack-contact-info-based-on-header-for-sea.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/branches/wheezy/debian/patches/upstream/0022-register-k-pack-contact-info-based-on-header-for-sea.patch?rev=9929&op=file
==============================================================================
--- kamailio/branches/wheezy/debian/patches/upstream/0022-register-k-pack-contact-info-based-on-header-for-sea.patch (added)
+++ kamailio/branches/wheezy/debian/patches/upstream/0022-register-k-pack-contact-info-based-on-header-for-sea.patch Sun Aug 5 14:24:19 2012
@@ -1,0 +1,75 @@
+From 153baccb8bbbcf08b6485f1cfc75a2b809bdafca Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Mon, 30 Jul 2012 12:57:09 +0200
+Subject: [PATCH] register(k): pack contact info based on header for searching
+ existing ul records
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- not using the contact header resulted in omitting instance and reg-id
+ parameters, not following gruu/ob extensions, ending in duplicate
+ records for same +sip.instance
+- reported by José Luis Millán
+(cherry picked from commit efa3099252ca5d200bef6ce71df33f33b55f9941)
+---
+ modules_k/registrar/save.c | 22 ++++++++++------------
+ 1 file changed, 10 insertions(+), 12 deletions(-)
+
+diff --git a/modules_k/registrar/save.c b/modules_k/registrar/save.c
+index 8f18ea7..9b0607a 100644
+--- a/modules_k/registrar/save.c
++++ b/modules_k/registrar/save.c
+@@ -302,6 +302,10 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c,
+ }
+
+ if(_c!=0) {
++ /* hook uri address - should be more than 'sip:' chars */
++ if(_c->uri.s!=NULL && _c->uri.len>4)
++ ci.c = &_c->uri;
++
+ /* Calculate q value of the contact */
+ if (calc_contact_q(_c->q, &ci.q) < 0) {
+ rerrno = R_INV_Q;
+@@ -651,6 +655,12 @@ static inline int update_contacts(struct sip_msg* _m, urecord_t* _r,
+ /* calculate expires */
+ calc_contact_expires(_m, _c->expires, &expires);
+
++ /* pack the contact info */
++ if ( (ci=pack_ci( 0, _c, expires, 0))==0 ) {
++ LM_ERR("failed to pack contact specific info\n");
++ goto error;
++ }
++
+ /* search for the contact*/
+ ret = ul.get_ucontact_by_instance( _r, &_c->uri, ci, &c);
+ if (ret==-1) {
+@@ -668,12 +678,6 @@ static inline int update_contacts(struct sip_msg* _m, urecord_t* _r,
+ if (expires==0)
+ continue;
+
+- /* pack the contact_info */
+- if ( (ci=pack_ci( 0, _c, expires, 0))==0 ) {
+- LM_ERR("failed to extract contact info\n");
+- goto error;
+- }
+-
+ if (ul.insert_ucontact( _r, &_c->uri, ci, &c) < 0) {
+ rerrno = R_UL_INS_C;
+ LM_ERR("failed to insert contact\n");
+@@ -710,12 +714,6 @@ static inline int update_contacts(struct sip_msg* _m, urecord_t* _r,
+ rc = 3;
+ } else {
+ /* do update */
+- /* pack the contact specific info */
+- if ( (ci=pack_ci( 0, _c, expires, 0))==0 ) {
+- LM_ERR("failed to pack contact specific info\n");
+- goto error;
+- }
+-
+ if(_mode)
+ {
+ ptr=_r->contacts;
+--
+1.7.9.5
+
More information about the Pkg-voip-commits
mailing list