sr-dev March 2018

sr-dev@lists.kamailio.org

17 participants
326 discussions

git:master:25ca18fd: msilo module: fix openser DB URL in docs and example cfg

by Henning Westerholt

Module: kamailio Branch: master Commit: 25ca18fdafae53e38c296852547f3d71155681ec URL: https://github.com/kamailio/kamailio/commit/25ca18fdafae53e38c296852547f3d7… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-21T22:20:46+01:00 msilo module: fix openser DB URL in docs and example cfg --- Modified: src/modules/msilo/doc/msilo.cfg Modified: src/modules/msilo/doc/msilo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/25ca18fdafae53e38c296852547f3d7… Patch: https://github.com/kamailio/kamailio/commit/25ca18fdafae53e38c296852547f3d7… --- diff --git a/src/modules/msilo/doc/msilo.cfg b/src/modules/msilo/doc/msilo.cfg index 05329f0299..7bec0841e6 100644 --- a/src/modules/msilo/doc/msilo.cfg +++ b/src/modules/msilo/doc/msilo.cfg @@ -42,7 +42,7 @@ modparam("usrloc", "db_mode", 0) # -- msilo params -- -modparam("msilo","db_url","mysql://openser:openserrw@localhost/openser") +modparam("msilo","db_url","mysql://kamailio:kamailiorw@localhost/kamailio") modparam("msilo","from_address","sip:registrar@kamailio.org") modparam("msilo","contact_hdr","Contact: registrar@192.168.1.2:5060;msilo=yes\r\n") modparam("msilo","content_type_hdr","Content-Type: text/plain\r\n") diff --git a/src/modules/msilo/doc/msilo_admin.xml b/src/modules/msilo/doc/msilo_admin.xml index 9d30e54045..7d53dba51b 100644 --- a/src/modules/msilo/doc/msilo_admin.xml +++ b/src/modules/msilo/doc/msilo_admin.xml @@ -109,7 +109,7 @@ <title>Set the <quote>db_url</quote> parameter</title> <programlisting format="linespecific"> ... -modparam("msilo", "db_url", "mysql://user:passwd@host.com/dbname") +modparam("msilo", "db_url", "&exampledb;") ... </programlisting> </example>

6 years, 8 months

git:master:6b39875c: usrloc: doxygen docs fixes

by Henning Westerholt

