[Pkg-voip-commits] r9913 - in /kamailio/trunk/debian: ./ patches/ patches/upstream/
maniac-guest at alioth.debian.org
maniac-guest at alioth.debian.org
Fri Jul 13 06:21:00 UTC 2012
Author: maniac-guest
Date: Fri Jul 13 06:20:58 2012
New Revision: 9913
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9913
Log:
upstream fixes
Added:
kamailio/trunk/debian/patches/upstream/0004-modules_k-uac-fix-handling-of-empty-display-part.patch
kamailio/trunk/debian/patches/upstream/0005-kamdbctl-add-domain_attrs-table-to-standard-tables.patch
kamailio/trunk/debian/patches/upstream/0007-modules_k-presence-Added-missing-use_table-call.patch
kamailio/trunk/debian/patches/upstream/0008-core-update-printing-of-socket-lists-to-show-the-adv.patch
kamailio/trunk/debian/patches/upstream/0009-modules-sl-Fixed-segmentation-fault-and-corrected-lo.patch
kamailio/trunk/debian/patches/upstream/0010-modules_k-registrar-Fixed-some-errors-in-module-docu.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=9913&op=diff
==============================================================================
--- kamailio/trunk/debian/changelog (original)
+++ kamailio/trunk/debian/changelog Fri Jul 13 06:20:58 2012
@@ -8,9 +8,9 @@
+ remove call to dpkg-buildflags
+ do not apply hardening_flags.patch
* 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
+ + upstream fixes.
+
+ -- Victor Seva <linuxmaniac at torreviejawireless.org> Fri, 13 Jul 2012 08:18:05 +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=9913&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/series (original)
+++ kamailio/trunk/debian/patches/series Fri Jul 13 06:20:58 2012
@@ -1,6 +1,12 @@
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
+upstream/0004-modules_k-uac-fix-handling-of-empty-display-part.patch
+upstream/0005-kamdbctl-add-domain_attrs-table-to-standard-tables.patch
+upstream/0007-modules_k-presence-Added-missing-use_table-call.patch
+upstream/0008-core-update-printing-of-socket-lists-to-show-the-adv.patch
+upstream/0009-modules-sl-Fixed-segmentation-fault-and-corrected-lo.patch
+upstream/0010-modules_k-registrar-Fixed-some-errors-in-module-docu.patch
multiarch_support.patch
no_INSTALL_file.patch
hardening_flags.patch
Added: kamailio/trunk/debian/patches/upstream/0004-modules_k-uac-fix-handling-of-empty-display-part.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0004-modules_k-uac-fix-handling-of-empty-display-part.patch?rev=9913&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0004-modules_k-uac-fix-handling-of-empty-display-part.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0004-modules_k-uac-fix-handling-of-empty-display-part.patch Fri Jul 13 06:20:58 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/trunk/debian/patches/upstream/0005-kamdbctl-add-domain_attrs-table-to-standard-tables.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0005-kamdbctl-add-domain_attrs-table-to-standard-tables.patch?rev=9913&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0005-kamdbctl-add-domain_attrs-table-to-standard-tables.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0005-kamdbctl-add-domain_attrs-table-to-standard-tables.patch Fri Jul 13 06:20:58 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/trunk/debian/patches/upstream/0007-modules_k-presence-Added-missing-use_table-call.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0007-modules_k-presence-Added-missing-use_table-call.patch?rev=9913&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0007-modules_k-presence-Added-missing-use_table-call.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0007-modules_k-presence-Added-missing-use_table-call.patch Fri Jul 13 06:20:58 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/trunk/debian/patches/upstream/0008-core-update-printing-of-socket-lists-to-show-the-adv.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0008-core-update-printing-of-socket-lists-to-show-the-adv.patch?rev=9913&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0008-core-update-printing-of-socket-lists-to-show-the-adv.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0008-core-update-printing-of-socket-lists-to-show-the-adv.patch Fri Jul 13 06:20:58 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/trunk/debian/patches/upstream/0009-modules-sl-Fixed-segmentation-fault-and-corrected-lo.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0009-modules-sl-Fixed-segmentation-fault-and-corrected-lo.patch?rev=9913&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0009-modules-sl-Fixed-segmentation-fault-and-corrected-lo.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0009-modules-sl-Fixed-segmentation-fault-and-corrected-lo.patch Fri Jul 13 06:20:58 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/trunk/debian/patches/upstream/0010-modules_k-registrar-Fixed-some-errors-in-module-docu.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0010-modules_k-registrar-Fixed-some-errors-in-module-docu.patch?rev=9913&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0010-modules_k-registrar-Fixed-some-errors-in-module-docu.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0010-modules_k-registrar-Fixed-some-errors-in-module-docu.patch Fri Jul 13 06:20:58 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
+
More information about the Pkg-voip-commits
mailing list