Module: kamailio Branch: master Commit: 6b39875c2f0d6f475171232890e0c80c09685787 URL: https://github.com/kamailio/kamailio/commit/6b39875c2f0d6f475171232890e0c80… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-21T22:04:57+01:00 usrloc: doxygen docs fixes --- Modified: src/modules/usrloc/dlist.c Modified: src/modules/usrloc/dlist.h Modified: src/modules/usrloc/udomain.c Modified: src/modules/usrloc/urecord.c --- Diff: https://github.com/kamailio/kamailio/commit/6b39875c2f0d6f475171232890e0c80… Patch: https://github.com/kamailio/kamailio/commit/6b39875c2f0d6f475171232890e0c80… --- diff --git a/src/modules/usrloc/dlist.c b/src/modules/usrloc/dlist.c index 48b3ee1ef3..f649130a98 100644 --- a/src/modules/usrloc/dlist.c +++ b/src/modules/usrloc/dlist.c @@ -85,7 +85,7 @@ static inline int find_dlist(str* _n, dlist_t** _d) * \param flags contact flags * \param part_idx part index * \param part_max maximal part - * \param GAU options + * \param options options * \return 0 on success, positive if buffer size was not sufficient, negative on failure */ static inline int get_all_db_ucontacts(void *buf, int len, unsigned int flags, @@ -333,7 +333,7 @@ static inline int get_all_db_ucontacts(void *buf, int len, unsigned int flags, * \param flags contact flags * \param part_idx part index * \param part_max maximal part - * \param GAU options + * \param options options * \return 0 on success, positive if buffer size was not sufficient, negative on failure */ static inline int get_all_mem_ucontacts(void *buf, int len, unsigned int flags, @@ -483,7 +483,7 @@ static inline int get_all_mem_ucontacts(void *buf, int len, unsigned int flags, * \param flags contact flags * \param part_idx part index * \param part_max maximal part - * \param GAU options + * \param options options * \return 0 on success, positive if buffer size was not sufficient, negative on failure */ int get_all_ucontacts(void *buf, int len, unsigned int flags, diff --git a/src/modules/usrloc/dlist.h b/src/modules/usrloc/dlist.h index 2ad223120e..2f496b2631 100644 --- a/src/modules/usrloc/dlist.h +++ b/src/modules/usrloc/dlist.h @@ -109,7 +109,7 @@ int synchronize_all_udomains(int istart, int istep); * \param flags contact flags * \param part_idx part index * \param part_max maximal part - * \param GAU options + * \param options options * \return 0 on success, positive if buffer size was not sufficient, negative on failure */ int get_all_ucontacts(void *buf, int len, unsigned int flags, diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index aacca0513b..054f781818 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -764,7 +764,7 @@ urecord_t* db_load_urecord(db1_con_t* _c, udomain_t* _d, str *_aor) * \brief Loads from DB all contacts for a RUID * \param _c database connection * \param _d domain - * \param _aor address of record + * \param _ruid record unique id * \return pointer to the record on success, 0 on errors or if nothing is found */ urecord_t* db_load_urecord_by_ruid(db1_con_t* _c, udomain_t* _d, str *_ruid) @@ -1010,8 +1010,10 @@ void mem_delete_urecord(udomain_t* _d, struct urecord* _r) /*! - * \brief Run timer handler for given domain + * \brief Run timer handler for given domain, delete urecords * \param _d domain + * \param istart start of run + * \param istep loop steps */ void mem_timer_udomain(udomain_t* _d, int istart, int istep) { diff --git a/src/modules/usrloc/urecord.c b/src/modules/usrloc/urecord.c index 482c14efcf..598cbd88fe 100644 --- a/src/modules/usrloc/urecord.c +++ b/src/modules/usrloc/urecord.c @@ -735,7 +735,7 @@ static inline struct ucontact* contact_path_match( ucontact_t* ptr, str* _c, str /*! * \brief Match a contact record to a Call-ID only * \param ptr contact record - * \param _c contact string + * \param _callid callid string * \return ptr on successfull match, 0 when they not match */ static inline struct ucontact* contact_match_callidonly( ucontact_t* ptr, str* _callid)

6 years, 8 months

git:master:fbff4a87: modules: readme files regenerated - phonenum ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: fbff4a8709e12f699098c23626dc6e75f620b978 URL: https://github.com/kamailio/kamailio/commit/fbff4a8709e12f699098c23626dc6e7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-03-21T15:01:31+01:00 modules: readme files regenerated - phonenum ... [skip ci] --- Modified: src/modules/phonenum/README --- Diff: https://github.com/kamailio/kamailio/commit/fbff4a8709e12f699098c23626dc6e7… Patch: https://github.com/kamailio/kamailio/commit/fbff4a8709e12f699098c23626dc6e7… --- diff --git a/src/modules/phonenum/README b/src/modules/phonenum/README index 82aece96b4..711a532e65 100644 --- a/src/modules/phonenum/README +++ b/src/modules/phonenum/README @@ -10,7 +10,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright © 2017 Daniel-Constantin Mierla (asipto.com) + Copyright Â© 2017 Daniel-Constantin Mierla (asipto.com) __________________________________________________________________ Table of Contents @@ -97,7 +97,7 @@ Chapter 1. Admin Guide Phone number search mode. - Default value is "0". + Default value is â0â. Example 1.1. Set smode parameter ... @@ -108,7 +108,7 @@ modparam("phonenum", "smode", 0) 4.1. phonenum_match(num, pvc) -4.1. phonenum_match(num, pvc) +4.1. phonenum_match(num, pvc) Match num against the libphonenumber and set the attributes inside the pvc container. The function has to be called before accessing a key @@ -120,8 +120,13 @@ modparam("phonenum", "smode", 0) Example 1.2. phonenum_match usage ... -if(phonenum_match("1-484-555-8888", "src")) - xlog("number normalized to: $phn(src=>num)\n"); +if(phonenum_match("1-484-555-8888", "src")) { + if($phn(src=>valid)==1) { + xlog("number normalized to: $phn(src=>normalized)\n"); + } else { + xlog("number normalization error: $phn(src=>error)\n"); + } +} ... 5. Pseudo Variables @@ -129,10 +134,14 @@ if(phonenum_match("1-484-555-8888", "src")) * $phn(pvc=>key) - pvc is an identifier for this query result; it is designated by the second parameter of phonenum_match(). The key can be one of the following: - + number - normalized phone number - + country - country for phone number - + region - region for phone number - + operator - operator for phone number + + number - phone number that is matched + + valid - 1 if the matched number has a valid result; 0 + otherwise + + normalized - normalized phone number + + cctel - country code for phone number + + ltype - local network type + + ndesc - phone number description + + error - error string if phone number matching fails. Exported pseudo-variables are documented at https://www.kamailio.org/wiki/.

6 years, 8 months

git:master:70a61e0b: phonenum: docs - updated pv names to match c code

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 70a61e0bfa0640fbba8d6cfe57f6ad4c6a431b84 URL: https://github.com/kamailio/kamailio/commit/70a61e0bfa0640fbba8d6cfe57f6ad4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-21T14:59:29+01:00 phonenum: docs - updated pv names to match c code --- Modified: src/modules/phonenum/doc/phonenum_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/70a61e0bfa0640fbba8d6cfe57f6ad4… Patch: https://github.com/kamailio/kamailio/commit/70a61e0bfa0640fbba8d6cfe57f6ad4… --- diff --git a/src/modules/phonenum/doc/phonenum_admin.xml b/src/modules/phonenum/doc/phonenum_admin.xml index 1b13cfb2b9..16e85c5766 100644 --- a/src/modules/phonenum/doc/phonenum_admin.xml +++ b/src/modules/phonenum/doc/phonenum_admin.xml @@ -111,8 +111,13 @@ modparam("phonenum", "smode", 0) <title><function>phonenum_match</function> usage</title> <programlisting format="linespecific"> ... -if(phonenum_match("1-484-555-8888", "src")) - xlog("number normalized to: $phn(src=>num)\n"); +if(phonenum_match("1-484-555-8888", "src")) { + if($phn(src=>valid)==1) { + xlog("number normalized to: $phn(src=>normalized)\n"); + } else { + xlog("number normalization error: $phn(src=>error)\n"); + } +} ... </programlisting> </example> @@ -131,16 +136,27 @@ if(phonenum_match("1-484-555-8888", "src")) </para> <itemizedlist> <listitem><para> - <emphasis>number</emphasis> - normalized phone number + <emphasis>number</emphasis> - phone number that is matched </para></listitem> <listitem><para> - <emphasis>country</emphasis> - country for phone number + <emphasis>valid</emphasis> - 1 if the matched number has a + valid result; 0 otherwise </para></listitem> <listitem><para> - <emphasis>region</emphasis> - region for phone number + <emphasis>normalized</emphasis> - normalized phone number </para></listitem> <listitem><para> - <emphasis>operator</emphasis> - operator for phone number + <emphasis>cctel</emphasis> - country code for phone number + </para></listitem> + <listitem><para> + <emphasis>ltype</emphasis> - local network type + </para></listitem> + <listitem><para> + <emphasis>ndesc</emphasis> - phone number description + </para></listitem> + <listitem><para> + <emphasis>error</emphasis> - error string if phone number + matching fails. </para></listitem> </itemizedlist> </listitem>

6 years, 8 months

git:master:54c6a037: phonenum: build cctel from formatted number

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 54c6a03704767a3dc15eb633ce1628e93c99a8ff URL: https://github.com/kamailio/kamailio/commit/54c6a03704767a3dc15eb633ce1628e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-21T14:59:29+01:00 phonenum: build cctel from formatted number --- Modified: src/modules/phonenum/cphonenumber.cpp --- Diff: https://github.com/kamailio/kamailio/commit/54c6a03704767a3dc15eb633ce1628e… Patch: https://github.com/kamailio/kamailio/commit/54c6a03704767a3dc15eb633ce1628e… --- diff --git a/src/modules/phonenum/cphonenumber.cpp b/src/modules/phonenum/cphonenumber.cpp index 71e76ab004..b723543f55 100644 --- a/src/modules/phonenum/cphonenumber.cpp +++ b/src/modules/phonenum/cphonenumber.cpp @@ -134,7 +134,10 @@ telnum_t* telnum_parse(char* number, char* region) string descNumber = _phoneGeoCoder->GetDescriptionForNumber(parsedNumber, Locale("en")); res->ndesc = strdup(descNumber.c_str()); res->ltype = strdup(telnum_linetype(_phoneUtil.GetNumberType(parsedNumber))); - res->cctel = _phoneUtil.GetCountryCodeForRegion(regionStr); + // res->cctel = _phoneUtil.GetCountryCodeForRegion(regionStr); + string regionCode; + _phoneUtil.GetRegionCodeForNumber(parsedNumber, &regionCode); + res->cctel = _phoneUtil.GetCountryCodeForRegion(regionCode); return res; }

6 years, 8 months

git:master:2196c677: phonenum: fixed lenght in pv name comparisons

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2196c677785fc4df4f4f1c03831eff679dcd5363 URL: https://github.com/kamailio/kamailio/commit/2196c677785fc4df4f4f1c03831eff6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-21T14:59:29+01:00 phonenum: fixed lenght in pv name comparisons --- Modified: src/modules/phonenum/phonenum_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/2196c677785fc4df4f4f1c03831eff6… Patch: https://github.com/kamailio/kamailio/commit/2196c677785fc4df4f4f1c03831eff6… --- diff --git a/src/modules/phonenum/phonenum_pv.c b/src/modules/phonenum/phonenum_pv.c index 9fd9ce93f4..f4e2763bf0 100644 --- a/src/modules/phonenum/phonenum_pv.c +++ b/src/modules/phonenum/phonenum_pv.c @@ -165,19 +165,19 @@ int pv_parse_phonenum_name(pv_spec_p sp, str *in) switch(pvs.len) { case 5: - if(strncmp(pvs.s, "ltype", 6) == 0) + if(strncmp(pvs.s, "ltype", 5) == 0) gpv->type = 2; - else if(strncmp(pvs.s, "ndesc", 6) == 0) + else if(strncmp(pvs.s, "ndesc", 5) == 0) gpv->type = 3; - else if(strncmp(pvs.s, "error", 6) == 0) + else if(strncmp(pvs.s, "error", 5) == 0) gpv->type = 4; - else if(strncmp(pvs.s, "cctel", 6) == 0) + else if(strncmp(pvs.s, "cctel", 5) == 0) gpv->type = 5; - else if(strncmp(pvs.s, "valid", 6) == 0) + else if(strncmp(pvs.s, "valid", 5) == 0) gpv->type = 6; else goto error; - break; + break; case 6: if(strncmp(pvs.s, "number", 6) == 0) gpv->type = 0; @@ -315,7 +315,10 @@ int phonenum_update_pv(str *tomatch, str *name) LM_DBG("no match for: %s\n", gr->tomatch); return -2; } - LM_DBG("phonenum PV updated for: %s\n", gr->tomatch); + LM_DBG("phonenum PV updated for: %s (%d/%s/%s)\n", gr->tomatch, + gr->record->valid, + (gr->record->normalized)?gr->record->normalized:"none", + (gr->record->error)?gr->record->error:"none"); return 1; }

6 years, 8 months

git:master:f80bfac4: modules: readme files regenerated - nathelper ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: f80bfac4c8f91144248a5569fb3c844e0ab84159 URL: https://github.com/kamailio/kamailio/commit/f80bfac4c8f91144248a5569fb3c844… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-03-21T08:31:56+01:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/f80bfac4c8f91144248a5569fb3c844… Patch: https://github.com/kamailio/kamailio/commit/f80bfac4c8f91144248a5569fb3c844… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 3dd341016f..e70d537311 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -568,13 +568,15 @@ fix_nated_register(); * 1 - The “Contact” header field is searched for occurrence of RFC1918 or RFC6598 addresses. * 2 - the "received" test is used: address in the “Via” header is - compared against source IP address of signaling + compared against source IP address of signaling. If the “Via” + header contains no port, it uses the default SIP port 5060 * 4 - The Top Most “Via” is searched for occurrence of RFC1918 or RFC6598 addresses * 8 - The SDP is searched for occurrence of RFC1918 or RFC6598 addresses * 16 - Test if the source port is different from the port in the - “Via” header + “Via” header. If the “Via” header contains no port, it uses the + default SIP port 5060 * 32 - Test if the source IP address of signaling is a RFC1918 or RFC6598 address * 64 - Test if the source connection of signaling is a WebSocket

6 years, 8 months

git:master:f327fbb8: nathelper: small docs addition related to nat_uac_test()

by Henning Westerholt

Module: kamailio Branch: master Commit: f327fbb8fbb61a2298aa05dec5e265d266d3e44e URL: https://github.com/kamailio/kamailio/commit/f327fbb8fbb61a2298aa05dec5e265d… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-21T08:22:27+01:00 nathelper: small docs addition related to nat_uac_test() --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f327fbb8fbb61a2298aa05dec5e265d… Patch: https://github.com/kamailio/kamailio/commit/f327fbb8fbb61a2298aa05dec5e265d… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index 83dc8f5faa..975f579d93 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -632,7 +632,8 @@ fix_nated_register(); <listitem><para> <emphasis>2</emphasis> - the "received" test is used: address in the <quote>Via</quote> header is compared against source - IP address of signaling + IP address of signaling. If the <quote>Via</quote> header contains + no port, it uses the default SIP port 5060 </para></listitem> <listitem><para> <emphasis>4</emphasis> - The Top Most <quote>Via</quote> is searched @@ -643,8 +644,9 @@ fix_nated_register(); RFC1918 or RFC6598 addresses </para></listitem> <listitem><para> - <emphasis>16</emphasis> - Test if the source port is different - from the port in the <quote>Via</quote> header + <emphasis>16</emphasis> - Test if the source port is different from the port + in the <quote>Via</quote> header. If the <quote>Via</quote> header contains + no port, it uses the default SIP port 5060 </para></listitem> <listitem><para> <emphasis>32</emphasis> - Test if the source IP address of

6 years, 8 months

[kamailio/kamailio] textops: Fixed remove_hf_exp arguments params (#1485) (#1486)

by sergey-safarov

Cherry pick of f3cfb4910ae0fd197757d2ec2362b9715205e21e You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1486 -- Commit Summary -- * textops: Fixed remove_hf_exp arguments params (#1485) -- File Changes -- M src/modules/textops/textops.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1486.patch https://github.com/kamailio/kamailio/pull/1486.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1486

6 years, 8 months

git:5.1:f44a0267: textops: Fixed remove_hf_exp arguments params (#1485)

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: f44a02672d6937deafda21f99a912fe55a3d96d6 URL: https://github.com/kamailio/kamailio/commit/f44a02672d6937deafda21f99a912fe… Author: sergey-safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-20T19:35:48+01:00 textops: Fixed remove_hf_exp arguments params (#1485) (cherry picked from commit f3cfb4910ae0fd197757d2ec2362b9715205e21e) --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/f44a02672d6937deafda21f99a912fe… Patch: https://github.com/kamailio/kamailio/commit/f44a02672d6937deafda21f99a912fe… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 7dbd07b03c..b6ad78d55c 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -208,7 +208,7 @@ static cmd_export_t cmds[]={ {"remove_hf_re", (cmd_function)remove_hf_re_f, 1, fixup_regexp_null, fixup_free_regexp_null, ANY_ROUTE}, - {"remove_hf_exp", (cmd_function)remove_hf_exp_f, 1, + {"remove_hf_exp", (cmd_function)remove_hf_exp_f, 2, fixup_regexp_regexp, fixup_free_regexp_regexp, ANY_ROUTE}, {"is_present_hf", (cmd_function)is_present_hf_f, 1,

6 years, 8 months

← Newer
1
...
9
10
11
12
13
14
15
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2018