- sr-dev - kamailio.org

git:master:2e4b862a: siptrace: use database entities in docs
by Henning Westerholt 21 Mar '18

21 Mar '18

Module: kamailio Branch: master Commit: 2e4b862af6809222140671bd0200e610a08fbec2 URL: https://github.com/kamailio/kamailio/commit/2e4b862af6809222140671bd0200e61… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-21T22:32:20+01:00 siptrace: use database entities in docs --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2e4b862af6809222140671bd0200e61… Patch: https://github.com/kamailio/kamailio/commit/2e4b862af6809222140671bd0200e61… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index 6b39b02a8e..504e6e98b8 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -102,14 +102,14 @@ </para> <para> <emphasis> - Default value is "mysql://kamailio:kamailiorw@localhost/okamailio". + Default value is "&defaultdb;". </emphasis> </para> <example> <title>Set <varname>db_url</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("siptrace", "db_url", "mysql://user:passwd@host/dbname") +modparam("siptrace", "db_url", "&exampledb;") ... </programlisting> </example>

1 0

git:master:e8214716: ims_usrloc_pcscf: use database entity in docs
by Henning Westerholt 21 Mar '18

21 Mar '18

Module: kamailio Branch: master Commit: e82147166ae1961be827f6b05e00d80073d0880e URL: https://github.com/kamailio/kamailio/commit/e82147166ae1961be827f6b05e00d80… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-21T22:31:10+01:00 ims_usrloc_pcscf: use database entity in docs --- Modified: src/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e82147166ae1961be827f6b05e00d80… Patch: https://github.com/kamailio/kamailio/commit/e82147166ae1961be827f6b05e00d80… --- diff --git a/src/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml b/src/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml index c04c50c72d..a237a1eb61 100644 --- a/src/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml +++ b/src/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml @@ -110,14 +110,14 @@ modparam("ims_usrloc_pcscf", "timer_interval", 30) <para>Database URL</para> <para><emphasis>Default value is - "mysql://kamailio:kamailiorw@localhost/kamailio".</emphasis></para> + "&defaultdb;".</emphasis></para> <example> <title>Set db_url parameter</title> <programlisting format="linespecific">... modparam("ims_usrloc_pcscf", "db_url", - "dbdriver://username:password@dbhost/dbname") + "&exampledb;") ... </programlisting> </example>

1 0

git:master:90e96be7: db_cluster: use database entity in docs
by Henning Westerholt 21 Mar '18

21 Mar '18

Module: kamailio Branch: master Commit: 90e96be7efab2a41417f3997fb06010ce0973d27 URL: https://github.com/kamailio/kamailio/commit/90e96be7efab2a41417f3997fb06010… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-21T22:30:30+01:00 db_cluster: use database entity in docs --- Modified: src/modules/db_cluster/doc/db_cluster_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/90e96be7efab2a41417f3997fb06010… Patch: https://github.com/kamailio/kamailio/commit/90e96be7efab2a41417f3997fb06010… --- diff --git a/src/modules/db_cluster/doc/db_cluster_admin.xml b/src/modules/db_cluster/doc/db_cluster_admin.xml index dd0bdef80f..eb1e8bc489 100644 --- a/src/modules/db_cluster/doc/db_cluster_admin.xml +++ b/src/modules/db_cluster/doc/db_cluster_admin.xml @@ -80,9 +80,9 @@ <programlisting format="linespecific"> ... modparam("db_cluster", "connection", - "con1=>mysql://kamailio:kamailiorw@localhost/kamailio1") + "con1=>&defaultdb;1") modparam("db_cluster", "connection", - "con2=>mysql://kamailio:kamailiorw@localhost/kamailio2") + "con2=>&defaultdb;2") ... </programlisting> </example> @@ -199,9 +199,9 @@ modparam("db_cluster", "max_query_length", 5) <programlisting format="linespecific"> ... modparam("db_cluster", "connection", - "c1=>mysql://kamailio:kamailiorw@localhost/kamailio1") + "c1=>&defaultdb;1") modparam("db_cluster", "connection", - "c2=>mysql://kamailio:kamailiorw@localhost/kamailio2") + "c2=>&defaultdb;2") modparam("db_cluster", "cluster", "k1=>c1=9r9p;c2=9r9p") modparam("acc", "db_url", "cluster://k1")

1 0

git:master:25ca18fd: msilo module: fix openser DB URL in docs and example cfg
by Henning Westerholt 21 Mar '18

21 Mar '18

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>

1 0

git:master:a315486e: doc stylesheets: use kamailio default database
by Henning Westerholt 21 Mar '18

21 Mar '18

Module: kamailio Branch: master Commit: a315486e6061680a253629d90505c011fe544d94 URL: https://github.com/kamailio/kamailio/commit/a315486e6061680a253629d90505c01… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-21T22:29:54+01:00 doc stylesheets: use kamailio default database --- Modified: doc/stylesheets/dbschema_k/xsl/dbdoc.xsl --- Diff: https://github.com/kamailio/kamailio/commit/a315486e6061680a253629d90505c01… Patch: https://github.com/kamailio/kamailio/commit/a315486e6061680a253629d90505c01… --- diff --git a/doc/stylesheets/dbschema_k/xsl/dbdoc.xsl b/doc/stylesheets/dbschema_k/xsl/dbdoc.xsl index 20194cc7a4..ba6d623955 100644 --- a/doc/stylesheets/dbschema_k/xsl/dbdoc.xsl +++ b/doc/stylesheets/dbschema_k/xsl/dbdoc.xsl @@ -53,7 +53,7 @@ ALL CHANGES DONE HERE WILL BE LOST IF THE FILE IS REGENERATED
</xsl:comment <para>URL to the database containing the data.</para> <para>  - <emphasis>Default value is <quote>mysql://openserro:openserro@localhost/openser</quote>.</emphasis> + <emphasis>Default value is <quote>mysql://kamailio:kamailiorw@localhost/kamailio</quote>.</emphasis> </para> <example> <title>Set <varname>db_url</varname> parameter</title>

1 0

git:master:6b39875c: usrloc: doxygen docs fixes
by Henning Westerholt 21 Mar '18

21 Mar '18

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)

1 0

git:master:fbff4a87: modules: readme files regenerated - phonenum ... [skip ci]
by Kamailio Dev 21 Mar '18

21 Mar '18

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/.

1 0

git:master:70a61e0b: phonenum: docs - updated pv names to match c code
by Daniel-Constantin Mierla 21 Mar '18

21 Mar '18

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>

1 0

git:master:54c6a037: phonenum: build cctel from formatted number
by Daniel-Constantin Mierla 21 Mar '18

21 Mar '18

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; }

1 0

git:master:2196c677: phonenum: fixed lenght in pv name comparisons
by Daniel-Constantin Mierla 21 Mar '18

21 Mar '18

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; }

1 0

git:master:f80bfac4: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 21 Mar '18

21 Mar '18

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

1 0

git:master:f327fbb8: nathelper: small docs addition related to nat_uac_test()
by Henning Westerholt 21 Mar '18

21 Mar '18

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

1 0

[kamailio/kamailio] textops: Fixed remove_hf_exp arguments params (#1485) (#1486)
by sergey-safarov 20 Mar '18

20 Mar '18

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

2 2

git:5.1:f44a0267: textops: Fixed remove_hf_exp arguments params (#1485)
by Daniel-Constantin Mierla 20 Mar '18

20 Mar '18

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,

1 0

[kamailio/kamailio] textops: Fixed remove_hf_exp arguments params (#1485)
by sergey-safarov 20 Mar '18

20 Mar '18

Current remove_hf_exp not works as expected. This fix it. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1485 -- Commit Summary -- * textops: Fixed remove_hf_exp arguments params -- File Changes -- M src/modules/textops/textops.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1485.patch https://github.com/kamailio/kamailio/pull/1485.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/1485

2 2

git:master:f3cfb491: textops: Fixed remove_hf_exp arguments params (#1485)
by Daniel-Constantin Mierla 20 Mar '18

20 Mar '18

Module: kamailio Branch: master Commit: f3cfb4910ae0fd197757d2ec2362b9715205e21e URL: https://github.com/kamailio/kamailio/commit/f3cfb4910ae0fd197757d2ec2362b97… Author: sergey-safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-20T19:20:11+01:00 textops: Fixed remove_hf_exp arguments params (#1485) --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/f3cfb4910ae0fd197757d2ec2362b97… Patch: https://github.com/kamailio/kamailio/commit/f3cfb4910ae0fd197757d2ec2362b97… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index f18c450efc..6fb723166b 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -212,7 +212,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,

1 0

[kamailio/kamailio] topos: WARNING: topos [tps_storage.c:385]: tps_storage_record(): no local address - do record routing for all initial requests (#1483)
by Sergey Lavrov 20 Mar '18

20 Mar '18

### Description  I have just updated kamailio to 5.1.2 and have bunch of messages on OPTIONS request without Contact header because of commit ce9f67581f45a00fd879329ffc918b2a7ef9b8d0: WARNING: topos [tps_storage.c:385]: tps_storage_record(): no local address - do record routing for all initial requests In [RFC 3261](https://www.ietf.org/rfc/rfc3261.txt) in 11.1 section is stated that Contact header is optional not mandatory. So maybe a workaround will be suppress such messages for OPTIONS and other SIP requests without mandatory Contact header or move it to DEBUG from WARNING? ### Troubleshooting #### Reproduction  #### Log Messages  ``` Mar 15 04:17:31 kamailio-0-0 /usr/sbin/kamailio[1078]: WARNING: topos [tps_storage.c:385]: tps_storage_record(): no local address - do record routing for all initial requests Mar 15 04:17:31 kamailio-0-0 /usr/sbin/kamailio[1078]: WARNING: topos [tps_storage.c:385]: tps_storage_record(): no local address - do record routing for all initial requests Mar 15 04:17:31 kamailio-0-0 /usr/sbin/kamailio[1078]: WARNING: topos [tps_storage.c:385]: tps_storage_record(): no local address - do record routing for all initial requests Mar 15 04:17:31 kamailio-0-0 /usr/sbin/kamailio[1078]: WARNING: topos [tps_storage.c:385]: tps_storage_record(): no local address - do record routing for all initial requests Mar 15 04:17:31 kamailio-0-0 /usr/sbin/kamailio[1078]: WARNING: topos [tps_storage.c:385]: tps_storage_record(): no local address - do record routing for all initial requests Mar 15 04:17:31 kamailio-0-0 /usr/sbin/kamailio[1078]: WARNING: topos [tps_storage.c:385]: tps_storage_record(): no local address - do record routing for all initial requests ``` #### SIP Traffic  ``` 2018/03/15 04:17:31.833335 x.x.x.x:5060 -> y.y.y.y:5060 OPTIONS sip:y.y.y.y:5060;user=phone SIP/2.0 Via: SIP/2.0/UDP x.x.x.x:5060;branch=z9hG4bKehyhoockece8okibyb7ej8vvj Call-ID: ixheb7uuunjeulhocj8n8oiheynvojnl@SE2000 From: <sip:SBC@x.x.x.x;user=phone>;tag=ucljxn87 To: <sip:y.y.y.y;user=phone> CSeq: 1 OPTIONS Max-Forwards: 70 Content-Length: 0 2018/03/15 04:17:31.833740 y.y.y.y:5060 -> x.x.x.x:5060 SIP/2.0 200 OK Via: SIP/2.0/UDP x.x.x.x:5060;branch=z9hG4bKehyhoockece8okibyb7ej8vvj Call-ID: ixheb7uuunjeulhocj8n8oiheynvojnl@SE2000 From: <sip:SBC@x.x.x.x;user=phone>;tag=ucljxn87 To: <sip:y.y.y.y;user=phone>;tag=3403be34b817f61be8d0522eb11c0e7a.58f4 CSeq: 1 OPTIONS Content-Length: 0 ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 05:07:55 Mar 15 2018 with gcc 4.8.5 ``` * **Operating System**:  ``` Red Hat Enterprise Linux Server release 7.4 (Maipo) Linux kamailio-0-0 2.6.32-042stab113.21 #1 SMP Wed Mar 23 11:05:25 MSK 2016 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/issues/1483

2 2

git:master:a3d9816d: core: check for result of dlopen() pointers
by Daniel-Constantin Mierla 20 Mar '18

20 Mar '18

Module: kamailio Branch: master Commit: a3d9816d3881eb9743a14cb1306533469a821d47 URL: https://github.com/kamailio/kamailio/commit/a3d9816d3881eb9743a14cb13065334… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-20T16:48:26+01:00 core: check for result of dlopen() pointers --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/a3d9816d3881eb9743a14cb13065334… Patch: https://github.com/kamailio/kamailio/commit/a3d9816d3881eb9743a14cb13065334… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index f04d486908..62fc81f21b 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -594,7 +594,7 @@ int load_module(char* mod_path) exit(-1); } mod_if_ver = (unsigned *)dlsym(handle, "module_interface_ver"); - if ( (error =(char*)dlerror())!=0 ){ + if (mod_if_ver==NULL || (error =(char*)dlerror())!=0 ){ LM_ERR("no module interface version in module <%s>\n", path ); goto error1; } @@ -635,12 +635,10 @@ int load_module(char* mod_path) snprintf(exbuf, 62, "_%.*s_exports", expref.len, expref.s); LM_DBG("looking up exports with name: %s\n", exbuf); exp = (union module_exports_u*)dlsym(handle, exbuf); - if(exp==NULL) { - if ( (error =(char*)dlerror())!=0 ){ - LM_ERR("failure for exports symbol: %s - dlerror: %s\n", - exbuf, error); - goto error1; - } + if(exp==NULL || (error =(char*)dlerror())!=0 ){ + LM_ERR("failure for exports symbol: %s - dlerror: %s\n", + exbuf, (error)?error:"none"); + goto error1; } } /* hack to allow for kamailio style dlflags inside exports */

1 0

git:master:3ada0852: core: flags - moved xflags functions out of disabled ifdef zone
by Daniel-Constantin Mierla 20 Mar '18

20 Mar '18

Module: kamailio Branch: master Commit: 3ada08521de545f76e7d85d6fdf900c576c67664 URL: https://github.com/kamailio/kamailio/commit/3ada08521de545f76e7d85d6fdf900c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-20T17:28:32+01:00 core: flags - moved xflags functions out of disabled ifdef zone --- Modified: src/core/flags.c --- Diff: https://github.com/kamailio/kamailio/commit/3ada08521de545f76e7d85d6fdf900c… Patch: https://github.com/kamailio/kamailio/commit/3ada08521de545f76e7d85d6fdf900c… --- diff --git a/src/core/flags.c b/src/core/flags.c index 043824895f..45839d90cd 100644 --- a/src/core/flags.c +++ b/src/core/flags.c @@ -27,6 +27,7 @@ #include <limits.h> +#include <stdint.h> #include "sr_module.h" #include "dprint.h" #include "parser/msg_parser.h" @@ -317,6 +318,8 @@ static int fixup_t_flag(void** param, int param_no) return E_CFG; } +#endif + /** * */ @@ -354,5 +357,3 @@ int isxflagset(struct sip_msg* msg, flag_t flag) fb = flag % (sizeof(flag_t)*CHAR_BIT); return (msg->xflags[fi] & (1<<fb)) ? 1 : -1; } - -#endif

1 0

Security announcement related to Kamailio
by Henning Westerholt 19 Mar '18

19 Mar '18

Hello, as already announced from Daniel-Constantin Mierla on the lists last Wednesday [1], we strongly advise you to update your Kamailio installation to the latest stable release for security reasons. All supported releases (4.4, 5.0. and 5.1) contains two important security fixes related to the tmx and lcr module. Technical details for the tmx issue: A specially crafted REGISTER message with a malformed branch or From tag triggers a so called "off-by-one heap overflow". This vulnerability existed in the tmx module and makes it possible to remotely crash the Kamailio service. If an attacker sends many of this messages this would lead to a Denial of Service of the attacked infrastructure. This is especially critical as no authentication for the remote source is needed. This vulnerability was found from Sandro Gauci and Alfred Farrugia from the Security Company Enable Security. Many thanks to them for finding the issue and reporting it to us. You find all the details including a proof of concept code in the published security announcement from them: https://github.com/EnableSecurity/advisories/tree/master/ES2018-05-kamailio… Technical details for the lcr issue: A vulnerability existed in the lcr next_gw() function. It happens when a very long R-URI username is sent with an INVITE due to an mistake in the function error code handling. It can be triggered from a remote source, but should be only from a trusted peer, as it expected that calls going through lcr are authenticated by user or IP address. This vulnerability was reported from an user in the Netherlands to us, thanks as well for the bug report. So far we are not aware of any public exploits of this errors. But as already mentioned, we advise you to update your Kamailio servers to the latest stable release as soon as possible, especially as the tmx vulnerability will reported to more security lists later today. Please address any detailed technical questions related to the two bugs to the developer list at sr-dev(a)lists.kamailio.org . In case of confidential remarks related to this or other security issues, please address them to the Kamailio Management at management(a)kamailio.org . Best regards, Henning Westerholt Kamailio Project [1] https://lists.kamailio.org/pipermail/sr-users/2018-March/100672.html

1 2

git:master:77beeb5d: core: new parameter kemi.event_route_callback
by Daniel-Constantin Mierla 19 Mar '18

19 Mar '18

Module: kamailio Branch: master Commit: 77beeb5d765119f46589a9d519123256fb8a9138 URL: https://github.com/kamailio/kamailio/commit/77beeb5d765119f46589a9d51912325… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-19T18:17:31+01:00 core: new parameter kemi.event_route_callback - set the name of kemi function to be executed for core event route equivalet - default value is not set (no callback function name). If set to "none", it is also not executed. - callback function receives a string parameter with the name of the event - execute kemi event callback for "core:worker-one-init" --- Modified: src/core/action.c Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/kemi.c Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/77beeb5d765119f46589a9d51912325… Patch: https://github.com/kamailio/kamailio/commit/77beeb5d765119f46589a9d51912325…

1 0

git:master:22bd6ca0: db_redis: Fix various pointer and memory issues
by Andreas Granig 19 Mar '18

19 Mar '18

Module: kamailio Branch: master Commit: 22bd6ca04dd20951a20aca77ec9a8cb46cdf73f9 URL: https://github.com/kamailio/kamailio/commit/22bd6ca04dd20951a20aca77ec9a8cb… Author: Andreas Granig <agranig(a)sipwise.com> Committer: Andreas Granig <agranig(a)sipwise.com> Date: 2018-03-19T17:42:39+01:00 db_redis: Fix various pointer and memory issues Issues discovered by coverity: * Fix mem leaks in error handling * Fix potential null pointer deref * Fix potential out-of-memory cases --- Modified: src/modules/db_redis/redis_connection.c Modified: src/modules/db_redis/redis_dbase.c Modified: src/modules/db_redis/redis_table.c --- Diff: https://github.com/kamailio/kamailio/commit/22bd6ca04dd20951a20aca77ec9a8cb… Patch: https://github.com/kamailio/kamailio/commit/22bd6ca04dd20951a20aca77ec9a8cb…

1 0

git:master:eda57ef9: modules: readme files regenerated - p_usrloc ... [skip ci]
by Kamailio Dev 18 Mar '18

18 Mar '18

Module: kamailio Branch: master Commit: eda57ef94bf79605d7b15fe50379913bf76f4fa5 URL: https://github.com/kamailio/kamailio/commit/eda57ef94bf79605d7b15fe50379913… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-03-18T11:17:06+01:00 modules: readme files regenerated - p_usrloc ... [skip ci] --- Modified: src/modules/p_usrloc/README Modified: src/modules/speeddial/README Modified: src/modules/uri_db/README --- Diff: https://github.com/kamailio/kamailio/commit/eda57ef94bf79605d7b15fe50379913… Patch: https://github.com/kamailio/kamailio/commit/eda57ef94bf79605d7b15fe50379913… --- diff --git a/src/modules/p_usrloc/README b/src/modules/p_usrloc/README index 5effbeab55..9256c22c57 100644 --- a/src/modules/p_usrloc/README +++ b/src/modules/p_usrloc/README @@ -687,8 +687,8 @@ modparam("p_usrloc", "db_mode", 2) databases. For that, if the table was not created by the installation script or you choose to install everything by yourself you can use the p_usrloc-create.sql SQL script in the database directories in the - openser/scripts folder as template. Database and table name can be set - with module parameters so they can be changed, but the name of the + utils/kamctl/mysql/ folder as template. Database and table name can be + set with module parameters so they can be changed, but the name of the columns must be as they are in the SQL script. You can also find the complete database documentation on the project webpage, https://www.kamailio.org/docs/db-tables/kamailio-db-devel.html. diff --git a/src/modules/speeddial/README b/src/modules/speeddial/README index 1711d7d968..be0efe4db5 100644 --- a/src/modules/speeddial/README +++ b/src/modules/speeddial/README @@ -126,7 +126,7 @@ Chapter 1. Admin Guide Example 1.1. Set db_url parameter ... -modparam("speeddial", "db_url", "mysql://openser:xxx@localhost/openser") +modparam("speeddial", "db_url", "mysql://kamailio:xxx@localhost/kamailio") ... 3.2. user_column (string) @@ -231,7 +231,7 @@ modparam("speeddial", "use_domain", 1) Example 1.9. sd_lookup usage ... -# 'speed_dial' is the default table name created by openser db script +# 'speed_dial' is the default table name created by kamailio db script if(uri=~"sip:[0-9]{2}@.*") sd_lookup("speed_dial"); # use auth username diff --git a/src/modules/uri_db/README b/src/modules/uri_db/README index b11772e641..589fba5b0a 100644 --- a/src/modules/uri_db/README +++ b/src/modules/uri_db/README @@ -125,7 +125,7 @@ Chapter 1. Admin Guide Example 1.1. Set db_url parameter ... -modparam("uri_db", "db_url", "mysql://username:password@localhost/openser") +modparam("uri_db", "db_url", "mysql://username:password@localhost/kamailio") ... 3.2. db_table (string)

1 0

git:master:ae1367bf: uri_db: updated database name in docs
by Daniel-Constantin Mierla 18 Mar '18

18 Mar '18

Module: kamailio Branch: master Commit: ae1367bf3a6706b9db742ff6e20e6d11f79d5b02 URL: https://github.com/kamailio/kamailio/commit/ae1367bf3a6706b9db742ff6e20e6d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-18T11:04:55+01:00 uri_db: updated database name in docs --- Modified: src/modules/uri_db/doc/uri_db_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ae1367bf3a6706b9db742ff6e20e6d1… Patch: https://github.com/kamailio/kamailio/commit/ae1367bf3a6706b9db742ff6e20e6d1… --- diff --git a/src/modules/uri_db/doc/uri_db_admin.xml b/src/modules/uri_db/doc/uri_db_admin.xml index bc7f08cbea..157f43ebf7 100644 --- a/src/modules/uri_db/doc/uri_db_admin.xml +++ b/src/modules/uri_db/doc/uri_db_admin.xml @@ -68,7 +68,7 @@ <title>Set <varname>db_url</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("uri_db", "db_url", "mysql://username:password@localhost/openser") +modparam("uri_db", "db_url", "mysql://username:password@localhost/kamailio") ... </programlisting> </example>

1 0

git:master:ea18525e: speeddial: updates to db url example
by Daniel-Constantin Mierla 18 Mar '18

18 Mar '18

Module: kamailio Branch: master Commit: ea18525e27120943204a75470855a35fbc8cc46a URL: https://github.com/kamailio/kamailio/commit/ea18525e27120943204a75470855a35… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-18T11:04:29+01:00 speeddial: updates to db url example --- Modified: src/modules/speeddial/doc/speeddial_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ea18525e27120943204a75470855a35… Patch: https://github.com/kamailio/kamailio/commit/ea18525e27120943204a75470855a35… --- diff --git a/src/modules/speeddial/doc/speeddial_admin.xml b/src/modules/speeddial/doc/speeddial_admin.xml index c8eb7e94c9..95cac01bd0 100644 --- a/src/modules/speeddial/doc/speeddial_admin.xml +++ b/src/modules/speeddial/doc/speeddial_admin.xml @@ -68,7 +68,7 @@ <title>Set <varname>db_url</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("speeddial", "db_url", "mysql://openser:xxx@localhost/openser") +modparam("speeddial", "db_url", "mysql://kamailio:xxx@localhost/kamailio") ... </programlisting> </example> @@ -242,7 +242,7 @@ modparam("speeddial", "use_domain", 1) <title><function>sd_lookup</function> usage</title> <programlisting format="linespecific"> ... -# 'speed_dial' is the default table name created by openser db script +# 'speed_dial' is the default table name created by kamailio db script if(uri=~"sip:[0-9]{2}@.*") sd_lookup("speed_dial"); # use auth username

1 0

git:master:6162a74a: rtpproxy: small updates to example cfg
by Daniel-Constantin Mierla 18 Mar '18

18 Mar '18

Module: kamailio Branch: master Commit: 6162a74ad858c6a7421f461cd1483cc8d69c12c1 URL: https://github.com/kamailio/kamailio/commit/6162a74ad858c6a7421f461cd1483cc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-18T11:03:58+01:00 rtpproxy: small updates to example cfg --- Modified: src/modules/rtpproxy/test/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/6162a74ad858c6a7421f461cd1483cc… Patch: https://github.com/kamailio/kamailio/commit/6162a74ad858c6a7421f461cd1483cc… --- diff --git a/src/modules/rtpproxy/test/kamailio.cfg b/src/modules/rtpproxy/test/kamailio.cfg index 0d5c73ff20..5dc6846a8e 100644 --- a/src/modules/rtpproxy/test/kamailio.cfg +++ b/src/modules/rtpproxy/test/kamailio.cfg @@ -87,12 +87,12 @@ modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") # The Port for incoming XML-RPC requests modparam("mi_xmlrpc", "port", 8000) # Method-Response: A single string parameter should be replied. -# See: http://www.openser.org/docs/modules/1.2.x/mi_xmlrpc.html#AEN102 +# See: http://www.kamailio.org/docs/modules/1.2.x/mi_xmlrpc.html#AEN102 modparam("mi_xmlrpc", "reply_option", 1) # The size of the Buffer used to create the XML-RPC-Request-Node modparam("mi_xmlrpc", "buffer_size", 8192) # The logfile for the xml-rpc server -# #modparam("mi_xmlrpc", "log_file", "/tmp/openser_xmlrpc") +# #modparam("mi_xmlrpc", "log_file", "/tmp/kamailio_xmlrpc") # ----------------- Settings for Dialog-Module --------------- # The Name of the Tag in the RR-Route-Header (default "did")

1 0

git:master:bb0940fd: cnxcc: updated application name in example
by Daniel-Constantin Mierla 18 Mar '18

18 Mar '18

Module: kamailio Branch: master Commit: bb0940fd01a0188bc82d0608ac054fec5715ac56 URL: https://github.com/kamailio/kamailio/commit/bb0940fd01a0188bc82d0608ac054fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-18T11:03:06+01:00 cnxcc: updated application name in example --- Modified: src/modules/cnxcc/example/kamailio-cnxcc.cfg --- Diff: https://github.com/kamailio/kamailio/commit/bb0940fd01a0188bc82d0608ac054fe… Patch: https://github.com/kamailio/kamailio/commit/bb0940fd01a0188bc82d0608ac054fe… --- diff --git a/src/modules/cnxcc/example/kamailio-cnxcc.cfg b/src/modules/cnxcc/example/kamailio-cnxcc.cfg index 2ecd8850e9..b0aa9c73df 100644 --- a/src/modules/cnxcc/example/kamailio-cnxcc.cfg +++ b/src/modules/cnxcc/example/kamailio-cnxcc.cfg @@ -110,7 +110,7 @@ #!ifdef WITH_MYSQL # - database URL - used to connect to database server by modules such # as: auth_db, acc, usrloc, a.s.o. -#!define DBURL "mysql://openser:openserrw@localhost/openser" +#!define DBURL "mysql://kamailio:kamailiorw@localhost/kamailio" #!endif #!ifdef WITH_MULTIDOMAIN # - the value for 'use_domain' parameters

1 0

git:master:a8827449: p_usrloc: updated path to db scripts in docs
by Daniel-Constantin Mierla 18 Mar '18

18 Mar '18

Module: kamailio Branch: master Commit: a8827449e4c3c43e3f25abb7f5b27b2e1d1ab1b7 URL: https://github.com/kamailio/kamailio/commit/a8827449e4c3c43e3f25abb7f5b27b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-18T11:03:37+01:00 p_usrloc: updated path to db scripts in docs --- Modified: src/modules/p_usrloc/doc/p_usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a8827449e4c3c43e3f25abb7f5b27b2… Patch: https://github.com/kamailio/kamailio/commit/a8827449e4c3c43e3f25abb7f5b27b2… --- diff --git a/src/modules/p_usrloc/doc/p_usrloc_admin.xml b/src/modules/p_usrloc/doc/p_usrloc_admin.xml index e716c8fb25..4bfe7672bb 100644 --- a/src/modules/p_usrloc/doc/p_usrloc_admin.xml +++ b/src/modules/p_usrloc/doc/p_usrloc_admin.xml @@ -737,7 +737,7 @@ modparam("p_usrloc", "db_mode", 2) For that, if the table was not created by the installation script or you choose to install everything by yourself you can use the p_usrloc-create.sql <acronym>SQL</acronym> script in the database directories in the - openser/scripts folder as template. + utils/kamctl/mysql/ folder as template. Database and table name can be set with module parameters so they can be changed, but the name of the columns must be as they are in the <acronym>SQL</acronym> script.

1 0

git:master:7228a9e4: auth_diameter: updated application name
by Daniel-Constantin Mierla 18 Mar '18

18 Mar '18

Module: kamailio Branch: master Commit: 7228a9e413f7d51411961b8ece7281ecf597a9e2 URL: https://github.com/kamailio/kamailio/commit/7228a9e413f7d51411961b8ece7281e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-18T11:02:36+01:00 auth_diameter: updated application name --- Modified: src/modules/auth_diameter/authorize.h --- Diff: https://github.com/kamailio/kamailio/commit/7228a9e413f7d51411961b8ece7281e… Patch: https://github.com/kamailio/kamailio/commit/7228a9e413f7d51411961b8ece7281e… --- diff --git a/src/modules/auth_diameter/authorize.h b/src/modules/auth_diameter/authorize.h index 7f4edaa146..c17b5ba9ec 100644 --- a/src/modules/auth_diameter/authorize.h +++ b/src/modules/auth_diameter/authorize.h @@ -39,7 +39,7 @@ typedef enum auth_diam_result { INVALID_PASSWORD, /*!< Invalid password */ USER_UNKNOWN, /*!< User non existant */ ERROR, /*!< Error occurred, a reply has been sent out, - return 0 to the openser core */ + return 0 to the kamailio core */ AUTHORIZED, /*!< Authorized. If returned by pre_auth, no digest authorization necessary */ DO_AUTHORIZATION, /*!< Can only be returned by pre_auth. */

1 0

git:master:04d5a6a0: tm: removed inline for exported functions to config
by Daniel-Constantin Mierla 18 Mar '18

18 Mar '18

Module: kamailio Branch: master Commit: 04d5a6a0ee8c230423b7bc7be0afe5d568fe8555 URL: https://github.com/kamailio/kamailio/commit/04d5a6a0ee8c230423b7bc7be0afe5d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-17T08:36:53+01:00 tm: removed inline for exported functions to config - they are assigned to a structure field, cannot be optimized for inline execution, avoid warnings in static analysis --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/04d5a6a0ee8c230423b7bc7be0afe5d… Patch: https://github.com/kamailio/kamailio/commit/04d5a6a0ee8c230423b7bc7be0afe5d…

1 0

[kamailio/kamailio] Kamailio + rsyslog, still writing logs to /var/log/syslog in DEBUG_MODE (#1070)
by Fyodor 17 Mar '18

17 Mar '18

Ubuntu 16.04.2 LTS version: kamailio 4.3.4 (x86_64/linux) /etc/kamailio/kamailio.cfg: ``` ### LOG Levels: 3=DBG, 2=INFO, 1=NOTICE, 0=WARN, -1=ERR #!ifdef WITH_DEBUG debug=4 log_stderror=yes #!else debug=2 log_stderror=no #!endif memdbg=5 memlog=5 log_facility=LOG_LOCAL0 ``` /etc/rsyslog.d/50-default.conf ``` local0.* -/var/log/kamailio.log ``` kamailio.log file ``` -rw-r--r-- 1 syslog adm 1788189 Apr 14 12:09 /var/log/kamailio.log ``` If i disable WITH_DEBUG in kamailio config - it writes log to /var/log/kamailio.log, if i enable it - kamailio write logs to /var/log/syslog. -- 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/issues/1070

4 5

git:master:3293b4f7: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 16 Mar '18

16 Mar '18

Module: kamailio Branch: master Commit: 3293b4f7ff087d53e22fe846c4b085ac954f13b5 URL: https://github.com/kamailio/kamailio/commit/3293b4f7ff087d53e22fe846c4b085a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-03-16T15:31:56+01:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/3293b4f7ff087d53e22fe846c4b085a… Patch: https://github.com/kamailio/kamailio/commit/3293b4f7ff087d53e22fe846c4b085a… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 6ea5b6f02a..b23140607a 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -108,7 +108,7 @@ Julien Chavanton 4.4. ds_next_dst() 4.5. ds_next_domain() 4.6. ds_mark_dst([state]) - 4.7. ds_list_exist(groupid) + 4.7. ds_list_exists(groupid) 4.8. ds_is_from_list([groupid [, mode [, uri] ] ]) 4.9. ds_load_update() 4.10. ds_load_unset() @@ -181,7 +181,7 @@ Julien Chavanton 1.40. ds_select_domain usage 1.41. ds_select usage 1.42. ds_mark_dst usage - 1.43. ds_list_exist usage + 1.43. ds_list_exists usage 1.44. ds_is_from_list usage 1.45. ds_load_unset usage 1.46. dispatcher list file @@ -244,7 +244,7 @@ Chapter 1. Admin Guide 4.4. ds_next_dst() 4.5. ds_next_domain() 4.6. ds_mark_dst([state]) - 4.7. ds_list_exist(groupid) + 4.7. ds_list_exists(groupid) 4.8. ds_is_from_list([groupid [, mode [, uri] ] ]) 4.9. ds_load_update() 4.10. ds_load_unset() @@ -912,7 +912,7 @@ end 4.4. ds_next_dst() 4.5. ds_next_domain() 4.6. ds_mark_dst([state]) - 4.7. ds_list_exist(groupid) + 4.7. ds_list_exists(groupid) 4.8. ds_is_from_list([groupid [, mode [, uri] ] ]) 4.9. ds_load_update() 4.10. ds_load_unset() @@ -1097,16 +1097,18 @@ failure_route[tryagain] { } ... -4.7. ds_list_exist(groupid) +4.7. ds_list_exists(groupid) + + Function alias: ds_list_exist(groupid) Check if a specific group is defined in dispatcher list or database. * groupid - A group ID to check. This function can be used from ANY_ROUTE. - Example 1.43. ds_list_exist usage + Example 1.43. ds_list_exists usage ... -if(ds_list_exist("10")) { +if(ds_list_exists("10")) { ... } ...

1 0

git:master:b02480d4: dispatcher: updated docs for ds_list_exists()
by Daniel-Constantin Mierla 16 Mar '18

16 Mar '18

Module: kamailio Branch: master Commit: b02480d48459b8cdcb13525e0cf74f820dbf4887 URL: https://github.com/kamailio/kamailio/commit/b02480d48459b8cdcb13525e0cf74f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-16T15:14:59+01:00 dispatcher: updated docs for ds_list_exists() --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b02480d48459b8cdcb13525e0cf74f8… Patch: https://github.com/kamailio/kamailio/commit/b02480d48459b8cdcb13525e0cf74f8… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 746a1f047d..33238ed2e7 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1302,11 +1302,14 @@ failure_route[tryagain] { </programlisting> </example> </section> - <section id="dispatcher.f.ds_list_exist"> + <section id="dispatcher.f.ds_list_exists"> <title> - <function moreinfo="none">ds_list_exist(groupid)</function> + <function moreinfo="none">ds_list_exists(groupid)</function> </title> <para> + Function alias: ds_list_exist(groupid) + </para> + <para> Check if a specific group is defined in dispatcher list or database. </para> @@ -1320,10 +1323,10 @@ failure_route[tryagain] { This function can be used from ANY_ROUTE. </para> <example> - <title><function>ds_list_exist</function> usage</title> + <title><function>ds_list_exists</function> usage</title> <programlisting format="linespecific"> ... -if(ds_list_exist("10")) { +if(ds_list_exists("10")) { ... } ...

1 0

git:master:39295cbb: dispatcher: added ds_list_exists() as alias to ds_list_exist()
by Daniel-Constantin Mierla 16 Mar '18

16 Mar '18

Module: kamailio Branch: master Commit: 39295cbb78f8395f63e89b2dfff87f0a72b6a3f9 URL: https://github.com/kamailio/kamailio/commit/39295cbb78f8395f63e89b2dfff87f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-16T15:13:14+01:00 dispatcher: added ds_list_exists() as alias to ds_list_exist() --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/39295cbb78f8395f63e89b2dfff87f0… Patch: https://github.com/kamailio/kamailio/commit/39295cbb78f8395f63e89b2dfff87f0… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 87669bbfb5..49b9396add 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -207,6 +207,8 @@ static cmd_export_t cmds[]={ fixup_ds_is_from_list, 0, ANY_ROUTE}, {"ds_list_exist", (cmd_function)w_ds_list_exist, 1, fixup_ds_list_exist, 0, ANY_ROUTE}, + {"ds_list_exists", (cmd_function)w_ds_list_exist, 1, + fixup_ds_list_exist, 0, ANY_ROUTE}, {"ds_load_unset", (cmd_function)w_ds_load_unset, 0, 0, 0, ANY_ROUTE}, {"ds_load_update", (cmd_function)w_ds_load_update, 0,

1 0

git:master:55ed25e1: dispatcher: exported more functions to kemi interface
by Daniel-Constantin Mierla 16 Mar '18

16 Mar '18

Module: kamailio Branch: master Commit: 55ed25e1413c2fa5340138b7703c73db1df967de URL: https://github.com/kamailio/kamailio/commit/55ed25e1413c2fa5340138b7703c73d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-16T15:12:29+01:00 dispatcher: exported more functions to kemi interface --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/55ed25e1413c2fa5340138b7703c73d… Patch: https://github.com/kamailio/kamailio/commit/55ed25e1413c2fa5340138b7703c73d…

1 0

git:master:41f41d6d: etc/kamailio.cfg: do not relay to foreign network if auth is not enabled
by Daniel-Constantin Mierla 15 Mar '18

15 Mar '18

Module: kamailio Branch: master Commit: 41f41d6d2850cdd5ab1a1b5d55bbb7ebd697ff7a URL: https://github.com/kamailio/kamailio/commit/41f41d6d2850cdd5ab1a1b5d55bbb7e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-15T08:55:22+01:00 etc/kamailio.cfg: do not relay to foreign network if auth is not enabled - anyone can use a local account and flood external systems --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/41f41d6d2850cdd5ab1a1b5d55bbb7e… Patch: https://github.com/kamailio/kamailio/commit/41f41d6d2850cdd5ab1a1b5d55bbb7e… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index eb46863d95..b55e06b0cc 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -750,6 +750,14 @@ route[AUTH] { exit; } +#!else + + # authentication not enabled - do not relay at all to foreign networks + if(uri!=myself) { + sl_send_reply("403","Not relaying"); + exit; + } + #!endif return; }

1 0

git:master:d81494ab: db_cassandra: another doxygen fix
by Henning Westerholt 14 Mar '18

14 Mar '18

Module: kamailio Branch: master Commit: d81494abea2780dae6106076be3ec549372ef30f URL: https://github.com/kamailio/kamailio/commit/d81494abea2780dae6106076be3ec54… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-14T22:30:00+01:00 db_cassandra: another doxygen fix --- Modified: src/modules/db_cassandra/dbcassa_base.cpp --- Diff: https://github.com/kamailio/kamailio/commit/d81494abea2780dae6106076be3ec54… Patch: https://github.com/kamailio/kamailio/commit/d81494abea2780dae6106076be3ec54… --- diff --git a/src/modules/db_cassandra/dbcassa_base.cpp b/src/modules/db_cassandra/dbcassa_base.cpp index 38e48a26e8..ab144bb7ce 100644 --- a/src/modules/db_cassandra/dbcassa_base.cpp +++ b/src/modules/db_cassandra/dbcassa_base.cpp @@ -134,7 +134,7 @@ oac::CassandraClient* dbcassa_open(struct db_id* id) /*! * \brief Create new DB connection structure - * \param db_id + * \param id database id */ void* db_cassa_new_connection(struct db_id* id) { @@ -597,7 +597,7 @@ ColumnVecPtr cassa_translate_query(const db1_con_t* _h, const db_key_t* _k, * * \param _cql_res handle for the CQLResult * \param _r result set for storage - * \param tbd cassandra database table + * \param tbc cassandra database table * \return zero on success, negative value on failure */ int cql_get_columns(oac::CqlResult& _cql_res, db1_res_t* _r, dbcassa_table_p tbc)

1 0

git:master:4525e056: db_mongodb: doxygen fixes
by Henning Westerholt 14 Mar '18

14 Mar '18

Module: kamailio Branch: master Commit: 4525e0562479496b7ff49a2a168fe452f3cdea4b URL: https://github.com/kamailio/kamailio/commit/4525e0562479496b7ff49a2a168fe45… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-14T22:28:22+01:00 db_mongodb: doxygen fixes --- Modified: src/modules/db_mongodb/mongodb_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/4525e0562479496b7ff49a2a168fe45… Patch: https://github.com/kamailio/kamailio/commit/4525e0562479496b7ff49a2a168fe45… --- diff --git a/src/modules/db_mongodb/mongodb_dbase.c b/src/modules/db_mongodb/mongodb_dbase.c index 72d6647689..91207973f1 100644 --- a/src/modules/db_mongodb/mongodb_dbase.c +++ b/src/modules/db_mongodb/mongodb_dbase.c @@ -504,6 +504,8 @@ int db_mongodb_get_columns(const db1_con_t* _h, db1_res_t* _r) * \brief Convert rows from mongodb to db API representation * \param _h database connection * \param _r database result set + * \param _row number of rows + * \param _rdoc binary json structure * \return 0 on success, negative on failure */ static int db_mongodb_convert_bson(const db1_con_t* _h, db1_res_t* _r,

1 0

git:master:7ec9dd32: db_unixodbc: doxygen fixes
by Henning Westerholt 14 Mar '18

14 Mar '18

Module: kamailio Branch: master Commit: 7ec9dd32fcd5454b7d9d584ec790a9a10af9d20a URL: https://github.com/kamailio/kamailio/commit/7ec9dd32fcd5454b7d9d584ec790a9a… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-14T21:55:20+01:00 db_unixodbc: doxygen fixes --- Modified: src/modules/db_unixodbc/list.c --- Diff: https://github.com/kamailio/kamailio/commit/7ec9dd32fcd5454b7d9d584ec790a9a… Patch: https://github.com/kamailio/kamailio/commit/7ec9dd32fcd5454b7d9d584ec790a9a… --- diff --git a/src/modules/db_unixodbc/list.c b/src/modules/db_unixodbc/list.c index 39adfb08bf..794351a8cc 100644 --- a/src/modules/db_unixodbc/list.c +++ b/src/modules/db_unixodbc/list.c @@ -98,7 +98,7 @@ int db_unixodbc_list_insert(list** start, list** link, int n, strn* value) /*! * \brief Destroy a list - * \param link list element(s) + * \param start start of the list element(s) */ void db_unixodbc_list_destroy(list *start) {

1 0

git:master:3071e888: db_flatstore: doxygen fixes
by Henning Westerholt 14 Mar '18

14 Mar '18

Module: kamailio Branch: master Commit: 3071e888bc279a691d9f896bbdd67df01a5f56ae URL: https://github.com/kamailio/kamailio/commit/3071e888bc279a691d9f896bbdd67df… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-14T21:59:24+01:00 db_flatstore: doxygen fixes --- Modified: src/modules/db_flatstore/flat_cmd.h --- Diff: https://github.com/kamailio/kamailio/commit/3071e888bc279a691d9f896bbdd67df… Patch: https://github.com/kamailio/kamailio/commit/3071e888bc279a691d9f896bbdd67df… --- diff --git a/src/modules/db_flatstore/flat_cmd.h b/src/modules/db_flatstore/flat_cmd.h index 2029b34185..7a35f9be55 100644 --- a/src/modules/db_flatstore/flat_cmd.h +++ b/src/modules/db_flatstore/flat_cmd.h @@ -55,12 +55,13 @@ struct flat_cmd { int flat_cmd(db_cmd_t* cmd); -/** The main execution function in flat SER driver. +/** The main execution function in the flat driver. * This is the main execution function in this driver. It is executed whenever * a SER module calls db_exec and the target database of the commands is * flatstore. * @param res A pointer to (optional) result structure if the command returns * a result. + * @param cmd database command structure * @retval 0 if executed successfully * @retval A negative number if the database server failed to execute command * @retval A positive number if there was an error on client side (SER)

1 0

git:master:cab20219: db_postgres: doxygen fixes
by Henning Westerholt 14 Mar '18

14 Mar '18

Module: kamailio Branch: master Commit: cab2021913eb597812bde529d697f931aa885e82 URL: https://github.com/kamailio/kamailio/commit/cab2021913eb597812bde529d697f93… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-14T21:46:26+01:00 db_postgres: doxygen fixes --- Modified: src/modules/db_postgres/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/cab2021913eb597812bde529d697f93… Patch: https://github.com/kamailio/kamailio/commit/cab2021913eb597812bde529d697f93… --- diff --git a/src/modules/db_postgres/km_dbase.c b/src/modules/db_postgres/km_dbase.c index b9c1115e19..ea9468295a 100644 --- a/src/modules/db_postgres/km_dbase.c +++ b/src/modules/db_postgres/km_dbase.c @@ -103,7 +103,7 @@ static void db_postgres_free_query(const db1_con_t *_con); /*! - * \brief Initialize database for future queries + * \brief Initialize database for future queries, with pooling * \param _url URL of the database that should be opened * \return database connection on success, NULL on error * \note this function must be called prior to any database functions @@ -114,8 +114,9 @@ db1_con_t *db_postgres_init(const str *_url) } /*! - * \brief Initialize database for future queries - no pooling + * \brief Initialize database for future queries, specify pooling * \param _url URL of the database that should be opened + * \param pooling whether or not to use a pooled connection * \return database connection on success, NULL on error * \note this function must be called prior to any database functions */ @@ -649,7 +650,7 @@ static pg_constraint_t *pg_constraint = NULL; /*! * \brief add/save a detected constraint to the list in memory - * \param pg_constraint_t constraint + * \param c database constraint structure */ static void db_postgres_constraint_add(pg_constraint_t *c) { @@ -930,6 +931,7 @@ int db_postgres_affected_rows(const db1_con_t *_h) /** * Starts a single transaction that will consist of one or more queries (SQL BEGIN) * \param _h database handle + * \param _l database locking , supports no locking, write locking or full locking * \return 0 on success, negative on failure */ int db_postgres_start_transaction(db1_con_t *_h, db_locking_t _l)

1 0

git:master:ab5b49a5: db_cassandra: doxygen fixes
by Henning Westerholt 14 Mar '18

14 Mar '18

Module: kamailio Branch: master Commit: ab5b49a54719813bfb5f6657dd5aea21c49ffc4d URL: https://github.com/kamailio/kamailio/commit/ab5b49a54719813bfb5f6657dd5aea2… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-14T21:51:50+01:00 db_cassandra: doxygen fixes --- Modified: src/modules/db_cassandra/dbcassa_base.cpp --- Diff: https://github.com/kamailio/kamailio/commit/ab5b49a54719813bfb5f6657dd5aea2… Patch: https://github.com/kamailio/kamailio/commit/ab5b49a54719813bfb5f6657dd5aea2… --- diff --git a/src/modules/db_cassandra/dbcassa_base.cpp b/src/modules/db_cassandra/dbcassa_base.cpp index 873cef2d89..38e48a26e8 100644 --- a/src/modules/db_cassandra/dbcassa_base.cpp +++ b/src/modules/db_cassandra/dbcassa_base.cpp @@ -75,7 +75,8 @@ struct cassa_con { /*! * \brief Open connection to Cassandra cluster - * \param db_id + * \param id database id + * \return zero on succes */ oac::CassandraClient* dbcassa_open(struct db_id* id) { @@ -179,7 +180,7 @@ void* db_cassa_new_connection(struct db_id* id) /*! * \brief Close Cassandra connection - * \param CassandraConnection + * \param con Cassandra connection */ void dbcassa_close(oac::CassandraClient* con) { @@ -190,7 +191,7 @@ void dbcassa_close(oac::CassandraClient* con) /*! * \brief Close the connection and release memory - * \param connection + * \param con connection structure */ void db_cassa_free_connection(struct pool_con* con) { @@ -205,7 +206,7 @@ void db_cassa_free_connection(struct pool_con* con) /*! * \brief Reconnect to Cassandra cluster - * \param connection + * \param con connection structure */ void dbcassa_reconnect(struct cassa_con* con) { @@ -596,6 +597,7 @@ ColumnVecPtr cassa_translate_query(const db1_con_t* _h, const db_key_t* _k, * * \param _cql_res handle for the CQLResult * \param _r result set for storage + * \param tbd cassandra database table * \return zero on success, negative value on failure */ int cql_get_columns(oac::CqlResult& _cql_res, db1_res_t* _r, dbcassa_table_p tbc)

1 0

git:master:841ae832: db_berkeley: doxygen fixes
by Henning Westerholt 14 Mar '18

14 Mar '18

Module: kamailio Branch: master Commit: 841ae83233634e8c33c102d0b1684923758136f7 URL: https://github.com/kamailio/kamailio/commit/841ae83233634e8c33c102d0b168492… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-14T21:34:15+01:00 db_berkeley: doxygen fixes --- Modified: src/modules/db_berkeley/bdb_cmd.c Modified: src/modules/db_berkeley/bdb_cmd.h --- Diff: https://github.com/kamailio/kamailio/commit/841ae83233634e8c33c102d0b168492… Patch: https://github.com/kamailio/kamailio/commit/841ae83233634e8c33c102d0b168492… --- diff --git a/src/modules/db_berkeley/bdb_cmd.c b/src/modules/db_berkeley/bdb_cmd.c index 0b5c062ac5..142d86f39c 100644 --- a/src/modules/db_berkeley/bdb_cmd.c +++ b/src/modules/db_berkeley/bdb_cmd.c @@ -61,6 +61,11 @@ static void bdb_cmd_free(db_cmd_t *cmd, bdb_cmd_t *payload) pkg_free(payload); } +/** Prepare a query + * @param cmd DB command structure + * @param bcmd berkey DB command structure + * @return 0 on success, -1 on error + */ int bdb_prepare_query(db_cmd_t *cmd, bdb_cmd_t *bcmd) { bdb_tcache_t *tbc = NULL; @@ -189,6 +194,12 @@ int bdb_prepare_query(db_cmd_t *cmd, bdb_cmd_t *bcmd) return -1; } +/** + * Execute a query + * @param cmd DB command structure + * @param bcmd Berkely DB command structure + * @return 0 on success, -1 on error + */ int bdb_query(db_cmd_t *cmd, bdb_cmd_t *bcmd) { DBT key; diff --git a/src/modules/db_berkeley/bdb_cmd.h b/src/modules/db_berkeley/bdb_cmd.h index 19705cb7ba..dcf5ca4e45 100644 --- a/src/modules/db_berkeley/bdb_cmd.h +++ b/src/modules/db_berkeley/bdb_cmd.h @@ -68,6 +68,7 @@ typedef struct _bdb_cmd * structure in cmd parameter. * @param cmd A generic db_cmd structure to which the newly created bdb_cmd * structure will be attached. + * @return 0 on success, -1 on error */ int bdb_cmd(db_cmd_t *cmd); @@ -78,6 +79,7 @@ int bdb_cmd(db_cmd_t *cmd); * ldap. * @param res A pointer to (optional) result structure if the command returns * a result. + * @param cmd DB command structure * @retval 0 if executed successfully * @retval A negative number if the database server failed to execute command * @retval A positive number if there was an error on client side (SER)

1 0

git:master:f15eeabc: db_mysql: doxygen fixes
by Henning Westerholt 14 Mar '18

14 Mar '18

Module: kamailio Branch: master Commit: f15eeabc2a219a3ee5bc966115add50de977ff85 URL: https://github.com/kamailio/kamailio/commit/f15eeabc2a219a3ee5bc966115add50… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-14T21:33:45+01:00 db_mysql: doxygen fixes --- Modified: src/modules/db_mysql/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/f15eeabc2a219a3ee5bc966115add50… Patch: https://github.com/kamailio/kamailio/commit/f15eeabc2a219a3ee5bc966115add50… --- diff --git a/src/modules/db_mysql/km_dbase.c b/src/modules/db_mysql/km_dbase.c index aa960f4963..693d510bcf 100644 --- a/src/modules/db_mysql/km_dbase.c +++ b/src/modules/db_mysql/km_dbase.c @@ -541,6 +541,8 @@ int db_mysql_update(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _o, * \param _k key names * \param _v values of the keys that must match * \param _n number of key=value pairs + * \param _un unused for db_mysql + * \param _m unused for db_mysql * \return zero on success, negative value on failure */ int db_mysql_replace(const db1_con_t* _h, const db_key_t* _k, @@ -584,6 +586,7 @@ int db_mysql_affected_rows(const db1_con_t* _h) /** * Starts a single transaction that will consist of one or more queries (SQL BEGIN) * \param _h database handle + * \param _l database locking , supports no locking or full locking * \return 0 on success, negative on failure */ int db_mysql_start_transaction(db1_con_t* _h, db_locking_t _l)

1 0

git:master:9aedcb54: lib srdb1: small fix/extension in README
by Henning Westerholt 14 Mar '18

14 Mar '18

Module: kamailio Branch: master Commit: 9aedcb548037a34b61a37ebe3e9baeb9755c9c49 URL: https://github.com/kamailio/kamailio/commit/9aedcb548037a34b61a37ebe3e9baeb… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-14T21:29:04+01:00 lib srdb1: small fix/extension in README --- Modified: src/lib/srdb1/README --- Diff: https://github.com/kamailio/kamailio/commit/9aedcb548037a34b61a37ebe3e9baeb… Patch: https://github.com/kamailio/kamailio/commit/9aedcb548037a34b61a37ebe3e9baeb… --- diff --git a/src/lib/srdb1/README b/src/lib/srdb1/README index b710ca4065..a7f50d095b 100644 --- a/src/lib/srdb1/README +++ b/src/lib/srdb1/README @@ -1,5 +1,9 @@ This directory contains the generic database support interface - db1. The interface should be used by all modules willing to communicate with a database. Kamailio can then switch from one database to another simply by loading a different -database support module. Directory example contains a very simple example -how to use the interface. Directory doc contains the API documentation. +database support module. For documentation please have a look to doxygen +comments in the respective header files. + +The directory schema contains the XML structure for the different databases +definitions. Please use this structure, don't add SQL files for table +definitions directly.

1 0

git:master:1f180628: modules: readme files regenerated - tmx ... [skip ci]
by Kamailio Dev 14 Mar '18

14 Mar '18

Module: kamailio Branch: master Commit: 1f180628c9817442cecd3219ac6be0dc2fc88da2 URL: https://github.com/kamailio/kamailio/commit/1f180628c9817442cecd3219ac6be0d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-03-14T17:46:30+01:00 modules: readme files regenerated - tmx ... [skip ci] --- Modified: src/modules/tmx/README --- Diff: https://github.com/kamailio/kamailio/commit/1f180628c9817442cecd3219ac6be0d… Patch: https://github.com/kamailio/kamailio/commit/1f180628c9817442cecd3219ac6be0d…

1 0

git:master:dc283864: tmx: added t_flush_xflags() function
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: master Commit: dc2838649343f1a75cd4443ae3004f0916ea7068 URL: https://github.com/kamailio/kamailio/commit/dc2838649343f1a75cd4443ae3004f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T17:36:59+01:00 tmx: added t_flush_xflags() function --- Modified: src/modules/tmx/tmx_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/dc2838649343f1a75cd4443ae3004f0… Patch: https://github.com/kamailio/kamailio/commit/dc2838649343f1a75cd4443ae3004f0… --- diff --git a/src/modules/tmx/tmx_mod.c b/src/modules/tmx/tmx_mod.c index 770fcc20bf..2a703362d6 100644 --- a/src/modules/tmx/tmx_mod.c +++ b/src/modules/tmx/tmx_mod.c @@ -67,6 +67,7 @@ static int t_reply_callid(sip_msg_t* msg, char *cid, char *cseq, static int fixup_reply_callid(void** param, int param_no); static int t_flush_flags(sip_msg_t* msg, char*, char* ); +static int t_flush_xflags(sip_msg_t* msg, char *, char *); static int w_t_is_failure_route(sip_msg_t* msg, char*, char* ); static int w_t_is_branch_route(sip_msg_t* msg, char*, char* ); static int w_t_is_reply_route(sip_msg_t* msg, char*, char*); @@ -176,6 +177,8 @@ static cmd_export_t cmds[]={ fixup_reply_callid, 0, ANY_ROUTE }, {"t_flush_flags", (cmd_function)t_flush_flags, 0, 0, 0, ANY_ROUTE }, + {"t_flush_xflags", (cmd_function)t_flush_xflags, 0, 0, + 0, ANY_ROUTE }, {"t_is_failure_route", (cmd_function)w_t_is_failure_route, 0, 0, 0, ANY_ROUTE }, {"t_is_branch_route", (cmd_function)w_t_is_branch_route, 0, 0, @@ -589,6 +592,33 @@ static int t_flush_flags(sip_msg_t* msg, char *foo, char *bar) return ki_t_flush_flags(msg); } +/** + * + */ +static int ki_t_flush_xflags(sip_msg_t* msg) +{ + tm_cell_t *t; + + t=_tmx_tmb.t_gett(); + if ( t==0 || t==T_UNDEFINED) { + LM_ERR("failed to flush flags - no transaction found\n"); + return -1; + } + + memcpy(t->uas.request->xflags, msg->xflags, + KSR_XFLAGS_SIZE * sizeof(flag_t)); + return 1; +} + +/** + * + */ +static int t_flush_xflags(sip_msg_t* msg, char *foo, char *bar) +{ + return ki_t_flush_xflags(msg); +} + + /** * */ @@ -1036,6 +1066,11 @@ static sr_kemi_t sr_kemi_tmx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("tmx"), str_init("t_flush_xflags"), + SR_KEMIP_INT, ki_t_flush_xflags, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("tmx"), str_init("t_cancel_branches"), SR_KEMIP_INT, ki_t_cancel_branches, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:32102e43: tmx: documentation for t_flush_xflags() function
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: master Commit: 32102e43272f8c101121e5edb94b7e5077d985a9 URL: https://github.com/kamailio/kamailio/commit/32102e43272f8c101121e5edb94b7e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T17:36:59+01:00 tmx: documentation for t_flush_xflags() function --- Modified: src/modules/tmx/doc/tmx_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/32102e43272f8c101121e5edb94b7e5… Patch: https://github.com/kamailio/kamailio/commit/32102e43272f8c101121e5edb94b7e5… --- diff --git a/src/modules/tmx/doc/tmx_admin.xml b/src/modules/tmx/doc/tmx_admin.xml index b767197537..9f6168bb0f 100644 --- a/src/modules/tmx/doc/tmx_admin.xml +++ b/src/modules/tmx/doc/tmx_admin.xml @@ -223,6 +223,27 @@ if (t_reply_callid("123qaz", "5", "458", "Replied remotely")) { ... t_flush_flags(); ... +</programlisting> + </example> + </section> + <section id="tmx.f.t_flush_xflags"> + <title> + <function moreinfo="none">t_flush_xflags()</function> + </title> + <para> + Flush the extended flags from current SIP message into the already created + transaction. It make sense only in routing block if the transaction was + created via t_newtran() and the extended flags have been altered since. + </para> + <para> + This function can be used from ANY_ROUTE . + </para> + <example> + <title><function>t_flush_xflags</function> usage</title> + <programlisting format="linespecific"> +... +t_flush_xflags(); +... </programlisting> </example> </section>

1 0

INFO: Relevant fixes in the last releases
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Hello, I want to highlight that the last stable versions (for the latest 3 release series: 4.4, 5.0 and 5.1) include fixes for two issues that can crash a running instance of Kamailio, therefore it is strongly recommended to upgrade if you are using tmx or lcr modules. Next week a CVE report is going to be created with more details about one of these issues. The issues were reported privately, one by security researchers and one by a community member, and were fixed quickly. The code related to the reported issues is rather old (few years by now) and there are no known incidents of exploiting these issues so far. However, once the CVE report comes public, there could be a higher risk of exploitation. Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - April 16-18, 2018, Berlin - www.asipto.com Kamailio World Conference - May 14-16, 2018 - www.kamailioworld.com

1 0

[kamailio/kamailio] auth_ephemeral.so: undefined symbol: EVP_sha512 (#1473)
by marcinkowalczyk 14 Mar '18

14 Mar '18

Hi, I'm trying to get auth_empheral working on kamailio 5.1.2, but it fails to load `load_module(): could not open module </usr/lib/x86_64-linux-gnu/kamailio/modules/auth_ephemeral.so>: /usr/lib/x86_64-linux-gnu/kamailio/modules/auth_ephemeral.so: undefined symbol: EVP_sha512` Tried to compile from source and install from kamailio-autheph-modules 5.1.2+xenial and it fails with same error. Regards -- 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/issues/1473

5 18

git:master:137c3db3: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 14 Mar '18

14 Mar '18

Module: kamailio Branch: master Commit: 137c3db340b1e4139b6ddb444a220ce5928b2191 URL: https://github.com/kamailio/kamailio/commit/137c3db340b1e4139b6ddb444a220ce… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-03-14T13:16:24+01:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/137c3db340b1e4139b6ddb444a220ce… Patch: https://github.com/kamailio/kamailio/commit/137c3db340b1e4139b6ddb444a220ce… --- diff --git a/src/modules/corex/README b/src/modules/corex/README index eeb318498b..2b15a51aab 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -48,6 +48,9 @@ Muhammad Shahzad Shafi 4.8. msg_iflag_is_set(flagname) 4.9. file_read(fpath, var) 4.10. file_write(fpath, content) + 4.11. setxflag(flag) + 4.12. isxflagset(flag) + 4.13. resetxflag(flag) 5. RPC Commands @@ -79,8 +82,11 @@ Muhammad Shahzad Shafi 1.11. msg_iflag_is_set usage 1.12. file_read usage 1.13. file_write usage - 1.14. event_route[network:msg] use cases - 1.15. Sample PERL code for do_compress and do_uncompress + 1.14. setxflag usage + 1.15. isxflagset usage + 1.16. resetxflag usage + 1.17. event_route[network:msg] use cases + 1.18. Sample PERL code for do_compress and do_uncompress Chapter 1. Admin Guide @@ -111,6 +117,9 @@ Chapter 1. Admin Guide 4.8. msg_iflag_is_set(flagname) 4.9. file_read(fpath, var) 4.10. file_write(fpath, content) + 4.11. setxflag(flag) + 4.12. isxflagset(flag) + 4.13. resetxflag(flag) 5. RPC Commands @@ -240,6 +249,9 @@ modparam("corex", "msg_avp", "$avp(msg)") 4.8. msg_iflag_is_set(flagname) 4.9. file_read(fpath, var) 4.10. file_write(fpath, content) + 4.11. setxflag(flag) + 4.12. isxflagset(flag) + 4.13. resetxflag(flag) 4.1. append_branch([ uri, [ q ] ]) @@ -386,6 +398,57 @@ if(file_read("/tmp/data.txt", "$var(data)")) { ... } if(file_write("/tmp/data.txt", "Data is: $var(data)")) { ... } ... +4.11. setxflag(flag) + + Set the extended message (transaction) flag. + + Meaning of the parameters is as follows: + * flag - the index of the flag to be set. Can be integer or + pseudo-variable with integer value (range 0-63). + + This function can be used from ANY_ROUTE. + + Example 1.14. setxflag usage +... +setxflag("1"); +... +$var(flag) = 11; +setxflag("$var(flag)"); +... + +4.12. isxflagset(flag) + + Return true of the extended message (transaction) flag is set. + + Meaning of the parameters is as follows: + * flag - the index of the flag to be tested. Can be integer or + pseudo-variable with integer value (range 0-63). + + This function can be used from ANY_ROUTE. + + Example 1.15. isxflagset usage +... +if(isxflagset("1")) +{ + ... +} +... + +4.13. resetxflag(flag) + + Reset the extended message (transaction) flag. + + Meaning of the parameters is as follows: + * flag - the index of the flag to be reset. Can be integer or + pseudo-variable with integer value (range 0-63). + + This function can be used from ANY_ROUTE. + + Example 1.16. resetxflag usage +... +resetxflag("1"); +... + 5. RPC Commands 5.1. corex.debug @@ -520,7 +583,7 @@ if(file_write("/tmp/data.txt", "Data is: $var(data)")) { ... } Next is a basic usage example where encoding and decoding is done using PERL, - Example 1.14. event_route[network:msg] use cases + Example 1.17. event_route[network:msg] use cases ... loadmodule "app_perl.so" loadmodule "corex.so" @@ -551,7 +614,7 @@ event_route[network:msg] { } ... - Example 1.15. Sample PERL code for do_compress and do_uncompress + Example 1.18. Sample PERL code for do_compress and do_uncompress ... use strict; use warnings;

1 0

git:master:fd20e46b: corex: documentation for xflags management functions
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: master Commit: fd20e46b280535753b9bf1b32da80a637a8fea26 URL: https://github.com/kamailio/kamailio/commit/fd20e46b280535753b9bf1b32da80a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T13:03:48+01:00 corex: documentation for xflags management functions --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fd20e46b280535753b9bf1b32da80a6… Patch: https://github.com/kamailio/kamailio/commit/fd20e46b280535753b9bf1b32da80a6… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 0df7d12cf9..f401c3e022 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -409,6 +409,93 @@ if(file_write("/tmp/data.txt", "Data is: $var(data)")) { ... } </programlisting> </example> </section> + <section id="corex.f.setxflag"> + <title><function moreinfo="none">setxflag(flag)</function></title> + <para> + Set the extended message (transaction) flag. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>flag</emphasis> - the index of the flag to + be set. Can be integer or pseudo-variable with integer value + (range 0-63). + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>setxflag</function> usage</title> + <programlisting format="linespecific"> +... +setxflag("1"); +... +$var(flag) = 11; +setxflag("$var(flag)"); +... +</programlisting> + </example> + </section> + <section id="corex.f.isxflagset"> + <title><function moreinfo="none">isxflagset(flag)</function></title> + <para> + Return true of the extended message (transaction) flag is set. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>flag</emphasis> - the index of the flag to + be tested. Can be integer or pseudo-variable with integer value + (range 0-63). + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>isxflagset</function> usage</title> + <programlisting format="linespecific"> +... +if(isxflagset("1")) +{ + ... +} +... +</programlisting> + </example> + </section> + <section id="corex.f.resetxflag"> + <title><function moreinfo="none">resetxflag(flag)</function></title> + <para> + Reset the extended message (transaction) flag. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>flag</emphasis> - the index of the flag to + be reset. Can be integer or pseudo-variable with integer value + (range 0-63). + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>resetxflag</function> usage</title> + <programlisting format="linespecific"> +... +resetxflag("1"); +... +</programlisting> + </example> + </section> </section>

1 0

git:master:63fc16e7: corex: functions to manage extended flags
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: master Commit: 63fc16e77ade9c682ec8489269517f4a5e77a999 URL: https://github.com/kamailio/kamailio/commit/63fc16e77ade9c682ec8489269517f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T13:02:16+01:00 corex: functions to manage extended flags - setxflag(idx), resetxflag(idx), isxflagset(idx) - idx can be between 0 and 63 - requested via GH #1288 --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/63fc16e77ade9c682ec8489269517f4… Patch: https://github.com/kamailio/kamailio/commit/63fc16e77ade9c682ec8489269517f4… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 58a87e0c48..d80004dd05 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -46,6 +46,9 @@ static int w_msg_iflag_reset(sip_msg_t *msg, char *pflag, char *p2); static int w_msg_iflag_is_set(sip_msg_t *msg, char *pflag, char *p2); static int w_file_read(sip_msg_t *msg, char *fn, char *vn); static int w_file_write(sip_msg_t *msg, char *fn, char *vn); +static int w_isxflagset(struct sip_msg *msg, char *flag, str *s2); +static int w_resetxflag(struct sip_msg *msg, char *flag, str *s2); +static int w_setxflag(struct sip_msg *msg, char *flag, char *s2); static int fixup_file_op(void** param, int param_no); @@ -91,6 +94,12 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE }, {"file_write", (cmd_function)w_file_write, 2, fixup_spve_spve, 0, ANY_ROUTE }, + {"setxflag", (cmd_function)w_setxflag, 1,fixup_igp_null, + 0, ANY_ROUTE }, + {"resetxflag", (cmd_function)w_resetxflag, 1,fixup_igp_null, + 0, ANY_ROUTE }, + {"isxflagset", (cmd_function)w_isxflagset, 1,fixup_igp_null, + 0, ANY_ROUTE }, {0, 0, 0, 0, 0, 0} }; @@ -462,6 +471,75 @@ static int ki_append_branch_uri_q(sip_msg_t *msg, str *uri, str *q) return 1; } +/** + * + */ +static int ki_isxflagset(sip_msg_t *msg, int fval) +{ + if((flag_t)fval>KSR_MAX_XFLAG) + return -1; + return isxflagset(msg, (flag_t)fval); +} + +/** + * + */ +static int w_isxflagset(sip_msg_t *msg, char *flag, str *s2) +{ + int fval=0; + if(fixup_get_ivalue(msg, (gparam_t*)flag, &fval)!=0) { + LM_ERR("no flag value\n"); + return -1; + } + return ki_isxflagset(msg, fval); +} + +/** + * + */ +static int ki_resetxflag(sip_msg_t *msg, int fval) +{ + if((flag_t)fval>KSR_MAX_XFLAG) + return -1; + return resetxflag(msg, (flag_t)fval); +} + +/** + * + */ +static int w_resetxflag(sip_msg_t *msg, char *flag, str *s2) +{ + int fval=0; + if(fixup_get_ivalue(msg, (gparam_t*)flag, &fval)!=0) { + LM_ERR("no flag value\n"); + return -1; + } + return ki_resetxflag(msg, fval); +} + +/** + * + */ +static int ki_setxflag(sip_msg_t *msg, int fval) +{ + if((flag_t)fval>KSR_MAX_XFLAG) + return -1; + return setxflag(msg, (flag_t)fval); +} + +/** + * + */ +static int w_setxflag(sip_msg_t *msg, char *flag, char *s2) +{ + int fval=0; + if(fixup_get_ivalue(msg, (gparam_t*)flag, &fval)!=0) { + LM_ERR("no flag value\n"); + return -1; + } + return ki_setxflag(msg, fval); +} + /** * */ @@ -482,6 +560,21 @@ static sr_kemi_t sr_kemi_corex_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("corex"), str_init("setxflag"), + SR_KEMIP_INT, ki_setxflag, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("corex"), str_init("resetxflag"), + SR_KEMIP_INT, ki_resetxflag, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("corex"), str_init("isxflagset"), + SR_KEMIP_INT, ki_isxflagset, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; @@ -494,4 +587,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_corex_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:0aae6381: core: added xflags field to sip_msg_t
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: master Commit: 0aae63818588952280e901ea2c529cb936ce5cf6 URL: https://github.com/kamailio/kamailio/commit/0aae63818588952280e901ea2c529cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T13:00:23+01:00 core: added xflags field to sip_msg_t - holds extended flags - 64 new flags in addition to the old 32 flags --- Modified: src/core/flags.c Modified: src/core/flags.h Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/0aae63818588952280e901ea2c529cb… Patch: https://github.com/kamailio/kamailio/commit/0aae63818588952280e901ea2c529cb… --- diff --git a/src/core/flags.c b/src/core/flags.c index 5dbdd4ffbc..043824895f 100644 --- a/src/core/flags.c +++ b/src/core/flags.c @@ -317,5 +317,42 @@ static int fixup_t_flag(void** param, int param_no) return E_CFG; } +/** + * + */ +int setxflag(struct sip_msg* msg, flag_t flag) +{ + uint32_t fi; + uint32_t fb; + fi = flag / (sizeof(flag_t)*CHAR_BIT); + fb = flag % (sizeof(flag_t)*CHAR_BIT); + msg->xflags[fi] |= 1 << fb; + return 1; +} + +/** + * + */ +int resetxflag(struct sip_msg* msg, flag_t flag) +{ + uint32_t fi; + uint32_t fb; + fi = flag / (sizeof(flag_t)*CHAR_BIT); + fb = flag % (sizeof(flag_t)*CHAR_BIT); + msg->xflags[fi] &= ~ (1 << fb); + return 1; +} + +/** + * + */ +int isxflagset(struct sip_msg* msg, flag_t flag) +{ + uint32_t fi; + uint32_t fb; + fi = flag / (sizeof(flag_t)*CHAR_BIT); + fb = flag % (sizeof(flag_t)*CHAR_BIT); + return (msg->xflags[fi] & (1<<fb)) ? 1 : -1; +} #endif diff --git a/src/core/flags.h b/src/core/flags.h index 3876082472..e1186dbf79 100644 --- a/src/core/flags.h +++ b/src/core/flags.h @@ -34,6 +34,10 @@ enum { FL_WHITE=1, FL_YELLOW, FL_GREEN, FL_RED, FL_BLUE, FL_MAGENTA, typedef unsigned int flag_t; +#define KSR_XFLAGS_SIZE 2 +#define KSR_MAX_XFLAG \ + ((unsigned int)(KSR_XFLAGS_SIZE * sizeof(flag_t) * CHAR_BIT - 1 )) + #define MAX_FLAG ((unsigned int)( sizeof(flag_t) * CHAR_BIT - 1 )) struct sip_msg; @@ -43,6 +47,10 @@ int resetflag( struct sip_msg* msg, flag_t flag ); int isflagset( struct sip_msg* msg, flag_t flag ); +int setxflag(struct sip_msg* msg, flag_t flag); +int resetxflag(struct sip_msg* msg, flag_t flag); +int isxflagset(struct sip_msg* msg, flag_t flag); + /* Script flag functions. Script flags are global flags that keep their * value regardless of the SIP message being processed. */ diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 41e6deeb33..9270e0bba9 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -359,6 +359,7 @@ typedef struct sip_msg { to avoid unnecessary calculations */ unsigned int msg_flags; /*!< internal flags used by core */ flag_t flags; /*!< config flags */ + flag_t xflags[KSR_XFLAGS_SIZE]; /*!< config extended flags */ str set_global_address; str set_global_port; struct socket_info* force_send_socket; /*!< force sending on this socket */

1 0

git:5.1:3994fcd9: misc/examples/kemi: enable lua script reload in example config
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: 5.1 Commit: 3994fcd94e1d3291f4d14083f12b85a3b11ca148 URL: https://github.com/kamailio/kamailio/commit/3994fcd94e1d3291f4d14083f12b85a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T11:26:07+01:00 misc/examples/kemi: enable lua script reload in example config (cherry picked from commit e129965129b2377970a28fabd26b3be9b483c81b) --- Modified: misc/examples/kemi/kamailio-basic-kemi.cfg --- Diff: https://github.com/kamailio/kamailio/commit/3994fcd94e1d3291f4d14083f12b85a… Patch: https://github.com/kamailio/kamailio/commit/3994fcd94e1d3291f4d14083f12b85a… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi.cfg b/misc/examples/kemi/kamailio-basic-kemi.cfg index 8fe3616da2..507b7afa12 100644 --- a/misc/examples/kemi/kamailio-basic-kemi.cfg +++ b/misc/examples/kemi/kamailio-basic-kemi.cfg @@ -360,6 +360,7 @@ cfgengine "python" #!else #!ifdef WITH_CFGLUA +modparam("app_lua", "reload", 1) modparam("app_lua", "load", "/usr/local/etc/kamailio/kamailio-basic-kemi-lua.lua") cfgengine "lua" #!else

1 0

git:5.1:5df0d505: auth_ephemeral: do pkg-config for libcrypto if exists
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: 5.1 Commit: 5df0d505d220addf43f459b29cc80f9aecef19dc URL: https://github.com/kamailio/kamailio/commit/5df0d505d220addf43f459b29cc80f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T11:26:17+01:00 auth_ephemeral: do pkg-config for libcrypto if exists - discover all the libs to link against - related to GH #1473 (cherry picked from commit 021e7e53585f78b56356c98f25bd731c51f96f9a) --- Modified: src/modules/auth_ephemeral/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/5df0d505d220addf43f459b29cc80f9… Patch: https://github.com/kamailio/kamailio/commit/5df0d505d220addf43f459b29cc80f9… --- diff --git a/src/modules/auth_ephemeral/Makefile b/src/modules/auth_ephemeral/Makefile index 6701ee9e23..5c066502af 100644 --- a/src/modules/auth_ephemeral/Makefile +++ b/src/modules/auth_ephemeral/Makefile @@ -11,6 +11,14 @@ SSL_BUILDER=$(shell \ if pkg-config --exists libssl; then \ echo 'pkg-config libssl'; \ fi) + +ifneq ($(SSL_BUILDER),) +SSL_BUILDER+=$(shell \ + if pkg-config --exists libcrypto; then \ + echo 'libcrypto'; \ + fi) +endif + endif ifneq ($(SSL_BUILDER),)

1 0

git:5.1:2f66b1df: nathelper: docs - mention UDP for SIP nat pinging contact addresses
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: 5.1 Commit: 2f66b1dfe12455534f94060a0f68bc3f8ac0f81d URL: https://github.com/kamailio/kamailio/commit/2f66b1dfe12455534f94060a0f68bc3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T11:25:37+01:00 nathelper: docs - mention UDP for SIP nat pinging contact addresses (cherry picked from commit 82efea41d7a01c041ea6ff85cc864cfdf2fd1ba5) --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2f66b1dfe12455534f94060a0f68bc3… Patch: https://github.com/kamailio/kamailio/commit/2f66b1dfe12455534f94060a0f68bc3… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index 513c48400e..3fc540c23d 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -70,7 +70,7 @@ <listitem> <para> <emphasis>SIP request</emphasis> - a stateless SIP request is - sent to the contact address. + sent to the UDP contact address. </para> <itemizedlist> <listitem>

1 0

git:5.1:26c623ee: core: small improvements to help text
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: 5.1 Commit: 26c623ee6ffe35098c5edc109a16711cc487204a URL: https://github.com/kamailio/kamailio/commit/26c623ee6ffe35098c5edc109a16711… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T11:25:27+01:00 core: small improvements to help text (cherry picked from commit 31e21ff23a0d8bff1f7a88a56aa4ab01d93e2cf3) --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/26c623ee6ffe35098c5edc109a16711… Patch: https://github.com/kamailio/kamailio/commit/26c623ee6ffe35098c5edc109a16711… --- diff --git a/src/main.c b/src/main.c index 9366884ac7..144b8ffb92 100644 --- a/src/main.c +++ b/src/main.c @@ -197,11 +197,11 @@ Options:\n\ -M nr Size of private memory allocated, in Megabytes\n\ -w dir Change the working directory to \"dir\" (default: \"/\")\n\ -t dir Chroot to \"dir\"\n\ - -u uid Change uid \n\ - -g gid Change gid \n\ + -u uid Change uid (user id)\n\ + -g gid Change gid (group id)\n\ -P file Create a pid file\n\ -G file Create a pgid file\n\ - -Y dir Runtime dir\n\ + -Y dir Runtime dir path\n\ -O nr Script optimization level (debugging option)\n\ -a mode Auto aliases mode: enable with yes or on,\n\ disable with no or off\n\ @@ -211,7 +211,7 @@ Options:\n\ -X name Specify internal manager for private memory (pkg)\n\ - if omitted, the one for shm is used\n" #ifdef STATS -" -s file File to which statistics is dumped (disabled otherwise)\n" +" -s file File where to write internal statistics on SIGUSR1\n" #endif ;

1 0

git:5.1:63c93af1: db_mongodb: add error logger for failed query
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: 5.1 Commit: 63c93af189e7e5db92a392e0d176e71bda64290e URL: https://github.com/kamailio/kamailio/commit/63c93af189e7e5db92a392e0d176e71… Author: kelchy <kelchy(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T11:24:06+01:00 db_mongodb: add error logger for failed query (cherry picked from commit 2a5d66fda013197aa5fbe4828cc7f6e61a74a9d6) --- Modified: src/modules/db_mongodb/mongodb_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/63c93af189e7e5db92a392e0d176e71… Patch: https://github.com/kamailio/kamailio/commit/63c93af189e7e5db92a392e0d176e71… --- diff --git a/src/modules/db_mongodb/mongodb_dbase.c b/src/modules/db_mongodb/mongodb_dbase.c index b1c9ac2bb7..aee5a1ba0a 100644 --- a/src/modules/db_mongodb/mongodb_dbase.c +++ b/src/modules/db_mongodb/mongodb_dbase.c @@ -753,6 +753,7 @@ static int db_mongodb_store_result(const db1_con_t* _h, db1_res_t** _r) km_mongodb_con_t *mgcon; db_mongodb_result_t *mgres; const bson_t *itdoc; + bson_error_t error; mgcon = MONGODB_CON(_h); if(!_r) { @@ -777,7 +778,11 @@ static int db_mongodb_store_result(const db1_con_t* _h, db1_res_t** _r) if(!mongoc_cursor_more (mgres->cursor) || !mongoc_cursor_next (mgres->cursor, &itdoc) || !itdoc) { - LM_DBG("no result from mongodb\n"); + if (mongoc_cursor_error (mgres->cursor, &error)) { + LM_DBG("An error occurred: %s\n", error.message); + } else { + LM_DBG("no result from mongodb\n"); + } return 0; } /* first document linked internally in result to get columns */

1 0

git:5.1:5f5f2638: db_mongodb: check mongo-c-driver version at least 1.5.0 to use projection
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: 5.1 Commit: 5f5f2638b50e079717952b5b279529e7647ce684 URL: https://github.com/kamailio/kamailio/commit/5f5f2638b50e079717952b5b279529e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T11:24:35+01:00 db_mongodb: check mongo-c-driver version at least 1.5.0 to use projection - reported by GH #1479 (cherry picked from commit cdbee5a536920c4fab3ec619c8467c152d6f110a) --- Modified: src/modules/db_mongodb/mongodb_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/5f5f2638b50e079717952b5b279529e… Patch: https://github.com/kamailio/kamailio/commit/5f5f2638b50e079717952b5b279529e… --- diff --git a/src/modules/db_mongodb/mongodb_dbase.c b/src/modules/db_mongodb/mongodb_dbase.c index aee5a1ba0a..72d6647689 100644 --- a/src/modules/db_mongodb/mongodb_dbase.c +++ b/src/modules/db_mongodb/mongodb_dbase.c @@ -316,7 +316,9 @@ int db_mongodb_get_columns(const db1_con_t* _h, db1_res_t* _r) int col; db_mongodb_result_t *mgres; bson_iter_t riter; +#if MONGOC_CHECK_VERSION(1, 5, 0) bson_iter_t titer; +#endif bson_iter_t citer; bson_t *cdoc; const char *colname; @@ -360,6 +362,7 @@ int db_mongodb_get_columns(const db1_con_t* _h, db1_res_t* _r) } if(cdocproj == 1) { +#if MONGOC_CHECK_VERSION(1, 5, 0) if (!bson_iter_init (&titer, cdoc)) { LM_ERR("failed to initialize columns iterator\n"); return -3; @@ -373,6 +376,12 @@ int db_mongodb_get_columns(const db1_con_t* _h, db1_res_t* _r) LM_ERR("failed to init projection iterator\n"); return -3; } +#else + if (!bson_iter_init (&citer, cdoc)) { + LM_ERR("failed to initialize columns iterator\n"); + return -3; + } +#endif } else { if (!bson_iter_init (&citer, cdoc)) { LM_ERR("failed to initialize columns iterator\n"); @@ -506,7 +515,9 @@ static int db_mongodb_convert_bson(const db1_con_t* _h, db1_res_t* _r, const char *colname; bson_type_t coltype; bson_iter_t riter; +#if MONGOC_CHECK_VERSION(1, 5, 0) bson_iter_t titer; +#endif bson_iter_t citer; bson_iter_t *piter; db_val_t* dval; @@ -527,6 +538,7 @@ static int db_mongodb_convert_bson(const db1_con_t* _h, db1_res_t* _r, } } else { cdoc = (bson_t*)mgres->colsdoc; +#if MONGOC_CHECK_VERSION(1, 5, 0) if (!bson_iter_init (&titer, cdoc)) { LM_ERR("failed to initialize columns iterator\n"); return -3; @@ -540,6 +552,12 @@ static int db_mongodb_convert_bson(const db1_con_t* _h, db1_res_t* _r, LM_ERR("failed to init projection iterator\n"); return -3; } +#else + if (!bson_iter_init (&citer, cdoc)) { + LM_ERR("failed to initialize columns iterator\n"); + return -3; + } +#endif } if(mgres->colsdoc) { @@ -864,7 +882,9 @@ int db_mongodb_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op km_mongodb_con_t *mgcon; mongoc_client_t *client; bson_t *seldoc = NULL; +#if MONGOC_CHECK_VERSION(1, 5, 0) bson_t bcols; +#endif char *cname; char b1; char *jstr; @@ -944,23 +964,31 @@ int db_mongodb_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op LM_ERR("cannot initialize columns bson document\n"); goto error; } +#if MONGOC_CHECK_VERSION(1, 5, 0) if(!bson_append_document_begin (mgcon->colsdoc, "projection", 10, &bcols)) { LM_ERR("failed to start projection of fields\n"); goto error; } +#endif for(i = 0; i < _nc; i++) { +#if MONGOC_CHECK_VERSION(1, 5, 0) if(!bson_append_int32(&bcols, _c[i]->s, _c[i]->len, 1)) +#else + if(!bson_append_int32(mgcon->colsdoc, _c[i]->s, _c[i]->len, 1)) +#endif { LM_ERR("failed to append int to columns bson %.*s = %d [%d]\n", _c[i]->len, _c[i]->s, 1, i); goto error; } } +#if MONGOC_CHECK_VERSION(1, 5, 0) if(!bson_append_document_end (mgcon->colsdoc, &bcols)) { LM_ERR("failed to end projection of fields\n"); goto error; } +#endif if(is_printable(L_DBG)) { jstr = bson_as_json (mgcon->colsdoc, NULL); LM_DBG("columns filter: %s\n", jstr);

1 0

git:5.1:01338702: app_jsdt Minor update to documentation
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: 5.1 Commit: 01338702bac81a9b53d72c4415f37aa4483ce865 URL: https://github.com/kamailio/kamailio/commit/01338702bac81a9b53d72c4415f37aa… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T11:23:38+01:00 app_jsdt Minor update to documentation (cherry picked from commit 7b0ad6b1a11687d035d4be92202ae1379f07fb20) --- Modified: src/modules/app_jsdt/doc/app_jsdt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/01338702bac81a9b53d72c4415f37aa… Patch: https://github.com/kamailio/kamailio/commit/01338702bac81a9b53d72c4415f37aa… --- diff --git a/src/modules/app_jsdt/doc/app_jsdt_admin.xml b/src/modules/app_jsdt/doc/app_jsdt_admin.xml index 47f50bda92..d4fd89d377 100644 --- a/src/modules/app_jsdt/doc/app_jsdt_admin.xml +++ b/src/modules/app_jsdt/doc/app_jsdt_admin.xml @@ -17,15 +17,16 @@ <section> <title>Overview</title> <para> - This module allows executing JavaScript scripts from config file. + This module allows executing JavaScript scripts from the Kamailio + configuration file. It exports all KEMI functions to JavaScript in order to access the - current processed SIP message. These functions are within JavaScript - object 'KSR'. + currently processed SIP message. These functions are named within + the JavaScript object 'KSR'. </para> <para> - It includes the Duktape JavaScript engine (http://www.duktape.org), - which is a fast and easy to embed JavaScript interpreter. Exported API - from SIP router to JavaScript is documented in the dokuwiki. + The module is based on the Duktape JavaScript engine (http://www.duktape.org), + which is a fast and easy to embed JavaScript interpreter. The exported API + from Kamailio to JavaScript is documented in the wiki. </para> <para> The module has two JavaScript contexts: @@ -116,7 +117,7 @@ modparam("app_jsdt", "load", "/usr/local/etc/kamailio/js/myscript.js") <function moreinfo="none">jsdt_dofile(path)</function> </title> <para> - Execute the JS script stored in 'path'. The parameter can be + Execute the JavaScript script stored in 'path'. The parameter can be a string with pseudo-variables evaluated at runtime. </para> <example> @@ -134,7 +135,7 @@ jsdt_dofile("/usr/local/etc/kamailio/js/myscript.js"); <function moreinfo="none">jsdt_dostring(script)</function> </title> <para> - Execute the Lua script stored in parameter. The parameter can be + Execute the JavaScript script stored in parameter. The parameter can be a string with pseudo-variables. </para> <example> @@ -248,7 +249,7 @@ if(!jsdt_runstring('KSR.dbg("Hello World from $fU\n")')) <section> <title>Example of usage</title> <para> - Create your JS script and stored on file system, + Create your JS script and store it on the file system, say: '/usr/local/etc/kamailio/js/myscript.js'. </para> <programlisting format="linespecific">

1 0

git:5.1:6275646d: core: invoke KEMI ksr_onsend_route()
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: 5.1 Commit: 6275646db39c9c6b48eb4afffd1e71b89ea3e504 URL: https://github.com/kamailio/kamailio/commit/6275646db39c9c6b48eb4afffd1e71b… Author: AntonyA <ascanio.alba7(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T11:23:18+01:00 core: invoke KEMI ksr_onsend_route() This will invoke ksr_onsend_route() unconditionally in the cfgengine. (cherry picked from commit 4494b60c430f5e5c6a3a3eb4c025f206a9c3a1f7) --- Modified: src/core/onsend.h --- Diff: https://github.com/kamailio/kamailio/commit/6275646db39c9c6b48eb4afffd1e71b… Patch: https://github.com/kamailio/kamailio/commit/6275646db39c9c6b48eb4afffd1e71b… --- diff --git a/src/core/onsend.h b/src/core/onsend.h index a2e8f569fd..16ea5ce17c 100644 --- a/src/core/onsend.h +++ b/src/core/onsend.h @@ -70,7 +70,9 @@ static inline int run_onsend(sip_msg_t* orig_msg, dest_info_t* dst, return 1; } ret=1; - if (onsend_rt.rlist[DEFAULT_RT]){ + // do if onsend_route{} or cfgengine exists + keng = sr_kemi_eng_get(); + if (onsend_rt.rlist[DEFAULT_RT] || keng){ onsnd_info.to=&dst->to; onsnd_info.send_sock=dst->send_sock; onsnd_info.buf=buf; @@ -86,8 +88,7 @@ static inline int run_onsend(sip_msg_t* orig_msg, dest_info_t* dst, orig_msg->fwd_send_flags=dst->send_flags; /* intial value */ init_run_actions_ctx(&ra_ctx); - keng = sr_kemi_eng_get(); - if(unlikely(keng!=NULL)) { + if(keng) { bctx = sr_kemi_act_ctx_get(); sr_kemi_act_ctx_set(&ra_ctx); ret=keng->froute(orig_msg, ONSEND_ROUTE, NULL, NULL);

1 0

git:5.1:20fa560d: async: docs - some improvements to examples
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: 5.1 Commit: 20fa560da4868eb454c064baad397975d25c4098 URL: https://github.com/kamailio/kamailio/commit/20fa560da4868eb454c064baad39797… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T11:22:46+01:00 async: docs - some improvements to examples (cherry picked from commit 15731d40ff1af78bf568d19bdbe4704d35931afd) --- Modified: src/modules/async/doc/async_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/20fa560da4868eb454c064baad39797… Patch: https://github.com/kamailio/kamailio/commit/20fa560da4868eb454c064baad39797… --- diff --git a/src/modules/async/doc/async_admin.xml b/src/modules/async/doc/async_admin.xml index f7de934bdb..d829679b2d 100644 --- a/src/modules/async/doc/async_admin.xml +++ b/src/modules/async/doc/async_admin.xml @@ -10,9 +10,9 @@  <chapter> - + <title>&adminguide;</title> - + <section> <title>Overview</title> <para> @@ -24,7 +24,7 @@ </para> <para> Note that after invoking the asynchronous operation, the processing - will continue later in another application process. Therefore variables + will continue later in another application process. Therefore variables stored in private memory should not be used, try to use shared memory if you want to get values after the processing is resumed (e.g., $avp(...), $xavp(...), $shv(...), htable $sht(...)). @@ -72,7 +72,7 @@ <title><varname>workers</varname> (int)</title> <para> Number of worker processes to be started to handle the asynchronous - tasks for async_route() and async_sleep(). + tasks for async_route() and async_sleep(). </para> <para> <emphasis> @@ -124,8 +124,11 @@ modparam("async", "workers", 2) <title><function>async_route</function> usage</title> <programlisting format="linespecific"> ... -async_route("RESUME", "4"); -... +request_route { + ... + async_route("RESUME", "4"); + ... +} route[RESUME] { send_reply("404", "Not found"); exit; @@ -184,7 +187,7 @@ exit; <title><function>async_workers</function> usage</title> <programlisting format="linespecific"> ... -; Enable 8 worker processes used by async and other modules +# Enable 8 worker processes used by async and other modules async_workers=8 ... </programlisting> @@ -212,8 +215,11 @@ async_workers=8 <title><function>async_task_route</function> usage</title> <programlisting format="linespecific"> ... -async_task_route("RESUME"); -... +request_route { + ... + async_task_route("RESUME"); + ... +} route[RESUME] { t_relay(); exit; @@ -224,4 +230,3 @@ route[RESUME] { </section> </section> </chapter> -

1 0

git:5.1:6e2ab808: kamctl: set default PID_FILE to /var/run/kamailio/kamailio.pid
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: 5.1 Commit: 6e2ab8089fd4d4b3ca0a23e240765474e6648b3c URL: https://github.com/kamailio/kamailio/commit/6e2ab8089fd4d4b3ca0a23e24076547… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T11:23:01+01:00 kamctl: set default PID_FILE to /var/run/kamailio/kamailio.pid - this being now the path used by default kamailio options (cherry picked from commit 6abd8472b764f88c5c054becb440fda8fff47349) --- Modified: utils/kamctl/kamctl.base Modified: utils/kamctl/kamctlrc --- Diff: https://github.com/kamailio/kamailio/commit/6e2ab8089fd4d4b3ca0a23e24076547… Patch: https://github.com/kamailio/kamailio/commit/6e2ab8089fd4d4b3ca0a23e24076547… --- diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index eb8ab554b7..641449422c 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -101,7 +101,7 @@ fi ##### ------------------------------------------------ ##### ### configuration for starting/stopping kamailio if [ -z "$PID_FILE" ] ; then - PID_FILE=/var/run/kamailio.pid + PID_FILE=/var/run/kamailio/kamailio.pid fi if [ -z "$SYSLOG" ] ; then SYSLOG=1 # 0=output to console, 1=output to syslog diff --git a/utils/kamctl/kamctlrc b/utils/kamctl/kamctlrc index 836290a5b8..d6e927fe84 100644 --- a/utils/kamctl/kamctlrc +++ b/utils/kamctl/kamctlrc @@ -154,7 +154,7 @@ # STORE_PLAINTEXT_PW=0 ## Kamailio START Options -## PID file path - default is: /var/run/kamailio.pid +## PID file path - default is: /var/run/kamailio/kamailio.pid # PID_FILE=/var/run/kamailio/kamailio.pid ## Extra start options - default is: not set

1 0

git:5.1:63aca341: db_text: small updates to sample config used in docs
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: 5.1 Commit: 63aca341454d29c5820a3cbd055fc19ad0c2e5d4 URL: https://github.com/kamailio/kamailio/commit/63aca341454d29c5820a3cbd055fc19… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T11:22:33+01:00 db_text: small updates to sample config used in docs (cherry picked from commit 7738461dda1595ee71cbda47bd129e3f13ebc77d) --- Modified: src/modules/db_text/doc/db_text.cfg --- Diff: https://github.com/kamailio/kamailio/commit/63aca341454d29c5820a3cbd055fc19… Patch: https://github.com/kamailio/kamailio/commit/63aca341454d29c5820a3cbd055fc19… --- diff --git a/src/modules/db_text/doc/db_text.cfg b/src/modules/db_text/doc/db_text.cfg index 83fd09990f..8c94d7c56a 100644 --- a/src/modules/db_text/doc/db_text.cfg +++ b/src/modules/db_text/doc/db_text.cfg @@ -1,12 +1,11 @@ # -# $Id$ # # simple quick-start config script with dbtext # # ----------- global configuration parameters ------------------------ -#debug=9 # debug level (cmd line: -dddddddddd) +#debug=3 # debug level (cmd line: -ddd) #fork=yes #log_stderror=no # (cmd line: -E) @@ -30,7 +29,7 @@ loadmodule "modules/maxfwd/maxfwd.so" loadmodule "modules/usrloc/usrloc.so" loadmodule "modules/registrar/registrar.so" loadmodule "modules/textops/textops.so" -loadmodule "modules/textops/mi_fifo.so" +loadmodule "modules/jonrpcs/jsonrpcs.so" # modules for digest authentication loadmodule "modules/auth/auth.so" @@ -38,15 +37,11 @@ loadmodule "modules/auth_db/auth_db.so" # ----------------- setting module-specific parameters --------------- -# -- mi_fifo params -- - -modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo") - # -- usrloc params -- # use dbtext database for persistent storage modparam("usrloc", "db_mode", 2) -modparam("usrloc|auth_db", "db_url", "dbtext:///tmp/openserdb") +modparam("usrloc|auth_db", "db_url", "db_text:///tmp/kamailiodb") # -- auth params -- #

1 0

git:5.1:48c8f775: app_perl: do dlerror() after dlsym() fails to find exports
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: 5.1 Commit: 48c8f7751d701c8a6dd538280c5c1fa6129d141d URL: https://github.com/kamailio/kamailio/commit/48c8f7751d701c8a6dd538280c5c1fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T11:21:56+01:00 app_perl: do dlerror() after dlsym() fails to find exports - some OSes do not reset dlerror after a successful dlsym(), pointing to an older error case - reported by GH #1465 (cherry picked from commit 795edca9215391f7c8f646895c083f8ac8853341) --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/48c8f7751d701c8a6dd538280c5c1fa… Patch: https://github.com/kamailio/kamailio/commit/48c8f7751d701c8a6dd538280c5c1fa… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 8a195fc12d..f04d486908 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -619,6 +619,9 @@ int load_module(char* mod_path) } exp = (union module_exports_u*)dlsym(handle, "exports"); if(exp==NULL) { + error =(char*)dlerror(); + LM_DBG("attempt to lookup exports structure failed - dlerror: %s\n", + (error)?error:"none"); /* 'exports' structure not found, look up for '_modulename_exports' */ mdir = strrchr(mod_path, '/'); if (!mdir) {

1 0

git:5.1:289eb374: core: check return of dlsym() before dlerror() handling
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: 5.1 Commit: 289eb37432bfc61855234893daa6be27d40f8788 URL: https://github.com/kamailio/kamailio/commit/289eb37432bfc61855234893daa6be2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T11:21:17+01:00 core: check return of dlsym() before dlerror() handling - cope with the case when dlerror is not reset by dlsym - related to GH #1465 (cherry picked from commit 045d44762ce7cd267e64849c1c138d45b1fa040f) --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/289eb37432bfc61855234893daa6be2… Patch: https://github.com/kamailio/kamailio/commit/289eb37432bfc61855234893daa6be2… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 594f3d6af8..8a195fc12d 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -630,11 +630,14 @@ int load_module(char* mod_path) if(expref.len>3 && strcmp(expref.s+expref.len-3, ".so")==0) expref.len -= 3; snprintf(exbuf, 62, "_%.*s_exports", expref.len, expref.s); - exp = (union module_exports_u*)dlsym(handle, exbuf); LM_DBG("looking up exports with name: %s\n", exbuf); - if ( (error =(char*)dlerror())!=0 ){ - LM_ERR("%s\n", error); - goto error1; + exp = (union module_exports_u*)dlsym(handle, exbuf); + if(exp==NULL) { + if ( (error =(char*)dlerror())!=0 ){ + LM_ERR("failure for exports symbol: %s - dlerror: %s\n", + exbuf, error); + goto error1; + } } } /* hack to allow for kamailio style dlflags inside exports */

1 0

git:master:021e7e53: auth_ephemeral: do pkg-config for libcrypto if exists
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: master Commit: 021e7e53585f78b56356c98f25bd731c51f96f9a URL: https://github.com/kamailio/kamailio/commit/021e7e53585f78b56356c98f25bd731… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T11:15:51+01:00 auth_ephemeral: do pkg-config for libcrypto if exists - discover all the libs to link against - related to GH #1473 --- Modified: src/modules/auth_ephemeral/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/021e7e53585f78b56356c98f25bd731… Patch: https://github.com/kamailio/kamailio/commit/021e7e53585f78b56356c98f25bd731… --- diff --git a/src/modules/auth_ephemeral/Makefile b/src/modules/auth_ephemeral/Makefile index 6701ee9e23..5c066502af 100644 --- a/src/modules/auth_ephemeral/Makefile +++ b/src/modules/auth_ephemeral/Makefile @@ -11,6 +11,14 @@ SSL_BUILDER=$(shell \ if pkg-config --exists libssl; then \ echo 'pkg-config libssl'; \ fi) + +ifneq ($(SSL_BUILDER),) +SSL_BUILDER+=$(shell \ + if pkg-config --exists libcrypto; then \ + echo 'libcrypto'; \ + fi) +endif + endif ifneq ($(SSL_BUILDER),)

1 0

git:master:e1299651: misc/examples/kemi: enable lua script reload in example config
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: master Commit: e129965129b2377970a28fabd26b3be9b483c81b URL: https://github.com/kamailio/kamailio/commit/e129965129b2377970a28fabd26b3be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T10:02:18+01:00 misc/examples/kemi: enable lua script reload in example config --- Modified: misc/examples/kemi/kamailio-basic-kemi.cfg --- Diff: https://github.com/kamailio/kamailio/commit/e129965129b2377970a28fabd26b3be… Patch: https://github.com/kamailio/kamailio/commit/e129965129b2377970a28fabd26b3be… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi.cfg b/misc/examples/kemi/kamailio-basic-kemi.cfg index 8fe3616da2..507b7afa12 100644 --- a/misc/examples/kemi/kamailio-basic-kemi.cfg +++ b/misc/examples/kemi/kamailio-basic-kemi.cfg @@ -360,6 +360,7 @@ cfgengine "python" #!else #!ifdef WITH_CFGLUA +modparam("app_lua", "reload", 1) modparam("app_lua", "load", "/usr/local/etc/kamailio/kamailio-basic-kemi-lua.lua") cfgengine "lua" #!else

1 0

git:master:29c637c3: memcached module: several doxygen parameter fixes
by Henning Westerholt 13 Mar '18

13 Mar '18

Module: kamailio Branch: master Commit: 29c637c3b3018f5e326c6f6af956ade665b72860 URL: https://github.com/kamailio/kamailio/commit/29c637c3b3018f5e326c6f6af956ade… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-13T23:36:42+01:00 memcached module: several doxygen parameter fixes --- Modified: src/modules/memcached/memcached.c --- Diff: https://github.com/kamailio/kamailio/commit/29c637c3b3018f5e326c6f6af956ade… Patch: https://github.com/kamailio/kamailio/commit/29c637c3b3018f5e326c6f6af956ade…

1 0

git:master:bb5abe0d: ims_dialog module: several doxygen fixes
by Henning Westerholt 13 Mar '18

13 Mar '18

Module: kamailio Branch: master Commit: bb5abe0dd4774dfa990242509f96d04bbd8aacbc URL: https://github.com/kamailio/kamailio/commit/bb5abe0dd4774dfa990242509f96d04… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-13T23:04:06+01:00 ims_dialog module: several doxygen fixes --- Modified: src/modules/ims_dialog/dlg_handlers.c Modified: src/modules/ims_dialog/dlg_handlers.h Modified: src/modules/ims_dialog/dlg_hash.c Modified: src/modules/ims_dialog/dlg_hash.h Modified: src/modules/ims_dialog/dlg_profile.c Modified: src/modules/ims_dialog/dlg_profile.h Modified: src/modules/ims_dialog/dlg_timer.c Modified: src/modules/ims_dialog/dlg_timer.h --- Diff: https://github.com/kamailio/kamailio/commit/bb5abe0dd4774dfa990242509f96d04… Patch: https://github.com/kamailio/kamailio/commit/bb5abe0dd4774dfa990242509f96d04…

1 0

git:master:0e96fbca: prefix_route module: small doxygen group fix
by Henning Westerholt 13 Mar '18

13 Mar '18

Module: kamailio Branch: master Commit: 0e96fbca8e6a8fdb2edb56ea336b76d4b25e4666 URL: https://github.com/kamailio/kamailio/commit/0e96fbca8e6a8fdb2edb56ea336b76d… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-13T22:36:09+01:00 prefix_route module: small doxygen group fix --- Modified: src/modules/prefix_route/prefix_route.c --- Diff: https://github.com/kamailio/kamailio/commit/0e96fbca8e6a8fdb2edb56ea336b76d… Patch: https://github.com/kamailio/kamailio/commit/0e96fbca8e6a8fdb2edb56ea336b76d… --- diff --git a/src/modules/prefix_route/prefix_route.c b/src/modules/prefix_route/prefix_route.c index 6256b63811..8878a880aa 100644 --- a/src/modules/prefix_route/prefix_route.c +++ b/src/modules/prefix_route/prefix_route.c @@ -26,8 +26,10 @@ * \ingroup prefix_route */ -/*! \defgroup prefix_route +/*! \defgroup prefix_route Prefix routing module + * \ingroup modules * The prefix_route module does routing based on a set of prefixes from the database. + * @{ */ @@ -385,3 +387,5 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) sr_kemi_modules_add(sr_kemi_prefix_route_exports); return 0; } + +/** @} */

1 0

git:master:a214112b: dns module: small doxygen group fix
by Henning Westerholt 13 Mar '18

13 Mar '18

Module: kamailio Branch: master Commit: a214112bc90024ec15e79c9edf0eda678c7ff8e2 URL: https://github.com/kamailio/kamailio/commit/a214112bc90024ec15e79c9edf0eda6… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-13T22:35:09+01:00 dns module: small doxygen group fix --- Modified: src/modules/dnssec/dnssec_func.c --- Diff: https://github.com/kamailio/kamailio/commit/a214112bc90024ec15e79c9edf0eda6… Patch: https://github.com/kamailio/kamailio/commit/a214112bc90024ec15e79c9edf0eda6… --- diff --git a/src/modules/dnssec/dnssec_func.c b/src/modules/dnssec/dnssec_func.c index 1486f4e9e5..5918add437 100644 --- a/src/modules/dnssec/dnssec_func.c +++ b/src/modules/dnssec/dnssec_func.c @@ -22,12 +22,11 @@ */ /*! * \brief DNSsec support - * \ingroup DNSsec * \author mariuszbi(a)gmail.com */ /*! * \defgroup DNSsec DNS security extensions support - * + * @{ */ @@ -153,3 +152,4 @@ dnssec_res_search(const char *dname, int class_h, int type_h, return -1; } +/*! @} */

1 0

git:master:064c6a84: jsonrpcs module: small doxygen group fix
by Henning Westerholt 13 Mar '18

13 Mar '18

Module: kamailio Branch: master Commit: 064c6a846d3cac3ab4f325ffbea7c0c0b94deb34 URL: https://github.com/kamailio/kamailio/commit/064c6a846d3cac3ab4f325ffbea7c0c… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-13T22:35:38+01:00 jsonrpcs module: small doxygen group fix --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/064c6a846d3cac3ab4f325ffbea7c0c… Patch: https://github.com/kamailio/kamailio/commit/064c6a846d3cac3ab4f325ffbea7c0c… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index 633847fc9d..98d66cc5cb 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -50,18 +50,18 @@ #include "jsonrpcs_mod.h" +/** @file + * + * This is the main file of jsonrpc-s module which contains all the functions + * related to http processing, as well as the module interface. + */ + /** @addtogroup jsonrpc-s * @ingroup modules - * @{ * * <h1>Overview of Operation</h1> * This module provides jsonrpc over http server implementation. - */ - -/** @file - * - * This is the main file of jsonrpc-s module which contains all the functions - * related to http processing, as well as the module interface. + * @{ */ MODULE_VERSION @@ -1495,3 +1495,5 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) sr_kemi_modules_add(sr_kemi_jsonrpcs_exports); return 0; } + +/** @} */

1 0

git:master:4c001cf6: textops module: small doxygen grouping fix
by Henning Westerholt 13 Mar '18

13 Mar '18

Module: kamailio Branch: master Commit: 4c001cf6c2c00de3c64b56207fba3394109b447d URL: https://github.com/kamailio/kamailio/commit/4c001cf6c2c00de3c64b56207fba339… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-13T22:34:49+01:00 textops module: small doxygen grouping fix --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/4c001cf6c2c00de3c64b56207fba339… Patch: https://github.com/kamailio/kamailio/commit/4c001cf6c2c00de3c64b56207fba339… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 05f0c69f30..f18c450efc 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -28,7 +28,7 @@ */ /** - * @defgroup Textops Various text operatoins on messages + * @defgroup textops Various text operations on messages * @brief Kamailio textops module */

1 0

git:master:88fb9344: utils module: small doxygen fix
by Henning Westerholt 13 Mar '18

13 Mar '18

Module: kamailio Branch: master Commit: 88fb9344c4ca946fba872b269d4c44fce330f06a URL: https://github.com/kamailio/kamailio/commit/88fb9344c4ca946fba872b269d4c44f… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-13T22:13:50+01:00 utils module: small doxygen fix --- Modified: src/modules/utils/utils.c --- Diff: https://github.com/kamailio/kamailio/commit/88fb9344c4ca946fba872b269d4c44f… Patch: https://github.com/kamailio/kamailio/commit/88fb9344c4ca946fba872b269d4c44f… --- diff --git a/src/modules/utils/utils.c b/src/modules/utils/utils.c index 026eb239ef..f9c0b6e720 100644 --- a/src/modules/utils/utils.c +++ b/src/modules/utils/utils.c @@ -28,8 +28,8 @@ * \ingroup utils */ -/*! \defgroup Utils Kamailio :: Various utilities - * +/*! \defgroup utils Kamailio :: Various utilities + * @{ */ @@ -471,3 +471,5 @@ static struct mi_root* forward_fifo_proxy(struct mi_root* cmd_tree, void* param) return init_mi_tree(200, MI_OK_S, MI_OK_LEN); } #endif + +/** @} */

1 0

git:master:5a3bce67: topos module: a few doxygen fixes
by Henning Westerholt 13 Mar '18

13 Mar '18

Module: kamailio Branch: master Commit: 5a3bce67345f10cdc1bb934fbd314d3ba1939e99 URL: https://github.com/kamailio/kamailio/commit/5a3bce67345f10cdc1bb934fbd314d3… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-13T22:13:09+01:00 topos module: a few doxygen fixes --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5a3bce67345f10cdc1bb934fbd314d3… Patch: https://github.com/kamailio/kamailio/commit/5a3bce67345f10cdc1bb934fbd314d3… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 4ed2628291..ec960d0a44 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -26,11 +26,12 @@ * Module: \ref topos */ -/*! \defgroup topoh Kamailio :: Topology stripping +/*! \defgroup topos Kamailio :: Topology stripping * * This module removes the SIP routing headers that show topology details. * The script interpreter gets the SIP messages with full content, so all * existing functionality is preserved. + * @{ */ #include <stdio.h> @@ -516,4 +517,6 @@ int bind_topos(topos_api_t *api) api->get_branch_expire = tps_get_branch_expire; return 0; -} \ No newline at end of file +} + +/** @} */

1 0

git:master:720c44e3: module xhttp_pi: small doxygen group fix
by Henning Westerholt 13 Mar '18

13 Mar '18

Module: kamailio Branch: master Commit: 720c44e3c54fa3455fb9a5f0b82f585bcef97945 URL: https://github.com/kamailio/kamailio/commit/720c44e3c54fa3455fb9a5f0b82f585… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-13T22:11:55+01:00 module xhttp_pi: small doxygen group fix --- Modified: src/modules/xhttp_pi/xhttp_pi.c --- Diff: https://github.com/kamailio/kamailio/commit/720c44e3c54fa3455fb9a5f0b82f585… Patch: https://github.com/kamailio/kamailio/commit/720c44e3c54fa3455fb9a5f0b82f585… --- diff --git a/src/modules/xhttp_pi/xhttp_pi.c b/src/modules/xhttp_pi/xhttp_pi.c index dfa28c2035..dbd7a2fd26 100644 --- a/src/modules/xhttp_pi/xhttp_pi.c +++ b/src/modules/xhttp_pi/xhttp_pi.c @@ -420,4 +420,6 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_xhttp_pi_exports); return 0; -} \ No newline at end of file +} + +/** @} */

1 0

git:master:f489f1cf: module xhttp_rpc: small doxygen group fix
by Henning Westerholt 13 Mar '18

13 Mar '18

Module: kamailio Branch: master Commit: f489f1cf9d6fad4e6d2e531eda9baa4ca0e803dd URL: https://github.com/kamailio/kamailio/commit/f489f1cf9d6fad4e6d2e531eda9baa4… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-13T22:12:31+01:00 module xhttp_rpc: small doxygen group fix --- Modified: src/modules/xhttp_rpc/xhttp_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/f489f1cf9d6fad4e6d2e531eda9baa4… Patch: https://github.com/kamailio/kamailio/commit/f489f1cf9d6fad4e6d2e531eda9baa4… --- diff --git a/src/modules/xhttp_rpc/xhttp_rpc.c b/src/modules/xhttp_rpc/xhttp_rpc.c index 0298b6ecb3..5854526e18 100644 --- a/src/modules/xhttp_rpc/xhttp_rpc.c +++ b/src/modules/xhttp_rpc/xhttp_rpc.c @@ -923,3 +923,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) return 0; } +/** @} */

1 0

git:master:886b4a06: lib trie: small doxygen group fix
by Henning Westerholt 13 Mar '18

13 Mar '18

Module: kamailio Branch: master Commit: 886b4a06fa85a5996b04d2dc81023c70e4dc933e URL: https://github.com/kamailio/kamailio/commit/886b4a06fa85a5996b04d2dc81023c7… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-13T22:11:29+01:00 lib trie: small doxygen group fix --- Modified: src/lib/trie/dtrie.c Modified: src/lib/trie/dtrie.h --- Diff: https://github.com/kamailio/kamailio/commit/886b4a06fa85a5996b04d2dc81023c7… Patch: https://github.com/kamailio/kamailio/commit/886b4a06fa85a5996b04d2dc81023c7… --- diff --git a/src/lib/trie/dtrie.c b/src/lib/trie/dtrie.c index 752e0f6e9c..af2d93f1c4 100644 --- a/src/lib/trie/dtrie.c +++ b/src/lib/trie/dtrie.c @@ -34,6 +34,7 @@ * available for matching. The trie is setup in shared memory. * - Module: \ref carrierroute * - Module: \ref userblacklist + * @{ */ @@ -275,3 +276,5 @@ void **dtrie_contains(struct dtrie_node_t *root, const char *number, if (nmatch == numberlen) return ret; return NULL; } + +/** @} */ diff --git a/src/lib/trie/dtrie.h b/src/lib/trie/dtrie.h index bd7e985252..fb4388122c 100644 --- a/src/lib/trie/dtrie.h +++ b/src/lib/trie/dtrie.h @@ -34,6 +34,7 @@ * available for matching. The trie is setup in shared memory. * - Module: \ref carrierroute * - Module: \ref userblacklist + * @{ */ #ifndef _DTRIE_H_ @@ -171,4 +172,5 @@ void **dtrie_contains(struct dtrie_node_t *root, const char *number, const unsigned int numberlen, const unsigned int branches); +/** @} */ #endif

1 0

git:master:c1404ed0: core: several doxygen docs fixes
by Henning Westerholt 13 Mar '18

13 Mar '18

Module: kamailio Branch: master Commit: c1404ed04008cc1619e04372a1f68991af8c189e URL: https://github.com/kamailio/kamailio/commit/c1404ed04008cc1619e04372a1f6899… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-13T22:09:54+01:00 core: several doxygen docs fixes --- Modified: src/core/compiler_opt.h Modified: src/core/dset.c Modified: src/core/parser/parse_body.c Modified: src/core/parser/parse_body.h Modified: src/core/pt.h --- Diff: https://github.com/kamailio/kamailio/commit/c1404ed04008cc1619e04372a1f6899… Patch: https://github.com/kamailio/kamailio/commit/c1404ed04008cc1619e04372a1f6899…

1 0

git:master:fb9f8738: db_unixodbc: fix a small mismatch between header, impl. and doxygen docs
by Henning Westerholt 13 Mar '18

13 Mar '18

Module: kamailio Branch: master Commit: fb9f873842d57752daa1036b4c615fb656c11136 URL: https://github.com/kamailio/kamailio/commit/fb9f873842d57752daa1036b4c615fb… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-13T22:08:02+01:00 db_unixodbc: fix a small mismatch between header, impl. and doxygen docs --- Modified: src/modules/db_unixodbc/list.h --- Diff: https://github.com/kamailio/kamailio/commit/fb9f873842d57752daa1036b4c615fb… Patch: https://github.com/kamailio/kamailio/commit/fb9f873842d57752daa1036b4c615fb… --- diff --git a/src/modules/db_unixodbc/list.h b/src/modules/db_unixodbc/list.h index 053c8a009c..d5a081cb9b 100644 --- a/src/modules/db_unixodbc/list.h +++ b/src/modules/db_unixodbc/list.h @@ -60,8 +60,8 @@ int db_unixodbc_list_insert(list** start, list** link, int n, strn* value); /*! * \brief Destroy a list - * \param link list element(s) + * \param start list element(s) */ -void db_unixodbc_list_destroy(list* link); +void db_unixodbc_list_destroy(list* start); #endif

1 0

git:master:22716f0b: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 13 Mar '18

13 Mar '18

Module: kamailio Branch: master Commit: 22716f0b4ac922491359e3719089497269ceadd0 URL: https://github.com/kamailio/kamailio/commit/22716f0b4ac922491359e3719089497… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-03-13T14:46:36+01:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/22716f0b4ac922491359e3719089497… Patch: https://github.com/kamailio/kamailio/commit/22716f0b4ac922491359e3719089497… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 711812b2d4..3dd341016f 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -204,7 +204,7 @@ Chapter 1. Admin Guide from outside to inside); As many NATs do update the bind timeout only on outbound traffic, the bind may expire and closed. - * SIP request - a stateless SIP request is sent to the contact + * SIP request - a stateless SIP request is sent to the UDP contact address. + Advantages: bidirectional traffic through NAT, since each PING request from Kamailio (inbound traffic) will force the SIP

1 0

[kamailio/kamailio] No OPTIONS packet was sent out when TCP transport was used (#1481)
by wavstudio 13 Mar '18

13 Mar '18

I tested the NAT ping function with nathelp module,and i found that there was OPTIONS packet sent out when UDP transport was used, but if i change to TCP transport, no OPTIONS packet was sent out. I read the document and seems ping packet was sent out only when UDP was used. Am i right? How should i do for this issue if i make a mistake? -- 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/issues/1481

2 2

git:master:82efea41: nathelper: docs - mention UDP for SIP nat pinging contact addresses
by Daniel-Constantin Mierla 13 Mar '18

13 Mar '18

Module: kamailio Branch: master Commit: 82efea41d7a01c041ea6ff85cc864cfdf2fd1ba5 URL: https://github.com/kamailio/kamailio/commit/82efea41d7a01c041ea6ff85cc864cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-13T14:41:14+01:00 nathelper: docs - mention UDP for SIP nat pinging contact addresses --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/82efea41d7a01c041ea6ff85cc864cf… Patch: https://github.com/kamailio/kamailio/commit/82efea41d7a01c041ea6ff85cc864cf… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index 5187f43c90..83dc8f5faa 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -70,7 +70,7 @@ <listitem> <para> <emphasis>SIP request</emphasis> - a stateless SIP request is - sent to the contact address. + sent to the UDP contact address. </para> <itemizedlist> <listitem>

1 0

git:master:31e21ff2: core: small improvements to help text
by Daniel-Constantin Mierla 13 Mar '18

13 Mar '18

Module: kamailio Branch: master Commit: 31e21ff23a0d8bff1f7a88a56aa4ab01d93e2cf3 URL: https://github.com/kamailio/kamailio/commit/31e21ff23a0d8bff1f7a88a56aa4ab0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-13T09:03:17+01:00 core: small improvements to help text --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/31e21ff23a0d8bff1f7a88a56aa4ab0… Patch: https://github.com/kamailio/kamailio/commit/31e21ff23a0d8bff1f7a88a56aa4ab0… --- diff --git a/src/main.c b/src/main.c index a49e30e7f5..30f659c8c1 100644 --- a/src/main.c +++ b/src/main.c @@ -198,11 +198,11 @@ Options:\n\ -M nr Size of private memory allocated, in Megabytes\n\ -w dir Change the working directory to \"dir\" (default: \"/\")\n\ -t dir Chroot to \"dir\"\n\ - -u uid Change uid \n\ - -g gid Change gid \n\ + -u uid Change uid (user id)\n\ + -g gid Change gid (group id)\n\ -P file Create a pid file\n\ -G file Create a pgid file\n\ - -Y dir Runtime dir\n\ + -Y dir Runtime dir path\n\ -O nr Script optimization level (debugging option)\n\ -a mode Auto aliases mode: enable with yes or on,\n\ disable with no or off\n\ @@ -212,7 +212,7 @@ Options:\n\ -X name Specify internal manager for private memory (pkg)\n\ - if omitted, the one for shm is used\n" #ifdef STATS -" -s file File to which statistics is dumped (disabled otherwise)\n" +" -s file File where to write internal statistics on SIGUSR1\n" #endif ;

1 0

git:master:9868f2c0: doxygen: fix doxygen comment grouping for cds lib
by Henning Westerholt 13 Mar '18

13 Mar '18

Module: kamailio Branch: master Commit: 9868f2c04eb816d546e375a1d572e1c27f6f99d9 URL: https://github.com/kamailio/kamailio/commit/9868f2c04eb816d546e375a1d572e1c… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-13T08:30:37+01:00 doxygen: fix doxygen comment grouping for cds lib --- Modified: src/lib/cds/dstring.h Modified: src/lib/cds/msg_queue.h --- Diff: https://github.com/kamailio/kamailio/commit/9868f2c04eb816d546e375a1d572e1c… Patch: https://github.com/kamailio/kamailio/commit/9868f2c04eb816d546e375a1d572e1c… --- diff --git a/src/lib/cds/dstring.h b/src/lib/cds/dstring.h index fb86ffba5d..039ed2b099 100644 --- a/src/lib/cds/dstring.h +++ b/src/lib/cds/dstring.h @@ -32,9 +32,8 @@ extern "C" { #endif -/** \ingroup cds - * @{ - * +/** + * \ingroup cds * \defgroup cds_dstring Dynamic strings * * Dynamic strings were introduced to satisfy needs of presence @@ -142,8 +141,7 @@ void dstr_clear_error(dstring_t *dstr); */ /** Macro for cleaning error flag in dynamic string. */ #define dstr_clear_error(dstr) (dstr)->error = 0 -/** @} - @} */ +/** @} */ #ifdef __cplusplus } diff --git a/src/lib/cds/msg_queue.h b/src/lib/cds/msg_queue.h index 3e42a48cae..9a1f8f6ab5 100644 --- a/src/lib/cds/msg_queue.h +++ b/src/lib/cds/msg_queue.h @@ -33,9 +33,8 @@ extern "C" { #endif -/** \ingroup cds - * @{ - * +/** + * \ingroup cds * \defgroup cds_msg_queue Message Queue * * Message queue is a structure useful for sending data between processes. @@ -182,8 +181,7 @@ void msg_queue_destroy(msg_queue_t *q); * It uses cds_free for freeing the memory. */ void msg_queue_free(msg_queue_t *q); -/** @} - @} */ +/** @} */ #ifdef __cplusplus }

1 0

git:master:118a829b: core: doxygen fix and small grouping extension for trie lib
by Henning Westerholt 13 Mar '18

13 Mar '18

Module: kamailio Branch: master Commit: 118a829b30344b394a60c325075aec7bf877428c URL: https://github.com/kamailio/kamailio/commit/118a829b30344b394a60c325075aec7… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-13T08:44:47+01:00 core: doxygen fix and small grouping extension for trie lib --- Modified: src/lib/trie/dtrie.c Modified: src/lib/trie/dtrie.h --- Diff: https://github.com/kamailio/kamailio/commit/118a829b30344b394a60c325075aec7… Patch: https://github.com/kamailio/kamailio/commit/118a829b30344b394a60c325075aec7… --- diff --git a/src/lib/trie/dtrie.c b/src/lib/trie/dtrie.c index ab3682e2a1..752e0f6e9c 100644 --- a/src/lib/trie/dtrie.c +++ b/src/lib/trie/dtrie.c @@ -21,7 +21,7 @@ */ /** - * \file + * \ingroup dtrie * \brief Trie datastructure with utility functions * * Provides a generic trie datastructure and utility functions to diff --git a/src/lib/trie/dtrie.h b/src/lib/trie/dtrie.h index 1b27d835d3..bd7e985252 100644 --- a/src/lib/trie/dtrie.h +++ b/src/lib/trie/dtrie.h @@ -21,10 +21,10 @@ */ /** - * \file + * \defgroup dtrie Kamailio generic trie data structure * \brief Trie datastructure with utility functions * - * Provides a generic trie datastructure and utility functions to + * Provides a generic trie data structure and utility functions to * initialize and manage individual nodes. Its optimized towards * the usecase of a matching tree that contains only digits, e.g. * for LCR or blacklist modules. Nevertheless it also supports the @@ -104,7 +104,7 @@ void dtrie_clear(struct dtrie_node_t *root, dt_delete_func_t delete_payload, * \param number inserted number string * \param numberlen number of individual numbers in number * \param data pointer to some custom data - * \param branches number of branches in the trie + * \param dtrie_size size of the trie * \return 0 on success, -1 otherwise. */ int dtrie_insert(struct dtrie_node_t *root, const char *number, const unsigned int numberlen,

1 0

git:master:a716cdc0: doxygen: update doxygen configuration to version 1.8.x
by Henning Westerholt 12 Mar '18

12 Mar '18

Module: kamailio Branch: master Commit: a716cdc04b4afffc605bd485d20fa0dc749a07bf URL: https://github.com/kamailio/kamailio/commit/a716cdc04b4afffc605bd485d20fa0d… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-12T22:59:01+01:00 doxygen: update doxygen configuration to version 1.8.x --- Modified: src/lib/doxygen.cfg --- Diff: https://github.com/kamailio/kamailio/commit/a716cdc04b4afffc605bd485d20fa0d… Patch: https://github.com/kamailio/kamailio/commit/a716cdc04b4afffc605bd485d20fa0d…

1 0

git:master:5a84ca7a: core: receive.c optimization, add a few unlikely compiler builtin in error path
by Henning Westerholt 12 Mar '18

12 Mar '18

Module: kamailio Branch: master Commit: 5a84ca7a2e3f3cdcde0ff444aee272eb0a8c5561 URL: https://github.com/kamailio/kamailio/commit/5a84ca7a2e3f3cdcde0ff444aee272e… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-12T21:59:10+01:00 core: receive.c optimization, add a few unlikely compiler builtin in error path --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/5a84ca7a2e3f3cdcde0ff444aee272e… Patch: https://github.com/kamailio/kamailio/commit/5a84ca7a2e3f3cdcde0ff444aee272e… --- diff --git a/src/core/receive.c b/src/core/receive.c index 3b98438e34..27d4bd9986 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -189,7 +189,7 @@ int receive_msg(char *buf, unsigned int len, struct receive_info *rcv_info) len = inb.len; msg = pkg_malloc(sizeof(struct sip_msg)); - if(msg == 0) { + if(unlikely(msg == 0)) { LM_ERR("no mem for sip_msg\n"); goto error00; } @@ -225,8 +225,8 @@ int receive_msg(char *buf, unsigned int len, struct receive_info *rcv_info) goto error02; } - if(parse_headers(msg, HDR_FROM_F | HDR_TO_F | HDR_CALLID_F | HDR_CSEQ_F, 0) - < 0) { + if(unlikely(parse_headers(msg, HDR_FROM_F | HDR_TO_F | HDR_CALLID_F | HDR_CSEQ_F, 0) + < 0)) { LM_WARN("parsing relevant headers failed\n"); } LM_DBG("--- received sip message - %s - call-id: [%.*s] - cseq: [%.*s]\n", @@ -259,7 +259,7 @@ int receive_msg(char *buf, unsigned int len, struct receive_info *rcv_info) } } /* sanity checks */ - if((msg->via1 == 0) || (msg->via1->error != PARSE_OK)) { + if(unlikely((msg->via1 == 0) || (msg->via1->error != PARSE_OK))) { /* no via, send back error ? */ LM_ERR("no via found in request\n"); STATS_BAD_MSG();

1 0

git:master:f775e400: core: small refactoring in receive.c related to route_locks addition
by Henning Westerholt 12 Mar '18

12 Mar '18

Module: kamailio Branch: master Commit: f775e4000e1e0dfb2bfb0957d80bcae51be8441c URL: https://github.com/kamailio/kamailio/commit/f775e4000e1e0dfb2bfb0957d80bcae… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-12T21:48:47+01:00 core: small refactoring in receive.c related to route_locks addition - small refactoring in receive.c related to route_locks functionality addition - consolidate a few of the conditional branches for cidlockset in receive path - makes the code easier to understand for only a few lines of code duplication --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/f775e4000e1e0dfb2bfb0957d80bcae… Patch: https://github.com/kamailio/kamailio/commit/f775e4000e1e0dfb2bfb0957d80bcae… --- diff --git a/src/core/receive.c b/src/core/receive.c index be585eb0ad..3b98438e34 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -309,24 +309,30 @@ int receive_msg(char *buf, unsigned int len, struct receive_info *rcv_info) LM_ERR("no config routing engine registered\n"); goto error_req; } - if(unlikely(cidlockset) ) + if(unlikely(cidlockset)) { rec_lock_set_get(ksr_route_locks_set, cidlockidx); - if(keng->froute(msg, REQUEST_ROUTE, NULL, NULL) < 0) { - LM_NOTICE("negative return code from engine function\n"); - } - if(unlikely(cidlockset)) + if(keng->froute(msg, REQUEST_ROUTE, NULL, NULL) < 0) + LM_NOTICE("negative return code from engine function\n"); rec_lock_set_release(ksr_route_locks_set, cidlockidx); + } else { + if(keng->froute(msg, REQUEST_ROUTE, NULL, NULL) < 0) + LM_NOTICE("negative return code from engine function\n"); + } } else { - if(unlikely(cidlockset)) + if(unlikely(cidlockset)) { rec_lock_set_get(ksr_route_locks_set, cidlockidx); - if(run_top_route(main_rt.rlist[DEFAULT_RT], msg, 0) < 0) { - if(unlikely(cidlockset)) + if(run_top_route(main_rt.rlist[DEFAULT_RT], msg, 0) < 0) { rec_lock_set_release(ksr_route_locks_set, cidlockidx); - LM_WARN("error while trying script\n"); - goto error_req; - } - if(unlikely(cidlockset)) + LM_WARN("error while trying script\n"); + goto error_req; + } rec_lock_set_release(ksr_route_locks_set, cidlockidx); + } else { + if(run_top_route(main_rt.rlist[DEFAULT_RT], msg, 0) < 0) { + LM_WARN("error while trying script\n"); + goto error_req; + } + } } if(is_printable(cfg_get(core, core_cfg, latency_cfg_log)) @@ -385,18 +391,23 @@ int receive_msg(char *buf, unsigned int len, struct receive_info *rcv_info) bctx = sr_kemi_act_ctx_get(); init_run_actions_ctx(&ctx); sr_kemi_act_ctx_set(&ctx); - if(unlikely(cidlockset)) + if(unlikely(cidlockset)) { rec_lock_set_get(ksr_route_locks_set, cidlockidx); - ret = keng->froute(msg, CORE_ONREPLY_ROUTE, NULL, NULL); - if(unlikely(cidlockset)) + ret = keng->froute(msg, CORE_ONREPLY_ROUTE, NULL, NULL); rec_lock_set_release(ksr_route_locks_set, cidlockidx); - sr_kemi_act_ctx_set(bctx); + sr_kemi_act_ctx_set(bctx); + } else { + ret = keng->froute(msg, CORE_ONREPLY_ROUTE, NULL, NULL); + rec_lock_set_release(ksr_route_locks_set, cidlockidx); + } } else { - if(unlikely(cidlockset)) + if(unlikely(cidlockset)) { rec_lock_set_get(ksr_route_locks_set, cidlockidx); - ret = run_top_route(onreply_rt.rlist[DEFAULT_RT], msg, &ctx); - if(unlikely(cidlockset)) + ret = run_top_route(onreply_rt.rlist[DEFAULT_RT], msg, &ctx); rec_lock_set_release(ksr_route_locks_set, cidlockidx); + } else { + ret = run_top_route(onreply_rt.rlist[DEFAULT_RT], msg, &ctx); + } } #ifndef NO_ONREPLY_ROUTE_ERROR if(unlikely(ret < 0)) {

1 0

git:master:43069601: core: performance optimzation for commit af3f94dd, add unlikely compiler builtin
by Henning Westerholt 12 Mar '18

12 Mar '18

Module: kamailio Branch: master Commit: 430696019c23e7c019cb463ac84f76762ee9c2f1 URL: https://github.com/kamailio/kamailio/commit/430696019c23e7c019cb463ac84f767… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-12T21:31:57+01:00 core: performance optimzation for commit af3f94dd, add unlikely compiler builtin - performance optimization for commit af3f94dd, default deactivated - this affect a really hot code path in the core receive part - add unlikely compiler builtin_expect, like in other places of the core --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/430696019c23e7c019cb463ac84f767… Patch: https://github.com/kamailio/kamailio/commit/430696019c23e7c019cb463ac84f767… --- diff --git a/src/core/receive.c b/src/core/receive.c index b1feba0616..be585eb0ad 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -242,8 +242,8 @@ int receive_msg(char *buf, unsigned int len, struct receive_info *rcv_info) /* ... clear branches from previous message */ clear_branches(); - if(ksr_route_locks_set!=NULL && msg->callid && msg->callid->body.s - && msg->callid->body.len >0) { + if(unlikely(ksr_route_locks_set!=NULL && msg->callid && msg->callid->body.s + && msg->callid->body.len >0)) { cidlockidx = get_hash1_raw(msg->callid->body.s, msg->callid->body.len); cidlockidx = cidlockidx % ksr_route_locks_set->size; cidlockset = 1; @@ -309,23 +309,23 @@ int receive_msg(char *buf, unsigned int len, struct receive_info *rcv_info) LM_ERR("no config routing engine registered\n"); goto error_req; } - if(cidlockset) + if(unlikely(cidlockset) ) rec_lock_set_get(ksr_route_locks_set, cidlockidx); if(keng->froute(msg, REQUEST_ROUTE, NULL, NULL) < 0) { LM_NOTICE("negative return code from engine function\n"); } - if(cidlockset) + if(unlikely(cidlockset)) rec_lock_set_release(ksr_route_locks_set, cidlockidx); } else { - if(cidlockset) + if(unlikely(cidlockset)) rec_lock_set_get(ksr_route_locks_set, cidlockidx); if(run_top_route(main_rt.rlist[DEFAULT_RT], msg, 0) < 0) { - if(cidlockset) + if(unlikely(cidlockset)) rec_lock_set_release(ksr_route_locks_set, cidlockidx); LM_WARN("error while trying script\n"); goto error_req; } - if(cidlockset) + if(unlikely(cidlockset)) rec_lock_set_release(ksr_route_locks_set, cidlockidx); } @@ -385,17 +385,17 @@ int receive_msg(char *buf, unsigned int len, struct receive_info *rcv_info) bctx = sr_kemi_act_ctx_get(); init_run_actions_ctx(&ctx); sr_kemi_act_ctx_set(&ctx); - if(cidlockset) + if(unlikely(cidlockset)) rec_lock_set_get(ksr_route_locks_set, cidlockidx); ret = keng->froute(msg, CORE_ONREPLY_ROUTE, NULL, NULL); - if(cidlockset) + if(unlikely(cidlockset)) rec_lock_set_release(ksr_route_locks_set, cidlockidx); sr_kemi_act_ctx_set(bctx); } else { - if(cidlockset) + if(unlikely(cidlockset)) rec_lock_set_get(ksr_route_locks_set, cidlockidx); ret = run_top_route(onreply_rt.rlist[DEFAULT_RT], msg, &ctx); - if(cidlockset) + if(unlikely(cidlockset)) rec_lock_set_release(ksr_route_locks_set, cidlockidx); } #ifndef NO_ONREPLY_ROUTE_ERROR

1 0

git:master:af3f94dd: core: new parameter route_locks_size
by Daniel-Constantin Mierla 12 Mar '18

12 Mar '18

Module: kamailio Branch: master Commit: af3f94dd22626894548d2ee2066cf11c806410a3 URL: https://github.com/kamailio/kamailio/commit/af3f94dd22626894548d2ee2066cf11… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-12T17:09:43+01:00 core: new parameter route_locks_size - if set, kamailio creates a group of recursive locks used to sync on execution of request_route and reply_route based on hashing ID of Call-ID header. In other words, if a message has triggered the execution of request_route or reply_route, any other message with the same Call-ID waits until the other one finishes the execution. - it should help when messages belonging to the same dialog come quickly one after the other and config execution results in sending them out in reverse order. There are some old UA implementations not able to cope properly with this case (e.g., pstn gateways). - be very carefull when eanbling it, it can affect performances, use only when strictly needed - note also that hashing over Call-ID means that there could be collisions and different Call-ID values can result in same hash ID - default value is 0 - feature not enabled - set it to a positive integer number, it should be higher than the over all number of processes created by kamailio, can be much higher --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/receive.c Modified: src/core/receive.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/af3f94dd22626894548d2ee2066cf11… Patch: https://github.com/kamailio/kamailio/commit/af3f94dd22626894548d2ee2066cf11…

1 0

git:master:2d117b8c: core: locking - added api functions for recursive lock sets
by Daniel-Constantin Mierla 12 Mar '18

12 Mar '18

Module: kamailio Branch: master Commit: 2d117b8ce6ae97a7220369160b1eeb8b264bcac8 URL: https://github.com/kamailio/kamailio/commit/2d117b8ce6ae97a7220369160b1eeb8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-12T17:09:43+01:00 core: locking - added api functions for recursive lock sets --- Modified: src/core/locking.c Modified: src/core/locking.h --- Diff: https://github.com/kamailio/kamailio/commit/2d117b8ce6ae97a7220369160b1eeb8… Patch: https://github.com/kamailio/kamailio/commit/2d117b8ce6ae97a7220369160b1eeb8… --- diff --git a/src/core/locking.c b/src/core/locking.c index ebe4a9ab3c..fc267b008f 100644 --- a/src/core/locking.c +++ b/src/core/locking.c @@ -92,3 +92,65 @@ void rec_lock_release(rec_lock_t* rlock) rlock->rec_lock_level--; } } + +/** + * + */ +rec_lock_set_t* rec_lock_set_alloc(int n) +{ + rec_lock_set_t* ls; + ls=(rec_lock_set_t*)shm_malloc(sizeof(rec_lock_set_t)+n*sizeof(rec_lock_t)); + if (ls==0){ + LM_CRIT("could not allocate rec_lock_set\n"); + }else{ + ls->locks=(rec_lock_t*)((char*)ls+sizeof(rec_lock_set_t)); + ls->size=n; + } + return ls; + return NULL; +} + +/** + * + */ +rec_lock_set_t* rec_lock_set_init(rec_lock_set_t* lset) +{ + int r; + for (r=0; r<lset->size; r++) if (rec_lock_init(&lset->locks[r])==0) return 0; + return lset; +} + +/** + * + */ +void rec_lock_set_destroy(rec_lock_set_t* lset) +{ + return; +} + +/** + * + */ +void rec_lock_set_dealloc(rec_lock_set_t* lset) +{ + shm_free((void*)lset); + return; +} + +/** + * + */ +void rec_lock_set_get(rec_lock_set_t* lset, int i) +{ + rec_lock_get(&lset->locks[i]); + return; +} + +/** + * + */ +void rec_lock_set_release(rec_lock_set_t* lset, int i) +{ + rec_lock_release(&lset->locks[i]); + return; +} \ No newline at end of file diff --git a/src/core/locking.h b/src/core/locking.h index c00e49e12b..1ae16d01de 100644 --- a/src/core/locking.h +++ b/src/core/locking.h @@ -84,4 +84,16 @@ void rec_lock_dealloc(rec_lock_t* lock); void rec_lock_get(rec_lock_t* lock); void rec_lock_release(rec_lock_t* lock); +typedef struct rec_lock_set { + int size; + rec_lock_t *locks; +} rec_lock_set_t; + +rec_lock_set_t* rec_lock_set_alloc(int n); +rec_lock_set_t* rec_lock_set_init(rec_lock_set_t* lset); +void rec_lock_set_destroy(rec_lock_set_t* lset); +void rec_lock_set_dealloc(rec_lock_set_t* lset); +void rec_lock_set_get(rec_lock_set_t* lset, int i); +void rec_lock_set_release(rec_lock_set_t* lset, int i); + #endif

1 0

git:master:4348049e: db_redis: Fix free(0) on inserting null value
by Andreas Granig 12 Mar '18

12 Mar '18

Module: kamailio Branch: master Commit: 4348049e4f455309523bfbf285d0f462c57c9c49 URL: https://github.com/kamailio/kamailio/commit/4348049e4f455309523bfbf285d0f46… Author: Andreas Granig <agranig(a)sipwise.com> Committer: Andreas Granig <agranig(a)sipwise.com> Date: 2018-03-12T16:21:27+01:00 db_redis: Fix free(0) on inserting null value --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/4348049e4f455309523bfbf285d0f46… Patch: https://github.com/kamailio/kamailio/commit/4348049e4f455309523bfbf285d0f46… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index 48bcf343d3..273ee59cbb 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -1850,7 +1850,8 @@ int db_redis_insert(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, LM_ERR("Failed to add column value to insert query\n"); goto error; } - pkg_free(v.s); + if (v.s) + pkg_free(v.s); } reply = db_redis_command_argv(con, query_v);

1 0

git:master:aca63625: modules: readme files regenerated - usrloc ... [skip ci]
by Kamailio Dev 12 Mar '18

12 Mar '18

Module: kamailio Branch: master Commit: aca63625a97cf3934b79d5207f12e7802a17b288 URL: https://github.com/kamailio/kamailio/commit/aca63625a97cf3934b79d5207f12e78… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-03-12T13:31:35+01:00 modules: readme files regenerated - usrloc ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/aca63625a97cf3934b79d5207f12e78… Patch: https://github.com/kamailio/kamailio/commit/aca63625a97cf3934b79d5207f12e78… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index ffd557e563..db70cdbad4 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -1001,7 +1001,12 @@ modparam("usrloc", "rm_expired_delay", 30) 3.47. server_id_filter (int) - Enable (1) or disable (0) filter records by server_id on load. + Enable (1) or disable (0) filter records by server_id on load and + during cleaning of expired db records. It could be usefull when you + want to use the same location table for several kamailio instances + which are configured to work in db_mode=1 or db_mode=2 (cache modes). + Otherwise one instance of proxy cleans records made by another proxy + and that breaks its cache. Default value is “0”.

1 0

git:master:7fdbdd44: usrloc: cleanup by server_id. (#1480)
by Daniel-Constantin Mierla 12 Mar '18

12 Mar '18

Module: kamailio Branch: master Commit: 7fdbdd44c85bce7efbd19a3bdf5dcd52970e3197 URL: https://github.com/kamailio/kamailio/commit/7fdbdd44c85bce7efbd19a3bdf5dcd5… Author: Konstantin <piligrim_pk(a)mail.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-12T13:25:18+01:00 usrloc: cleanup by server_id. (#1480) * usrloc: cleanup by server_id. * usrloc: reverted README file changes. * usrloc: moved server_id db request assignment under conditional command. --- Modified: src/modules/usrloc/doc/usrloc_admin.xml Modified: src/modules/usrloc/udomain.c Modified: src/modules/usrloc/usrloc_mod.c Modified: src/modules/usrloc/usrloc_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/7fdbdd44c85bce7efbd19a3bdf5dcd5… Patch: https://github.com/kamailio/kamailio/commit/7fdbdd44c85bce7efbd19a3bdf5dcd5… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 5de9b82c08..2e9bdb3ff9 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1201,7 +1201,9 @@ modparam("usrloc", "rm_expired_delay", 30) <section id="usrloc.p.server_id_filter"> <title><varname>server_id_filter</varname> (int)</title> <para> - Enable (1) or disable (0) filter records by server_id on load. + Enable (1) or disable (0) filter records by server_id on load and during cleaning of expired db records. + It could be usefull when you want to use the same location table for several kamailio instances which are configured to work in db_mode=1 or db_mode=2 (cache modes). + Otherwise one instance of proxy cleans records made by another proxy and that breaks its cache. </para> <para> <emphasis> diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index 8f5bfe3061..aacca0513b 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -895,9 +895,10 @@ urecord_t* db_load_urecord_by_ruid(db1_con_t* _c, udomain_t* _d, str *_ruid) */ int db_timer_udomain(udomain_t* _d) { - db_key_t keys[2]; - db_op_t ops[2]; - db_val_t vals[2]; + db_key_t keys[3]; + db_op_t ops[3]; + db_val_t vals[3]; + int key_num = 2; keys[0] = &expires_col; ops[0] = "<"; @@ -909,12 +910,21 @@ int db_timer_udomain(udomain_t* _d) vals[1].nul = 0; UL_DB_EXPIRES_SET(&vals[1], 0); + if (ul_db_srvid != 0) { + keys[2] = &srv_id_col; + ops[2] = OP_EQ; + vals[2].type = DB1_INT; + vals[2].nul = 0; + vals[2].val.int_val = server_id; + key_num = 3; + } + if (ul_dbf.use_table(ul_dbh, _d->name) < 0) { LM_ERR("use_table failed\n"); return -1; } - - if (ul_dbf.delete(ul_dbh, keys, ops, vals, 2) < 0) { + + if (ul_dbf.delete(ul_dbh, keys, ops, vals, key_num) < 0) { LM_ERR("failed to delete from table %s\n",_d->name->s); return -1; } diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index cedc65a73d..50eb0cb888 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -176,7 +176,7 @@ unsigned int init_flag = 0; db1_con_t* ul_dbh = 0; /* Database connection handle */ db_func_t ul_dbf; -/* filter on load by server id */ +/* filter on load and during cleanup by server id */ unsigned int ul_db_srvid = 0; /*! \brief diff --git a/src/modules/usrloc/usrloc_mod.h b/src/modules/usrloc/usrloc_mod.h index 5ac67d67ed..4b0fa35671 100644 --- a/src/modules/usrloc/usrloc_mod.h +++ b/src/modules/usrloc/usrloc_mod.h @@ -100,7 +100,7 @@ extern str ul_xavp_contact_name; extern db1_con_t* ul_dbh; /* Database connection handle */ extern db_func_t ul_dbf; -/* filter on load by server id */ +/* filter on load and during cleanup by server id */ extern unsigned int ul_db_srvid; /*

1 0

[kamailio/kamailio] usrloc: cleanup by server_id. (#1480)
by Konstantin 12 Mar '18

12 Mar '18

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  In usrloc module we have server_id_filter parameter which switches on filtering of location records by server id during load. This fix improves this functionality to use this filter in cleanup procedure to avoid cleaning of expired db records which are written by another kamailio instance to keep their cache correct. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1480 -- Commit Summary -- * usrloc: cleanup by server_id. -- File Changes -- M src/modules/usrloc/README (4) M src/modules/usrloc/doc/usrloc_admin.xml (4) M src/modules/usrloc/udomain.c (19) M src/modules/usrloc/usrloc_mod.c (2) M src/modules/usrloc/usrloc_mod.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1480.patch https://github.com/kamailio/kamailio/pull/1480.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/1480

3 7

git:master:97d71334: app_python3: check and use kemi reply route callback name
by Daniel-Constantin Mierla 12 Mar '18

12 Mar '18

Module: kamailio Branch: master Commit: 97d71334ca56cdcd9573ed605adfe26a24696a0a URL: https://github.com/kamailio/kamailio/commit/97d71334ca56cdcd9573ed605adfe26… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-12T13:05:35+01:00 app_python3: check and use kemi reply route callback name --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/97d71334ca56cdcd9573ed605adfe26… Patch: https://github.com/kamailio/kamailio/commit/97d71334ca56cdcd9573ed605adfe26… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index d053ac1b7d..ce6bc68733 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -64,7 +64,9 @@ int sr_kemi_config_engine_python(sip_msg_t *msg, int rtype, str *rname, ret = apy_exec(msg, "ksr_request_route", NULL, 1); } } else if(rtype==CORE_ONREPLY_ROUTE) { - ret = apy_exec(msg, "ksr_reply_route", NULL, 0); + if(kemi_reply_route_callback.len>0) { + ret = apy_exec(msg, kemi_reply_route_callback.s, NULL, 0); + } } else if(rtype==BRANCH_ROUTE) { if(rname!=NULL && rname->s!=NULL) { ret = apy_exec(msg, rname->s, NULL, 0);

1 0

git:master:12bd6d04: app_jsdt: check and use kemi reply route callback name
by Daniel-Constantin Mierla 12 Mar '18

12 Mar '18

Module: kamailio Branch: master Commit: 12bd6d04c44b5c7d129ed539153afafe899d1df7 URL: https://github.com/kamailio/kamailio/commit/12bd6d04c44b5c7d129ed539153afaf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-12T12:56:24+01:00 app_jsdt: check and use kemi reply route callback name --- Modified: src/modules/app_jsdt/app_jsdt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/12bd6d04c44b5c7d129ed539153afaf… Patch: https://github.com/kamailio/kamailio/commit/12bd6d04c44b5c7d129ed539153afaf… --- diff --git a/src/modules/app_jsdt/app_jsdt_mod.c b/src/modules/app_jsdt/app_jsdt_mod.c index bbafc66972..98824e77f1 100644 --- a/src/modules/app_jsdt/app_jsdt_mod.c +++ b/src/modules/app_jsdt/app_jsdt_mod.c @@ -147,7 +147,10 @@ int sr_kemi_config_engine_jsdt(sip_msg_t *msg, int rtype, str *rname, ret = app_jsdt_run_ex(msg, "ksr_request_route", NULL, NULL, NULL, 1); } } else if(rtype==CORE_ONREPLY_ROUTE) { - ret = app_jsdt_run_ex(msg, "ksr_reply_route", NULL, NULL, NULL, 0); + if(kemi_reply_route_callback.len>0) { + ret = app_jsdt_run_ex(msg, kemi_reply_route_callback.s, NULL, + NULL, NULL, 0); + } } else if(rtype==BRANCH_ROUTE) { if(rname!=NULL && rname->s!=NULL) { ret = app_jsdt_run_ex(msg, rname->s, NULL, NULL, NULL, 0);

1 0

git:master:1f1fe5e2: app_sqlang: check and use kemi reply route callback name
by Daniel-Constantin Mierla 12 Mar '18

12 Mar '18

Module: kamailio Branch: master Commit: 1f1fe5e29f6f49a849e4a5da717a92e02db1fcad URL: https://github.com/kamailio/kamailio/commit/1f1fe5e29f6f49a849e4a5da717a92e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-12T12:56:24+01:00 app_sqlang: check and use kemi reply route callback name --- Modified: src/modules/app_sqlang/app_sqlang_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1f1fe5e29f6f49a849e4a5da717a92e… Patch: https://github.com/kamailio/kamailio/commit/1f1fe5e29f6f49a849e4a5da717a92e… --- diff --git a/src/modules/app_sqlang/app_sqlang_mod.c b/src/modules/app_sqlang/app_sqlang_mod.c index 6bbf70e199..00818830b3 100644 --- a/src/modules/app_sqlang/app_sqlang_mod.c +++ b/src/modules/app_sqlang/app_sqlang_mod.c @@ -148,7 +148,10 @@ int sr_kemi_config_engine_sqlang(sip_msg_t *msg, int rtype, str *rname, ret = app_sqlang_run_ex(msg, "ksr_request_route", NULL, NULL, NULL, 1); } } else if(rtype==CORE_ONREPLY_ROUTE) { - ret = app_sqlang_run_ex(msg, "ksr_reply_route", NULL, NULL, NULL, 0); + if(kemi_reply_route_callback.len>0) { + ret = app_sqlang_run_ex(msg, kemi_reply_route_callback.s, NULL, + NULL, NULL, 0); + } } else if(rtype==BRANCH_ROUTE) { if(rname!=NULL && rname->s!=NULL) { ret = app_sqlang_run_ex(msg, rname->s, NULL, NULL, NULL, 0);

1 0

git:master:f0fe6b35: app_lua: check and use kemi reply route callback name
by Daniel-Constantin Mierla 12 Mar '18

12 Mar '18

Module: kamailio Branch: master Commit: f0fe6b351cc1e40327356dbbc14229dd462df050 URL: https://github.com/kamailio/kamailio/commit/f0fe6b351cc1e40327356dbbc14229d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-12T12:56:24+01:00 app_lua: check and use kemi reply route callback name --- Modified: src/modules/app_lua/app_lua_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f0fe6b351cc1e40327356dbbc14229d… Patch: https://github.com/kamailio/kamailio/commit/f0fe6b351cc1e40327356dbbc14229d… --- diff --git a/src/modules/app_lua/app_lua_mod.c b/src/modules/app_lua/app_lua_mod.c index b4786b2745..362a9bc6b6 100644 --- a/src/modules/app_lua/app_lua_mod.c +++ b/src/modules/app_lua/app_lua_mod.c @@ -122,7 +122,10 @@ int sr_kemi_config_engine_lua(sip_msg_t *msg, int rtype, str *rname, ret = app_lua_run_ex(msg, "ksr_request_route", NULL, NULL, NULL, 1); } } else if(rtype==CORE_ONREPLY_ROUTE) { - ret = app_lua_run_ex(msg, "ksr_reply_route", NULL, NULL, NULL, 0); + if(kemi_reply_route_callback.len>0) { + ret = app_lua_run_ex(msg, kemi_reply_route_callback.s, NULL, + NULL, NULL, 0); + } } else if(rtype==BRANCH_ROUTE) { if(rname!=NULL && rname->s!=NULL) { ret = app_lua_run_ex(msg, rname->s, NULL, NULL, NULL, 0);

1 0

git:master:a41533b4: app_python: check and use kemi reply route callback name
by Daniel-Constantin Mierla 12 Mar '18

12 Mar '18

Module: kamailio Branch: master Commit: a41533b44959dd2b9fd310c8363fd60884ac3303 URL: https://github.com/kamailio/kamailio/commit/a41533b44959dd2b9fd310c8363fd60… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-12T12:56:24+01:00 app_python: check and use kemi reply route callback name --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/a41533b44959dd2b9fd310c8363fd60… Patch: https://github.com/kamailio/kamailio/commit/a41533b44959dd2b9fd310c8363fd60… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index f71a8171e7..e9759d43d6 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -61,7 +61,9 @@ int sr_kemi_config_engine_python(sip_msg_t *msg, int rtype, str *rname, ret = apy_exec(msg, "ksr_request_route", NULL, 1); } } else if(rtype==CORE_ONREPLY_ROUTE) { - ret = apy_exec(msg, "ksr_reply_route", NULL, 0); + if(kemi_reply_route_callback.len>0) { + ret = apy_exec(msg, kemi_reply_route_callback.s, NULL, 0); + } } else if(rtype==BRANCH_ROUTE) { if(rname!=NULL && rname->s!=NULL) { ret = apy_exec(msg, rname->s, NULL, 0);

1 0

git:master:77b0c935: core: new parameter kemi.reply_route_callback
by Daniel-Constantin Mierla 12 Mar '18

12 Mar '18

Module: kamailio Branch: master Commit: 77b0c9355b13013ddeb3cab62de1bb21e0eb74f7 URL: https://github.com/kamailio/kamailio/commit/77b0c9355b13013ddeb3cab62de1bb2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-12T12:56:24+01:00 core: new parameter kemi.reply_route_callback - set the name of kemi callback function to be executed on receiving a sip reply (equivalent of reply_route) - default: ksr_reply_route - set to empty or "none" to skip execution of this callback --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/kemi.c Modified: src/core/kemi.h Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/77b0c9355b13013ddeb3cab62de1bb2… Patch: https://github.com/kamailio/kamailio/commit/77b0c9355b13013ddeb3cab62de1bb2… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index abe2c250f4..033512c845 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -447,6 +447,7 @@ SERVER_ID "server_id" KEMI "kemi" ONSEND_ROUTE_CALLBACK "onsend_route_callback" +REPLY_ROUTE_CALLBACK "reply_route_callback" MAX_RECURSIVE_LEVEL "max_recursive_level" MAX_BRANCHES_PARAM "max_branches"|"max_branches" @@ -933,6 +934,7 @@ IMPORTFILE "import_file" return VERBOSE_STARTUP; } <INITIAL>{SERVER_ID} { count(); yylval.strval=yytext; return SERVER_ID;} <INITIAL>{KEMI} { count(); yylval.strval=yytext; return KEMI;} +<INITIAL>{REPLY_ROUTE_CALLBACK} { count(); yylval.strval=yytext; return REPLY_ROUTE_CALLBACK;} <INITIAL>{ONSEND_ROUTE_CALLBACK} { count(); yylval.strval=yytext; return ONSEND_ROUTE_CALLBACK;} <INITIAL>{MAX_RECURSIVE_LEVEL} { count(); yylval.strval=yytext; return MAX_RECURSIVE_LEVEL;} <INITIAL>{MAX_BRANCHES_PARAM} { count(); yylval.strval=yytext; return MAX_BRANCHES_PARAM;} diff --git a/src/core/cfg.y b/src/core/cfg.y index e8f76d3537..99bac9c4f1 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -484,6 +484,7 @@ extern char *default_routename; %token SERVER_ID %token KEMI %token ONSEND_ROUTE_CALLBACK +%token REPLY_ROUTE_CALLBACK %token MAX_RECURSIVE_LEVEL %token MAX_BRANCHES_PARAM %token LATENCY_CFG_LOG @@ -1569,7 +1570,7 @@ assign_stm: | VERBOSE_STARTUP EQUAL NUMBER { ksr_verbose_startup=$3; } | VERBOSE_STARTUP EQUAL error { yyerror("boolean value expected"); } | SERVER_ID EQUAL NUMBER { server_id=$3; } - | SERVER_ID EQUAL error { yyerror("number expected"); } + | SERVER_ID EQUAL error { yyerror("number expected"); } | KEMI DOT ONSEND_ROUTE_CALLBACK EQUAL STRING { kemi_onsend_route_callback.s = $5; kemi_onsend_route_callback.len = strlen($5); @@ -1579,6 +1580,17 @@ assign_stm: kemi_onsend_route_callback.len = 0; } } + | KEMI DOT ONSEND_ROUTE_CALLBACK EQUAL error { yyerror("string expected"); } + | KEMI DOT REPLY_ROUTE_CALLBACK EQUAL STRING { + kemi_reply_route_callback.s = $5; + kemi_reply_route_callback.len = strlen($5); + if(kemi_reply_route_callback.len==4 + && strcasecmp(kemi_reply_route_callback.s, "none")==0) { + kemi_reply_route_callback.s = ""; + kemi_reply_route_callback.len = 0; + } + } + | KEMI DOT REPLY_ROUTE_CALLBACK EQUAL error { yyerror("string expected"); } | MAX_RECURSIVE_LEVEL EQUAL NUMBER { set_max_recursive_level($3); } | MAX_BRANCHES_PARAM EQUAL NUMBER { sr_dst_max_branches = $3; } | LATENCY_LOG EQUAL intno { default_core_cfg.latency_log=$3; } diff --git a/src/core/kemi.c b/src/core/kemi.c index 6e078af92c..625c55905c 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -42,7 +42,10 @@ #define SR_KEMI_HNAME_SIZE 128 +/* names for kemi callback functions */ str kemi_onsend_route_callback = str_init("ksr_onsend_route"); +str kemi_reply_route_callback = str_init("ksr_reply_route"); + /** * */ diff --git a/src/core/kemi.h b/src/core/kemi.h index 8b33c44aa3..89327e11df 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -38,6 +38,7 @@ #define SR_KEMI_PARAMS_MAX 6 extern str kemi_onsend_route_callback; +extern str kemi_reply_route_callback; typedef struct sr_kemi { str mname; /* sub-module name */ diff --git a/src/core/receive.c b/src/core/receive.c index 77294673ef..a4f28edaad 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -326,7 +326,9 @@ int receive_msg(char *buf, unsigned int len, struct receive_info *rcv_info) } /* exec the onreply routing script */ - keng = sr_kemi_eng_get(); + if(kemi_reply_route_callback.len>0) { + keng = sr_kemi_eng_get(); + } if(onreply_rt.rlist[DEFAULT_RT] != NULL || keng != NULL) { set_route_type(CORE_ONREPLY_ROUTE); ret = 1;

1 0

Cleanup by server id
by Konstantin Polyakov 12 Mar '18

12 Mar '18

Hello All, I would like to propose improvement for feature "server_id filter" to make possible cleaning location table records by server_id too. That could be usefull when several kamailio instances are used with the same location table and in db mode 1 or 2 (cache). Currently in such configuration there is an issue - one proxy cleans records which are created and stored in the cache by another proxy. That breaks cache of another proxy. I made a fix and would like to open pull request but I don't have permissions to push my branch with changes into the kamailio repository. Could some grant me such permissions? Thank you. Best regards Konstantin

2 1

git:master:96a1367e: app_python3: renamed main files to match module name
by Daniel-Constantin Mierla 10 Mar '18

10 Mar '18

Module: kamailio Branch: master Commit: 96a1367ef9c0977c4b7ae378ad76ec22d393e990 URL: https://github.com/kamailio/kamailio/commit/96a1367ef9c0977c4b7ae378ad76ec2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-10T12:18:28+01:00 app_python3: renamed main files to match module name --- Added: src/modules/app_python3/app_python3_mod.c Added: src/modules/app_python3/app_python3_mod.h Modified: src/modules/app_python3/mod_Core.c Modified: src/modules/app_python3/mod_Logger.c Modified: src/modules/app_python3/mod_Ranks.c Modified: src/modules/app_python3/mod_Router.c Modified: src/modules/app_python3/python_exec.c Modified: src/modules/app_python3/python_support.c Removed: src/modules/app_python3/app_python_mod.c Removed: src/modules/app_python3/app_python_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/96a1367ef9c0977c4b7ae378ad76ec2… Patch: https://github.com/kamailio/kamailio/commit/96a1367ef9c0977c4b7ae378ad76ec2… --- diff --git a/src/modules/app_python3/app_python_mod.c b/src/modules/app_python3/app_python3_mod.c similarity index 99% rename from src/modules/app_python3/app_python_mod.c rename to src/modules/app_python3/app_python3_mod.c index 180bb74230..5d45f3f355 100644 --- a/src/modules/app_python3/app_python_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -31,7 +31,7 @@ #include "python_iface.h" #include "python_msgobj.h" #include "python_support.h" -#include "app_python_mod.h" +#include "app_python3_mod.h" #include "mod_Router.h" #include "mod_Core.h" diff --git a/src/modules/app_python3/app_python_mod.h b/src/modules/app_python3/app_python3_mod.h similarity index 94% rename from src/modules/app_python3/app_python_mod.h rename to src/modules/app_python3/app_python3_mod.h index 0c108e2d3f..b011036172 100644 --- a/src/modules/app_python3/app_python_mod.h +++ b/src/modules/app_python3/app_python3_mod.h @@ -19,8 +19,8 @@ * */ -#ifndef _PYTHON_MOD_H -#define _PYTHON_MOD_H +#ifndef _APP_PYTHON3_MOD_H +#define _APP_PYTHON3_MOD_H #include <Python.h> diff --git a/src/modules/app_python3/mod_Core.c b/src/modules/app_python3/mod_Core.c index 4572a1bb80..c8963b6011 100644 --- a/src/modules/app_python3/mod_Core.c +++ b/src/modules/app_python3/mod_Core.c @@ -33,7 +33,7 @@ // local includes #include "python_exec.h" -#include "app_python_mod.h" +#include "app_python3_mod.h" #include "python_iface.h" #include "python_msgobj.h" #include "python_support.h" diff --git a/src/modules/app_python3/mod_Logger.c b/src/modules/app_python3/mod_Logger.c index b723269bb8..424ed31bc9 100644 --- a/src/modules/app_python3/mod_Logger.c +++ b/src/modules/app_python3/mod_Logger.c @@ -33,7 +33,7 @@ // local includes #include "python_exec.h" -#include "app_python_mod.h" +#include "app_python3_mod.h" #include "python_iface.h" #include "python_msgobj.h" #include "python_support.h" diff --git a/src/modules/app_python3/mod_Ranks.c b/src/modules/app_python3/mod_Ranks.c index 80860284bd..118c2ca4f3 100644 --- a/src/modules/app_python3/mod_Ranks.c +++ b/src/modules/app_python3/mod_Ranks.c @@ -33,7 +33,7 @@ // local includes #include "python_exec.h" -#include "app_python_mod.h" +#include "app_python3_mod.h" #include "python_iface.h" #include "python_msgobj.h" #include "python_support.h" diff --git a/src/modules/app_python3/mod_Router.c b/src/modules/app_python3/mod_Router.c index 3fe96f08f1..04183ba47d 100644 --- a/src/modules/app_python3/mod_Router.c +++ b/src/modules/app_python3/mod_Router.c @@ -32,7 +32,7 @@ // local includes #include "python_exec.h" -#include "app_python_mod.h" +#include "app_python3_mod.h" #include "python_iface.h" #include "python_msgobj.h" #include "python_support.h" diff --git a/src/modules/app_python3/python_exec.c b/src/modules/app_python3/python_exec.c index 55f40c1e47..b402a2b9d6 100644 --- a/src/modules/app_python3/python_exec.c +++ b/src/modules/app_python3/python_exec.c @@ -33,7 +33,7 @@ #include "../../core/locking.h" #include "python_exec.h" -#include "app_python_mod.h" +#include "app_python3_mod.h" #include "python_msgobj.h" #include "python_support.h" diff --git a/src/modules/app_python3/python_support.c b/src/modules/app_python3/python_support.c index 2ad522901a..e7dc47d526 100644 --- a/src/modules/app_python3/python_support.c +++ b/src/modules/app_python3/python_support.c @@ -26,7 +26,7 @@ #include "../../core/dprint.h" #include "../../core/mem/mem.h" -#include "app_python_mod.h" +#include "app_python3_mod.h" #include "python_support.h" static char *make_message(const char *fmt, va_list args);

1 0

git:master:ba992b12: app_python3: skip execution of child_init() for rank PROC_INIT
by Daniel-Constantin Mierla 10 Mar '18

10 Mar '18

Module: kamailio Branch: master Commit: ba992b122eec30c5022d4c3e77af4e2f6eb0752a URL: https://github.com/kamailio/kamailio/commit/ba992b122eec30c5022d4c3e77af4e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-10T08:24:21+01:00 app_python3: skip execution of child_init() for rank PROC_INIT - this is a particular execution in main process after all modules were initialized, not in a forked child process --- Modified: src/modules/app_python3/app_python_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ba992b122eec30c5022d4c3e77af4e2… Patch: https://github.com/kamailio/kamailio/commit/ba992b122eec30c5022d4c3e77af4e2… --- diff --git a/src/modules/app_python3/app_python_mod.c b/src/modules/app_python3/app_python_mod.c index c6f1098e60..180bb74230 100644 --- a/src/modules/app_python3/app_python_mod.c +++ b/src/modules/app_python3/app_python_mod.c @@ -174,6 +174,9 @@ static int mod_init(void) */ static int child_init(int rank) { + if(rank==PROC_INIT) { + return 0; + } _apy_process_rank = rank; PyOS_AfterFork(); return apy_init_script(rank);

1 0

git:master:988cc68d: app_python: skip execution of child_init() for rank PROC_INIT
by Daniel-Constantin Mierla 10 Mar '18

10 Mar '18

Module: kamailio Branch: master Commit: 988cc68d62b8a00a69786e43f99417c05572aef6 URL: https://github.com/kamailio/kamailio/commit/988cc68d62b8a00a69786e43f99417c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-10T08:21:20+01:00 app_python: skip execution of child_init() for rank PROC_INIT - this is a particular execution in main process after all modules were initialized, not in a forked child process --- Modified: src/modules/app_python/app_python_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/988cc68d62b8a00a69786e43f99417c… Patch: https://github.com/kamailio/kamailio/commit/988cc68d62b8a00a69786e43f99417c… --- diff --git a/src/modules/app_python/app_python_mod.c b/src/modules/app_python/app_python_mod.c index 3f5463bd0a..5c5278f42d 100644 --- a/src/modules/app_python/app_python_mod.c +++ b/src/modules/app_python/app_python_mod.c @@ -174,6 +174,9 @@ static int mod_init(void) */ static int child_init(int rank) { + if(rank==PROC_INIT) { + return 0; + } _apy_process_rank = rank; PyOS_AfterFork(); return apy_init_script(rank);

1 0

git:master:11e918e1: app_python: call PyOS_AfterFork() in child
by AnthonyA 10 Mar '18

10 Mar '18

Module: kamailio Branch: master Commit: 11e918e1bb8cd1fce4ead00cc532669618b539ba URL: https://github.com/kamailio/kamailio/commit/11e918e1bb8cd1fce4ead00cc532669… Author: AntonyA <ascanio.alba7(a)gmail.com> Committer: AnthonyA <ascanio.alba7(a)gmail.com> Date: 2018-03-10T10:41:31+08:00 app_python: call PyOS_AfterFork() in child --- Modified: src/modules/app_python/app_python_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/11e918e1bb8cd1fce4ead00cc532669… Patch: https://github.com/kamailio/kamailio/commit/11e918e1bb8cd1fce4ead00cc532669… --- diff --git a/src/modules/app_python/app_python_mod.c b/src/modules/app_python/app_python_mod.c index 98738ee66c..3f5463bd0a 100644 --- a/src/modules/app_python/app_python_mod.c +++ b/src/modules/app_python/app_python_mod.c @@ -175,6 +175,7 @@ static int mod_init(void) static int child_init(int rank) { _apy_process_rank = rank; + PyOS_AfterFork(); return apy_init_script(rank); }

1 0

git:master:60816e1e: app_python3: call PyOS_AfterFork() in child
by AnthonyA 10 Mar '18

10 Mar '18

Module: kamailio Branch: master Commit: 60816e1eb9f83fbe4803f1096fdb15e3be390594 URL: https://github.com/kamailio/kamailio/commit/60816e1eb9f83fbe4803f1096fdb15e… Author: AntonyA <ascanio.alba7(a)gmail.com> Committer: AnthonyA <ascanio.alba7(a)gmail.com> Date: 2018-03-10T10:41:31+08:00 app_python3: call PyOS_AfterFork() in child --- Modified: src/modules/app_python3/app_python_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/60816e1eb9f83fbe4803f1096fdb15e… Patch: https://github.com/kamailio/kamailio/commit/60816e1eb9f83fbe4803f1096fdb15e… --- diff --git a/src/modules/app_python3/app_python_mod.c b/src/modules/app_python3/app_python_mod.c index c3229b181d..c6f1098e60 100644 --- a/src/modules/app_python3/app_python_mod.c +++ b/src/modules/app_python3/app_python_mod.c @@ -175,6 +175,7 @@ static int mod_init(void) static int child_init(int rank) { _apy_process_rank = rank; + PyOS_AfterFork(); return apy_init_script(rank); }

1 0

Re: [sr-dev] [kamailio/kamailio] db_mongodb: check mongo-c-driver version at least 1.5.0 to use projection (cdbee5a)
by kelchy 09 Mar '18

09 Mar '18

looks good daniel, i will test more -- 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/commit/cdbee5a536920c4fab3ec619c8467c1…

1 0

git:master:d12eba62: db_redis: Fix free(0) on update
by Andreas Granig 09 Mar '18

09 Mar '18

Module: kamailio Branch: master Commit: d12eba62bfaefa0db85e66cb21678c9cccda658b URL: https://github.com/kamailio/kamailio/commit/d12eba62bfaefa0db85e66cb21678c9… Author: Andreas Granig <agranig(a)sipwise.com> Committer: Andreas Granig <agranig(a)sipwise.com> Date: 2018-03-09T11:54:34+01:00 db_redis: Fix free(0) on update --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/d12eba62bfaefa0db85e66cb21678c9… Patch: https://github.com/kamailio/kamailio/commit/d12eba62bfaefa0db85e66cb21678c9… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index 247627189d..48bcf343d3 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -28,7 +28,7 @@ #include "redis_table.h" static void db_redis_dump_reply(redisReply *reply) { - int i; + int i; if (reply->type == REDIS_REPLY_STRING) { LM_DBG("%s\n", reply->str); } else if (reply->type == REDIS_REPLY_INTEGER) { @@ -218,7 +218,7 @@ static int db_redis_return_version(const db1_con_t* _h, km_redis_con_t *con, con } static int db_redis_build_entry_manual_keys(redis_table_t *table, const db_key_t *_k, - const db_val_t *_v, const int _n, int **manual_keys, int *manual_key_count) { + const db_val_t *_v, const int _n, int **manual_keys, int *manual_key_count) { // TODO: we also put keys here which are already part of type mapping! // there must be removed for performance reasons @@ -264,8 +264,8 @@ static int db_redis_build_entry_manual_keys(redis_table_t *table, const db_key_t } static int db_redis_find_query_key(redis_key_t *key, const str *table_name, - str *type_name, const db_key_t *_k, const db_val_t *_v, const int _n, - str *key_name, int *key_found) { + str *type_name, const db_key_t *_k, const db_val_t *_v, const int _n, + str *key_name, int *key_found) { unsigned int len; str val = {NULL, 0}; @@ -564,7 +564,7 @@ static int db_redis_build_query_keys(km_redis_con_t *con, const str *table_name, db_redis_free_reply(&reply); break; } else { - int i; + int i; LM_DBG("populating query keys list with result of type query\n"); *query_keys_count = reply->elements; for (i = 0; i < reply->elements; ++i) { @@ -1597,7 +1597,8 @@ static int db_redis_perform_update(const db1_con_t* _h, km_redis_con_t *con, con LM_ERR("Failed to add key to update query\n"); goto error; } - pkg_free(v.s); + if (v.s) + pkg_free(v.s); } update_queries++; if (db_redis_append_command_argv(con, query_v, 1) != REDIS_OK) {

1 0

git:master:cdbee5a5: db_mongodb: check mongo-c-driver version at least 1.5.0 to use projection
by Daniel-Constantin Mierla 09 Mar '18

09 Mar '18

Module: kamailio Branch: master Commit: cdbee5a536920c4fab3ec619c8467c152d6f110a URL: https://github.com/kamailio/kamailio/commit/cdbee5a536920c4fab3ec619c8467c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-09T10:39:40+01:00 db_mongodb: check mongo-c-driver version at least 1.5.0 to use projection - reported by GH #1479 --- Modified: src/modules/db_mongodb/mongodb_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/cdbee5a536920c4fab3ec619c8467c1… Patch: https://github.com/kamailio/kamailio/commit/cdbee5a536920c4fab3ec619c8467c1… --- diff --git a/src/modules/db_mongodb/mongodb_dbase.c b/src/modules/db_mongodb/mongodb_dbase.c index aee5a1ba0a..72d6647689 100644 --- a/src/modules/db_mongodb/mongodb_dbase.c +++ b/src/modules/db_mongodb/mongodb_dbase.c @@ -316,7 +316,9 @@ int db_mongodb_get_columns(const db1_con_t* _h, db1_res_t* _r) int col; db_mongodb_result_t *mgres; bson_iter_t riter; +#if MONGOC_CHECK_VERSION(1, 5, 0) bson_iter_t titer; +#endif bson_iter_t citer; bson_t *cdoc; const char *colname; @@ -360,6 +362,7 @@ int db_mongodb_get_columns(const db1_con_t* _h, db1_res_t* _r) } if(cdocproj == 1) { +#if MONGOC_CHECK_VERSION(1, 5, 0) if (!bson_iter_init (&titer, cdoc)) { LM_ERR("failed to initialize columns iterator\n"); return -3; @@ -373,6 +376,12 @@ int db_mongodb_get_columns(const db1_con_t* _h, db1_res_t* _r) LM_ERR("failed to init projection iterator\n"); return -3; } +#else + if (!bson_iter_init (&citer, cdoc)) { + LM_ERR("failed to initialize columns iterator\n"); + return -3; + } +#endif } else { if (!bson_iter_init (&citer, cdoc)) { LM_ERR("failed to initialize columns iterator\n"); @@ -506,7 +515,9 @@ static int db_mongodb_convert_bson(const db1_con_t* _h, db1_res_t* _r, const char *colname; bson_type_t coltype; bson_iter_t riter; +#if MONGOC_CHECK_VERSION(1, 5, 0) bson_iter_t titer; +#endif bson_iter_t citer; bson_iter_t *piter; db_val_t* dval; @@ -527,6 +538,7 @@ static int db_mongodb_convert_bson(const db1_con_t* _h, db1_res_t* _r, } } else { cdoc = (bson_t*)mgres->colsdoc; +#if MONGOC_CHECK_VERSION(1, 5, 0) if (!bson_iter_init (&titer, cdoc)) { LM_ERR("failed to initialize columns iterator\n"); return -3; @@ -540,6 +552,12 @@ static int db_mongodb_convert_bson(const db1_con_t* _h, db1_res_t* _r, LM_ERR("failed to init projection iterator\n"); return -3; } +#else + if (!bson_iter_init (&citer, cdoc)) { + LM_ERR("failed to initialize columns iterator\n"); + return -3; + } +#endif } if(mgres->colsdoc) { @@ -864,7 +882,9 @@ int db_mongodb_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op km_mongodb_con_t *mgcon; mongoc_client_t *client; bson_t *seldoc = NULL; +#if MONGOC_CHECK_VERSION(1, 5, 0) bson_t bcols; +#endif char *cname; char b1; char *jstr; @@ -944,23 +964,31 @@ int db_mongodb_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op LM_ERR("cannot initialize columns bson document\n"); goto error; } +#if MONGOC_CHECK_VERSION(1, 5, 0) if(!bson_append_document_begin (mgcon->colsdoc, "projection", 10, &bcols)) { LM_ERR("failed to start projection of fields\n"); goto error; } +#endif for(i = 0; i < _nc; i++) { +#if MONGOC_CHECK_VERSION(1, 5, 0) if(!bson_append_int32(&bcols, _c[i]->s, _c[i]->len, 1)) +#else + if(!bson_append_int32(mgcon->colsdoc, _c[i]->s, _c[i]->len, 1)) +#endif { LM_ERR("failed to append int to columns bson %.*s = %d [%d]\n", _c[i]->len, _c[i]->s, 1, i); goto error; } } +#if MONGOC_CHECK_VERSION(1, 5, 0) if(!bson_append_document_end (mgcon->colsdoc, &bcols)) { LM_ERR("failed to end projection of fields\n"); goto error; } +#endif if(is_printable(L_DBG)) { jstr = bson_as_json (mgcon->colsdoc, NULL); LM_DBG("columns filter: %s\n", jstr);

1 0

git:master:cb2e9029: db_redis: Fix null free in delete
by Andreas Granig 09 Mar '18

09 Mar '18

Module: kamailio Branch: master Commit: cb2e90295695432dc7b984e1f68abee01a6469de URL: https://github.com/kamailio/kamailio/commit/cb2e90295695432dc7b984e1f68abee… Author: Andreas Granig <agranig(a)sipwise.com> Committer: Andreas Granig <agranig(a)sipwise.com> Date: 2018-03-09T10:10:52+01:00 db_redis: Fix null free in delete --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/cb2e90295695432dc7b984e1f68abee… Patch: https://github.com/kamailio/kamailio/commit/cb2e90295695432dc7b984e1f68abee… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index 2fba2c5f54..247627189d 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -1393,7 +1393,6 @@ static int db_redis_perform_delete(const db1_con_t* _h, km_redis_con_t *con, con //db_redis_key_free(&type_keys); LM_DBG("+++ done with loop '%.*s'\n", k->key.len, k->key.s); } - pkg_free(query_v); db_redis_key_free(&type_keys); db_redis_key_free(&all_type_keys);

1 0

git:master:d6fbff7d: app_python3: check if kemi onsend_route callback name is set
by Daniel-Constantin Mierla 09 Mar '18

09 Mar '18

Module: kamailio Branch: master Commit: d6fbff7d8f6e4368e29bf5e52efda024ebe3dab9 URL: https://github.com/kamailio/kamailio/commit/d6fbff7d8f6e4368e29bf5e52efda02… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-09T09:45:34+01:00 app_python3: check if kemi onsend_route callback name is set --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/d6fbff7d8f6e4368e29bf5e52efda02… Patch: https://github.com/kamailio/kamailio/commit/d6fbff7d8f6e4368e29bf5e52efda02… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 97b39dfd72..d053ac1b7d 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -82,7 +82,10 @@ int sr_kemi_config_engine_python(sip_msg_t *msg, int rtype, str *rname, ret = apy_exec(msg, rname->s, NULL, 0); } } else if(rtype==ONSEND_ROUTE) { - ret = apy_exec(msg, "ksr_onsend_route", NULL, 0); + if(kemi_onsend_route_callback.len>0) { + ret = apy_exec(msg, kemi_onsend_route_callback.s, NULL, 0); + } + return 1; } else if(rtype==EVENT_ROUTE) { if(rname!=NULL && rname->s!=NULL) { ret = apy_exec(msg, rname->s,

1 0

git:master:d96429c9: app_sqlang: check if kemi onsend_route callback name is set
by Daniel-Constantin Mierla 09 Mar '18

09 Mar '18

Module: kamailio Branch: master Commit: d96429c95459a85e5a3d558fe4c139ae1c9c14d6 URL: https://github.com/kamailio/kamailio/commit/d96429c95459a85e5a3d558fe4c139a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-09T09:45:49+01:00 app_sqlang: check if kemi onsend_route callback name is set --- Modified: src/modules/app_sqlang/app_sqlang_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d96429c95459a85e5a3d558fe4c139a… Patch: https://github.com/kamailio/kamailio/commit/d96429c95459a85e5a3d558fe4c139a… --- diff --git a/src/modules/app_sqlang/app_sqlang_mod.c b/src/modules/app_sqlang/app_sqlang_mod.c index 9f85b012ba..6bbf70e199 100644 --- a/src/modules/app_sqlang/app_sqlang_mod.c +++ b/src/modules/app_sqlang/app_sqlang_mod.c @@ -166,7 +166,11 @@ int sr_kemi_config_engine_sqlang(sip_msg_t *msg, int rtype, str *rname, ret = app_sqlang_run_ex(msg, rname->s, NULL, NULL, NULL, 0); } } else if(rtype==ONSEND_ROUTE) { - ret = app_sqlang_run_ex(msg, "ksr_onsend_route", NULL, NULL, NULL, 0); + if(kemi_onsend_route_callback.len>0) { + ret = app_sqlang_run_ex(msg, kemi_onsend_route_callback.s, NULL, + NULL, NULL, 0); + } + return 1; } else if(rtype==EVENT_ROUTE) { if(rname!=NULL && rname->s!=NULL) { ret = app_sqlang_run_ex(msg, rname->s,

1 0

git:master:b9c3286e: app_python: check if kemi onsend_route callback name is set
by Daniel-Constantin Mierla 09 Mar '18

09 Mar '18

Module: kamailio Branch: master Commit: b9c3286e47d602f194dd750dce4759ad0d9f578c URL: https://github.com/kamailio/kamailio/commit/b9c3286e47d602f194dd750dce4759a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-09T09:45:23+01:00 app_python: check if kemi onsend_route callback name is set --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/b9c3286e47d602f194dd750dce4759a… Patch: https://github.com/kamailio/kamailio/commit/b9c3286e47d602f194dd750dce4759a… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index 9a683250de..f71a8171e7 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -79,7 +79,10 @@ int sr_kemi_config_engine_python(sip_msg_t *msg, int rtype, str *rname, ret = apy_exec(msg, rname->s, NULL, 0); } } else if(rtype==ONSEND_ROUTE) { - ret = apy_exec(msg, "ksr_onsend_route", NULL, 0); + if(kemi_onsend_route_callback.len>0) { + ret = apy_exec(msg, kemi_onsend_route_callback.s, NULL, 0); + } + return 1; } else if(rtype==EVENT_ROUTE) { if(rname!=NULL && rname->s!=NULL) { ret = apy_exec(msg, rname->s,

1 0

git:master:9bbef256: app_lua: check if kemi onsend_route callback name is set
by Daniel-Constantin Mierla 09 Mar '18

09 Mar '18

Module: kamailio Branch: master Commit: 9bbef2560cb14c64de9face52e843d0ab3524e6a URL: https://github.com/kamailio/kamailio/commit/9bbef2560cb14c64de9face52e843d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-09T09:45:10+01:00 app_lua: check if kemi onsend_route callback name is set --- Modified: src/modules/app_lua/app_lua_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9bbef2560cb14c64de9face52e843d0… Patch: https://github.com/kamailio/kamailio/commit/9bbef2560cb14c64de9face52e843d0… --- diff --git a/src/modules/app_lua/app_lua_mod.c b/src/modules/app_lua/app_lua_mod.c index ac536878c9..b4786b2745 100644 --- a/src/modules/app_lua/app_lua_mod.c +++ b/src/modules/app_lua/app_lua_mod.c @@ -140,7 +140,11 @@ int sr_kemi_config_engine_lua(sip_msg_t *msg, int rtype, str *rname, ret = app_lua_run_ex(msg, rname->s, NULL, NULL, NULL, 0); } } else if(rtype==ONSEND_ROUTE) { - ret = app_lua_run_ex(msg, "ksr_onsend_route", NULL, NULL, NULL, 0); + if(kemi_onsend_route_callback.len>0) { + ret = app_lua_run_ex(msg, kemi_onsend_route_callback.s, NULL, + NULL, NULL, 0); + } + return 1; } else if(rtype==EVENT_ROUTE) { if(rname!=NULL && rname->s!=NULL) { ret = app_lua_run_ex(msg, rname->s,

1 0

git:master:31aee738: app_jsdt: check if kemi onsend_route callback name is set
by Daniel-Constantin Mierla 09 Mar '18

09 Mar '18

Module: kamailio Branch: master Commit: 31aee7380ba1aa0cb6eddeaae709829087504aae URL: https://github.com/kamailio/kamailio/commit/31aee7380ba1aa0cb6eddeaae709829… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-09T09:44:10+01:00 app_jsdt: check if kemi onsend_route callback name is set --- Modified: src/modules/app_jsdt/app_jsdt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/31aee7380ba1aa0cb6eddeaae709829… Patch: https://github.com/kamailio/kamailio/commit/31aee7380ba1aa0cb6eddeaae709829… --- diff --git a/src/modules/app_jsdt/app_jsdt_mod.c b/src/modules/app_jsdt/app_jsdt_mod.c index 49f3670ff1..bbafc66972 100644 --- a/src/modules/app_jsdt/app_jsdt_mod.c +++ b/src/modules/app_jsdt/app_jsdt_mod.c @@ -165,7 +165,11 @@ int sr_kemi_config_engine_jsdt(sip_msg_t *msg, int rtype, str *rname, ret = app_jsdt_run_ex(msg, rname->s, NULL, NULL, NULL, 0); } } else if(rtype==ONSEND_ROUTE) { - ret = app_jsdt_run_ex(msg, "ksr_onsend_route", NULL, NULL, NULL, 0); + if(kemi_onsend_route_callback.len>0) { + ret = app_jsdt_run_ex(msg, kemi_onsend_route_callback.s, + NULL, NULL, NULL, 0); + } + return 1; } else if(rtype==EVENT_ROUTE) { if(rname!=NULL && rname->s!=NULL) { ret = app_jsdt_run_ex(msg, rname->s,

1 0

git:master:b7ea6973: core: new parameter kemi.onsend_route_callback
by Daniel-Constantin Mierla 09 Mar '18

09 Mar '18

Module: kamailio Branch: master Commit: b7ea6973ff17b31b814c3fb0c40f52aae364ed8b URL: https://github.com/kamailio/kamailio/commit/b7ea6973ff17b31b814c3fb0c40f52a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-09T09:29:29+01:00 core: new parameter kemi.onsend_route_callback - allow setting the name of the function to be called by kemi framework as equivalent of onsend_route {} - default value: ksr_onsend_route - set to empty string or "none" to skip the execution of this kemi callback --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/kemi.c Modified: src/core/kemi.h Modified: src/core/onsend.h --- Diff: https://github.com/kamailio/kamailio/commit/b7ea6973ff17b31b814c3fb0c40f52a… Patch: https://github.com/kamailio/kamailio/commit/b7ea6973ff17b31b814c3fb0c40f52a… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index d66857e169..abe2c250f4 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -445,6 +445,9 @@ VERBOSE_STARTUP "verbose_startup" SERVER_ID "server_id" +KEMI "kemi" +ONSEND_ROUTE_CALLBACK "onsend_route_callback" + MAX_RECURSIVE_LEVEL "max_recursive_level" MAX_BRANCHES_PARAM "max_branches"|"max_branches" @@ -929,6 +932,8 @@ IMPORTFILE "import_file" <INITIAL>{VERBOSE_STARTUP} { count(); yylval.strval=yytext; return VERBOSE_STARTUP; } <INITIAL>{SERVER_ID} { count(); yylval.strval=yytext; return SERVER_ID;} +<INITIAL>{KEMI} { count(); yylval.strval=yytext; return KEMI;} +<INITIAL>{ONSEND_ROUTE_CALLBACK} { count(); yylval.strval=yytext; return ONSEND_ROUTE_CALLBACK;} <INITIAL>{MAX_RECURSIVE_LEVEL} { count(); yylval.strval=yytext; return MAX_RECURSIVE_LEVEL;} <INITIAL>{MAX_BRANCHES_PARAM} { count(); yylval.strval=yytext; return MAX_BRANCHES_PARAM;} <INITIAL>{LATENCY_LOG} { count(); yylval.strval=yytext; return LATENCY_LOG;} diff --git a/src/core/cfg.y b/src/core/cfg.y index 85105120b7..e8f76d3537 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -482,6 +482,8 @@ extern char *default_routename; %token VERBOSE_STARTUP %token CFG_DESCRIPTION %token SERVER_ID +%token KEMI +%token ONSEND_ROUTE_CALLBACK %token MAX_RECURSIVE_LEVEL %token MAX_BRANCHES_PARAM %token LATENCY_CFG_LOG @@ -1568,6 +1570,15 @@ assign_stm: | VERBOSE_STARTUP EQUAL error { yyerror("boolean value expected"); } | SERVER_ID EQUAL NUMBER { server_id=$3; } | SERVER_ID EQUAL error { yyerror("number expected"); } + | KEMI DOT ONSEND_ROUTE_CALLBACK EQUAL STRING { + kemi_onsend_route_callback.s = $5; + kemi_onsend_route_callback.len = strlen($5); + if(kemi_onsend_route_callback.len==4 + && strcasecmp(kemi_onsend_route_callback.s, "none")==0) { + kemi_onsend_route_callback.s = ""; + kemi_onsend_route_callback.len = 0; + } + } | MAX_RECURSIVE_LEVEL EQUAL NUMBER { set_max_recursive_level($3); } | MAX_BRANCHES_PARAM EQUAL NUMBER { sr_dst_max_branches = $3; } | LATENCY_LOG EQUAL intno { default_core_cfg.latency_log=$3; } diff --git a/src/core/kemi.c b/src/core/kemi.c index 8348756536..6e078af92c 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -42,6 +42,7 @@ #define SR_KEMI_HNAME_SIZE 128 +str kemi_onsend_route_callback = str_init("ksr_onsend_route"); /** * */ diff --git a/src/core/kemi.h b/src/core/kemi.h index df8ae5ee69..8b33c44aa3 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -37,6 +37,8 @@ #define SR_KEMI_PARAMS_MAX 6 +extern str kemi_onsend_route_callback; + typedef struct sr_kemi { str mname; /* sub-module name */ str fname; /* function name */ diff --git a/src/core/onsend.h b/src/core/onsend.h index 16ea5ce17c..90dbf8c8f0 100644 --- a/src/core/onsend.h +++ b/src/core/onsend.h @@ -71,7 +71,9 @@ static inline int run_onsend(sip_msg_t* orig_msg, dest_info_t* dst, } ret=1; // do if onsend_route{} or cfgengine exists - keng = sr_kemi_eng_get(); + if(kemi_onsend_route_callback.len>0) { + keng = sr_kemi_eng_get(); + } if (onsend_rt.rlist[DEFAULT_RT] || keng){ onsnd_info.to=&dst->to; onsnd_info.send_sock=dst->send_sock;

1 0

[kamailio/kamailio] pkg/docker: Updated reference to packaging scripts (#1478)
by sergey-safarov 09 Mar '18

09 Mar '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1478 -- Commit Summary -- * pkg/docker: Updated reference to packaging scripts -- File Changes -- M pkg/docker (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1478.patch https://github.com/kamailio/kamailio/pull/1478.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/1478

2 2

git:5.1:94842499: pkg/docker: Updated reference to packaging scripts
by Daniel-Constantin Mierla 09 Mar '18

09 Mar '18

Module: kamailio Branch: 5.1 Commit: 94842499ffd4cc1fdea40e45af996c8e2efc82cc URL: https://github.com/kamailio/kamailio/commit/94842499ffd4cc1fdea40e45af996c8… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-09T09:03:46+01:00 pkg/docker: Updated reference to packaging scripts --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/94842499ffd4cc1fdea40e45af996c8… Patch: https://github.com/kamailio/kamailio/commit/94842499ffd4cc1fdea40e45af996c8… --- diff --git a/pkg/docker b/pkg/docker index dee22bb1ec..9f04def504 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit dee22bb1ec7bda31723349f37602a5ac6ef8445a +Subproject commit 9f04def504051dc8da3989b1f96e4b6633d31a75

1 0

git:master:2a5d66fd: db_mongodb: add error logger for failed query
by Daniel-Constantin Mierla 09 Mar '18

09 Mar '18

Module: kamailio Branch: master Commit: 2a5d66fda013197aa5fbe4828cc7f6e61a74a9d6 URL: https://github.com/kamailio/kamailio/commit/2a5d66fda013197aa5fbe4828cc7f6e… Author: kelchy <kelchy(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-09T09:03:34+01:00 db_mongodb: add error logger for failed query --- Modified: src/modules/db_mongodb/mongodb_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/2a5d66fda013197aa5fbe4828cc7f6e… Patch: https://github.com/kamailio/kamailio/commit/2a5d66fda013197aa5fbe4828cc7f6e… --- diff --git a/src/modules/db_mongodb/mongodb_dbase.c b/src/modules/db_mongodb/mongodb_dbase.c index b1c9ac2bb7..aee5a1ba0a 100644 --- a/src/modules/db_mongodb/mongodb_dbase.c +++ b/src/modules/db_mongodb/mongodb_dbase.c @@ -753,6 +753,7 @@ static int db_mongodb_store_result(const db1_con_t* _h, db1_res_t** _r) km_mongodb_con_t *mgcon; db_mongodb_result_t *mgres; const bson_t *itdoc; + bson_error_t error; mgcon = MONGODB_CON(_h); if(!_r) { @@ -777,7 +778,11 @@ static int db_mongodb_store_result(const db1_con_t* _h, db1_res_t** _r) if(!mongoc_cursor_more (mgres->cursor) || !mongoc_cursor_next (mgres->cursor, &itdoc) || !itdoc) { - LM_DBG("no result from mongodb\n"); + if (mongoc_cursor_error (mgres->cursor, &error)) { + LM_DBG("An error occurred: %s\n", error.message); + } else { + LM_DBG("no result from mongodb\n"); + } return 0; } /* first document linked internally in result to get columns */

1 0

[kamailio/kamailio] db_mongodb: add error logger for failed query (#1477)
by kelchy 09 Mar '18

09 Mar '18

#### Pre-Submission Checklist    - [ X] Commit message has the format required by CONTRIBUTING guide - [ ]X Commits are split per component (core, individual modules, libs, utils, ...) - [ X] Each component has a single commit (if not, squash them into one commit) - [ X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  db_mongodb: Add error logger for failed query You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1477 -- Commit Summary -- * db_mongodb: add error logger for failed query -- File Changes -- M src/modules/db_mongodb/mongodb_dbase.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1477.patch https://github.com/kamailio/kamailio/pull/1477.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/1477

2 2

git:master:e87cad92: rtpengine: explicitly handle new option flags (transcoding)
by Richard Fuchs 08 Mar '18

08 Mar '18

Module: kamailio Branch: master Commit: e87cad921057a6bdf1619384b6acab8d207eb5c8 URL: https://github.com/kamailio/kamailio/commit/e87cad921057a6bdf1619384b6acab8… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2018-03-08T10:16:22-05:00 rtpengine: explicitly handle new option flags (transcoding) --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/e87cad921057a6bdf1619384b6acab8… Patch: https://github.com/kamailio/kamailio/commit/e87cad921057a6bdf1619384b6acab8…

1 0

git:master:61279f2e: modules: readme files regenerated - db_redis ... [skip ci]
by Kamailio Dev 08 Mar '18

08 Mar '18

Module: kamailio Branch: master Commit: 61279f2e64e950a4a53694c06ff1228f233d24f9 URL: https://github.com/kamailio/kamailio/commit/61279f2e64e950a4a53694c06ff1228… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-03-08T16:01:24+01:00 modules: readme files regenerated - db_redis ... [skip ci] --- Modified: src/modules/db_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/61279f2e64e950a4a53694c06ff1228… Patch: https://github.com/kamailio/kamailio/commit/61279f2e64e950a4a53694c06ff1228… --- diff --git a/src/modules/db_redis/README b/src/modules/db_redis/README index cc421eecd3..8378057da5 100644 --- a/src/modules/db_redis/README +++ b/src/modules/db_redis/README @@ -36,6 +36,9 @@ Alex Balashov 5. External Libraries or Applications 6. Usage + 7. Module specific considerations + + 7.1. usrloc List of Examples @@ -60,6 +63,9 @@ Chapter 1. Admin Guide 5. External Libraries or Applications 6. Usage + 7. Module specific considerations + + 7.1. usrloc 1. Overview @@ -196,3 +202,13 @@ modparam("usrloc", "db_url", DBURL_USRLOC) modparam("acc_db", "db_url", DBURL_ACC) modparam("auth_db", "db_url", DBURL_AUTH) ... + +7. Module specific considerations + + 7.1. usrloc + +7.1. usrloc + + If you set "expires_type" to "1" in order to use BIGINT instead of + DATETIME, make sure to update your location schema file and change the + type of "expires" and "last_modified" from "time" to "int".

1 0

git:master:c9f2aa71: db_redis: Align schema with usrloc expires_type default
by Andreas Granig 08 Mar '18

08 Mar '18

Module: kamailio Branch: master Commit: c9f2aa71b2e0d4a4f71b3da92f97306e86f93eea URL: https://github.com/kamailio/kamailio/commit/c9f2aa71b2e0d4a4f71b3da92f97306… Author: Andreas Granig <agranig(a)sipwise.com> Committer: Andreas Granig <agranig(a)sipwise.com> Date: 2018-03-08T15:54:24+01:00 db_redis: Align schema with usrloc expires_type default Since expires_type is DATETIME by default, use "time" type in upstream schema for location table. --- Modified: src/modules/db_redis/doc/db_redis_admin.xml Modified: utils/kamctl/db_redis/kamailio/location --- Diff: https://github.com/kamailio/kamailio/commit/c9f2aa71b2e0d4a4f71b3da92f97306… Patch: https://github.com/kamailio/kamailio/commit/c9f2aa71b2e0d4a4f71b3da92f97306… --- diff --git a/src/modules/db_redis/doc/db_redis_admin.xml b/src/modules/db_redis/doc/db_redis_admin.xml index 168bd500d4..f57fa8064e 100644 --- a/src/modules/db_redis/doc/db_redis_admin.xml +++ b/src/modules/db_redis/doc/db_redis_admin.xml @@ -189,4 +189,17 @@ modparam("auth_db", "db_url", DBURL_AUTH) </programlisting> </example> </section> + + <section> + <title>Module specific considerations</title> + <section> + <title>usrloc</title> + <para> + If you set "expires_type" to "1" in order to use BIGINT instead of DATETIME, + make sure to update your location schema file and change the type of "expires" + and "last_modified" from "time" to "int". + </para> + </section> + </section> + </chapter> diff --git a/utils/kamctl/db_redis/kamailio/location b/utils/kamctl/db_redis/kamailio/location index 9ca18f2fb0..7c0ea2ab81 100644 --- a/utils/kamctl/db_redis/kamailio/location +++ b/utils/kamctl/db_redis/kamailio/location @@ -1,2 +1,2 @@ -id/int,ruid/string,username/string,domain/string,contact/string,received/string,path/string,expires/int,q/double,callid/string,cseq/int,last_modified/int,flags/int,cflags/int,user_agent/string,socket/string,methods/int,instance/string,reg_id/int,server_id/int,connection_id/int,keepalive/int,partition/int, +id/int,ruid/string,username/string,domain/string,contact/string,received/string,path/string,expires/time,q/double,callid/string,cseq/int,last_modified/time,flags/int,cflags/int,user_agent/string,socket/string,methods/int,instance/string,reg_id/int,server_id/int,connection_id/int,keepalive/int,partition/int, 9

1 0

[kamailio/kamailio] KEMI onsend_route method is not called (#1474)
by aalba6675 08 Mar '18

08 Mar '18

### Description KEMI onsend_route is not called unless there is a placeholder/dummy routing block. ``` ## without this block, core will never call KEMI->onsend_route onsend_route { ## do nothing } ``` ### Troubleshooting #### Reproduction 1. In KEMI create ksr_onsend_route(). Observe that this function is never invoked. 2. Add a route block: ``` onsend_route { ## do nothing } ``` Now observe, that KEMI ksr_onsend_route() is called. #### Debugging Data #### Log Messages #### SIP Traffic ### Possible Solutions Not really a problem, just a surprise to the KEMI user. Possibly, document that in order for the KEMI function to be called, the configuration file needs a dummy routing block for onsend_route. ### Additional Information The reason is the following logic: onsend.h: `ret=keng->froute(orig_msg, ONSEND_ROUTE, NULL, NULL);` This line is called only if `onsend_rt.rlist[DEFAULT_RT]` is non-NULL, but this array is initialized only if the `onsend_route` block exists. * **Kamailio Version** - 5.1, master * **Operating System**: Linux CentOS 7.4 -- 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/issues/1474

2 3

git:master:1b831f8d: modules: readme files regenerated - app_jsdt ... [skip ci]
by Kamailio Dev 08 Mar '18

08 Mar '18

Module: kamailio Branch: master Commit: 1b831f8dab3fb9f7c0c4562fee6d192face16e56 URL: https://github.com/kamailio/kamailio/commit/1b831f8dab3fb9f7c0c4562fee6d192… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-03-08T13:16:28+01:00 modules: readme files regenerated - app_jsdt ... [skip ci] --- Modified: src/modules/app_jsdt/README --- Diff: https://github.com/kamailio/kamailio/commit/1b831f8dab3fb9f7c0c4562fee6d192… Patch: https://github.com/kamailio/kamailio/commit/1b831f8dab3fb9f7c0c4562fee6d192… --- diff --git a/src/modules/app_jsdt/README b/src/modules/app_jsdt/README index 8679cb1bd6..4186cced58 100644 --- a/src/modules/app_jsdt/README +++ b/src/modules/app_jsdt/README @@ -79,14 +79,15 @@ Chapter 1. Admin Guide 1. Overview - This module allows executing JavaScript scripts from config file. It - exports all KEMI functions to JavaScript in order to access the current - processed SIP message. These functions are within JavaScript object - 'KSR'. + This module allows executing JavaScript scripts from the Kamailio + configuration file. It exports all KEMI functions to JavaScript in + order to access the currently processed SIP message. These functions + are named within the JavaScript object 'KSR'. - It includes the Duktape JavaScript engine (http://www.duktape.org), - which is a fast and easy to embed JavaScript interpreter. Exported API - from SIP router to JavaScript is documented in the dokuwiki. + The module is based on the Duktape JavaScript engine + (http://www.duktape.org), which is a fast and easy to embed JavaScript + interpreter. The exported API from Kamailio to JavaScript is documented + in the wiki. The module has two JavaScript contexts: * first is used for functions jsdt_dofile() and jsdt_dostring(). @@ -94,7 +95,7 @@ Chapter 1. Admin Guide Therefore jsdt_run() cannot execute functions from scripts loaded via jsdt_dofile() in config. This is kind of caching mode, avoiding reading file every time, but you must be sure you do not have - something that is executed by default and requires access to SIP + someting that is executed by default and requires access to SIP message. This environment is also used by KEMI framework for the config SIP routing functions. @@ -113,7 +114,7 @@ Chapter 1. Admin Guide The following libraries or applications must be installed before running Kamailio with this module loaded: * libm - the math library (part of standard system libraries - it is - needed to compile embedded Duktape JS interpreter). + needed to complile embedded Duktape JS interpreter). 3. Parameters @@ -142,8 +143,8 @@ modparam("app_jsdt", "load", "/usr/local/etc/kamailio/js/myscript.js") 4.1. jsdt_dofile(path) - Execute the JS script stored in 'path'. The parameter can be a string - with pseudo-variables evaluated at runtime. + Execute the JavaScript script stored in 'path'. The parameter can be a + string with pseudo-variables evaluated at runtime. Example 1.2. jsdt_dofile usage ... @@ -152,8 +153,8 @@ jsdt_dofile("/usr/local/etc/kamailio/js/myscript.js"); 4.2. jsdt_dostring(script) - Execute the Lua script stored in parameter. The parameter can be a - string with pseudo-variables. + Execute the JavaScript script stored in parameter. The parameter can be + a string with pseudo-variables. Example 1.3. jsdt_dostring usage ... @@ -229,7 +230,7 @@ kamcmd app_jsdt.api_list 6. Example of usage - Create your JS script and stored on file system, say: + Create your JS script and store it on the file system, say: '/usr/local/etc/kamailio/js/myscript.js'. ... function sr_append_fu_to_reply()

1 0

git:master:7b0ad6b1: app_jsdt Minor update to documentation
by Olle E. Johansson 08 Mar '18

08 Mar '18

Module: kamailio Branch: master Commit: 7b0ad6b1a11687d035d4be92202ae1379f07fb20 URL: https://github.com/kamailio/kamailio/commit/7b0ad6b1a11687d035d4be92202ae13… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2018-03-08T13:08:08+01:00 app_jsdt Minor update to documentation --- Modified: src/modules/app_jsdt/doc/app_jsdt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7b0ad6b1a11687d035d4be92202ae13… Patch: https://github.com/kamailio/kamailio/commit/7b0ad6b1a11687d035d4be92202ae13… --- diff --git a/src/modules/app_jsdt/doc/app_jsdt_admin.xml b/src/modules/app_jsdt/doc/app_jsdt_admin.xml index b0926256d4..d4fd89d377 100644 --- a/src/modules/app_jsdt/doc/app_jsdt_admin.xml +++ b/src/modules/app_jsdt/doc/app_jsdt_admin.xml @@ -17,15 +17,16 @@ <section> <title>Overview</title> <para> - This module allows executing JavaScript scripts from config file. + This module allows executing JavaScript scripts from the Kamailio + configuration file. It exports all KEMI functions to JavaScript in order to access the - current processed SIP message. These functions are within JavaScript - object 'KSR'. + currently processed SIP message. These functions are named within + the JavaScript object 'KSR'. </para> <para> - It includes the Duktape JavaScript engine (http://www.duktape.org), - which is a fast and easy to embed JavaScript interpreter. Exported API - from SIP router to JavaScript is documented in the dokuwiki. + The module is based on the Duktape JavaScript engine (http://www.duktape.org), + which is a fast and easy to embed JavaScript interpreter. The exported API + from Kamailio to JavaScript is documented in the wiki. </para> <para> The module has two JavaScript contexts: @@ -42,7 +43,7 @@ and parameter 'load'. Therefore jsdt_run() cannot execute functions from scripts loaded via jsdt_dofile() in config. This is kind of caching mode, avoiding reading file every time, but you must be sure - you do not have something that is executed by default and requires + you do not have someting that is executed by default and requires access to SIP message. This environment is also used by KEMI framework for the config SIP routing functions. </para> @@ -74,7 +75,7 @@ <listitem> <para> <emphasis>libm</emphasis> - the math library (part of standard - system libraries - it is needed to compile embedded Duktape JS + system libraries - it is needed to complile embedded Duktape JS interpreter). </para> </listitem> @@ -116,7 +117,7 @@ modparam("app_jsdt", "load", "/usr/local/etc/kamailio/js/myscript.js") <function moreinfo="none">jsdt_dofile(path)</function> </title> <para> - Execute the JS script stored in 'path'. The parameter can be + Execute the JavaScript script stored in 'path'. The parameter can be a string with pseudo-variables evaluated at runtime. </para> <example> @@ -134,7 +135,7 @@ jsdt_dofile("/usr/local/etc/kamailio/js/myscript.js"); <function moreinfo="none">jsdt_dostring(script)</function> </title> <para> - Execute the Lua script stored in parameter. The parameter can be + Execute the JavaScript script stored in parameter. The parameter can be a string with pseudo-variables. </para> <example> @@ -248,7 +249,7 @@ if(!jsdt_runstring('KSR.dbg("Hello World from $fU\n")')) <section> <title>Example of usage</title> <para> - Create your JS script and stored on file system, + Create your JS script and store it on the file system, say: '/usr/local/etc/kamailio/js/myscript.js'. </para> <programlisting format="linespecific">

1 0

[kamailio/kamailio] core: invoke KEMI ksr_onsend_route() unconditionally in cfgengine (#1475)
by aalba6675 08 Mar '18

08 Mar '18

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Currently we need a onsend_route{} (empty is ok) block in config before KEMI ksr_onsend_route() is invoked. The latter will override the route block. This PR will unconditonally invoke KEMI ksr_onsend_route() so we do not need a placeholder in config. For discussion: this will unconditionally invoke ksr_onsend_route() so it might break scripts that don't have an implementation. Should be document that ksr_onsend_route should be implemented (just return 1 is ok). I'm not too clear about the error handling in run_onsend(): it's possible that if KEMI ksr_onsend_route throws error (not implemented rather than real error) then the message might be dropped. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1475 -- Commit Summary -- * core: invoke KEMI ksr_onsend_route() -- File Changes -- M src/core/onsend.h (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1475.patch https://github.com/kamailio/kamailio/pull/1475.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/1475

2 3

[kamailio/kamailio] pkg/docker: Updated reference to packaging scripts (#1472)
by sergey-safarov 08 Mar '18

08 Mar '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1472 -- Commit Summary -- * pkg/docker: Updated reference to packaging scripts -- File Changes -- M pkg/docker (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1472.patch https://github.com/kamailio/kamailio/pull/1472.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/1472

2 1

git:master:956cad7e: pkg/docker: Updated reference to packaging scripts
by Daniel-Constantin Mierla 08 Mar '18

08 Mar '18

Module: kamailio Branch: master Commit: 956cad7e070c7d1936c7fef5666e72db1a0578ac URL: https://github.com/kamailio/kamailio/commit/956cad7e070c7d1936c7fef5666e72d… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-08T12:00:54+01:00 pkg/docker: Updated reference to packaging scripts --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/956cad7e070c7d1936c7fef5666e72d… Patch: https://github.com/kamailio/kamailio/commit/956cad7e070c7d1936c7fef5666e72d… --- diff --git a/pkg/docker b/pkg/docker index dee22bb1ec..9f04def504 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit dee22bb1ec7bda31723349f37602a5ac6ef8445a +Subproject commit 9f04def504051dc8da3989b1f96e4b6633d31a75

1 0

git:master:4494b60c: core: invoke KEMI ksr_onsend_route()
by Daniel-Constantin Mierla 08 Mar '18

08 Mar '18

Module: kamailio Branch: master Commit: 4494b60c430f5e5c6a3a3eb4c025f206a9c3a1f7 URL: https://github.com/kamailio/kamailio/commit/4494b60c430f5e5c6a3a3eb4c025f20… Author: AntonyA <ascanio.alba7(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-08T12:00:32+01:00 core: invoke KEMI ksr_onsend_route() This will invoke ksr_onsend_route() unconditionally in the cfgengine. --- Modified: src/core/onsend.h --- Diff: https://github.com/kamailio/kamailio/commit/4494b60c430f5e5c6a3a3eb4c025f20… Patch: https://github.com/kamailio/kamailio/commit/4494b60c430f5e5c6a3a3eb4c025f20… --- diff --git a/src/core/onsend.h b/src/core/onsend.h index a2e8f569fd..16ea5ce17c 100644 --- a/src/core/onsend.h +++ b/src/core/onsend.h @@ -70,7 +70,9 @@ static inline int run_onsend(sip_msg_t* orig_msg, dest_info_t* dst, return 1; } ret=1; - if (onsend_rt.rlist[DEFAULT_RT]){ + // do if onsend_route{} or cfgengine exists + keng = sr_kemi_eng_get(); + if (onsend_rt.rlist[DEFAULT_RT] || keng){ onsnd_info.to=&dst->to; onsnd_info.send_sock=dst->send_sock; onsnd_info.buf=buf; @@ -86,8 +88,7 @@ static inline int run_onsend(sip_msg_t* orig_msg, dest_info_t* dst, orig_msg->fwd_send_flags=dst->send_flags; /* intial value */ init_run_actions_ctx(&ra_ctx); - keng = sr_kemi_eng_get(); - if(unlikely(keng!=NULL)) { + if(keng) { bctx = sr_kemi_act_ctx_get(); sr_kemi_act_ctx_set(&ra_ctx); ret=keng->froute(orig_msg, ONSEND_ROUTE, NULL, NULL);

1 0

git:master:6abd8472: kamctl: set default PID_FILE to /var/run/kamailio/kamailio.pid
by Daniel-Constantin Mierla 08 Mar '18

08 Mar '18

Module: kamailio Branch: master Commit: 6abd8472b764f88c5c054becb440fda8fff47349 URL: https://github.com/kamailio/kamailio/commit/6abd8472b764f88c5c054becb440fda… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-08T08:55:35+01:00 kamctl: set default PID_FILE to /var/run/kamailio/kamailio.pid - this being now the path used by default kamailio options --- Modified: utils/kamctl/kamctl.base Modified: utils/kamctl/kamctlrc --- Diff: https://github.com/kamailio/kamailio/commit/6abd8472b764f88c5c054becb440fda… Patch: https://github.com/kamailio/kamailio/commit/6abd8472b764f88c5c054becb440fda… --- diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index eb8ab554b7..641449422c 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -101,7 +101,7 @@ fi ##### ------------------------------------------------ ##### ### configuration for starting/stopping kamailio if [ -z "$PID_FILE" ] ; then - PID_FILE=/var/run/kamailio.pid + PID_FILE=/var/run/kamailio/kamailio.pid fi if [ -z "$SYSLOG" ] ; then SYSLOG=1 # 0=output to console, 1=output to syslog diff --git a/utils/kamctl/kamctlrc b/utils/kamctl/kamctlrc index 836290a5b8..d6e927fe84 100644 --- a/utils/kamctl/kamctlrc +++ b/utils/kamctl/kamctlrc @@ -154,7 +154,7 @@ # STORE_PLAINTEXT_PW=0 ## Kamailio START Options -## PID file path - default is: /var/run/kamailio.pid +## PID file path - default is: /var/run/kamailio/kamailio.pid # PID_FILE=/var/run/kamailio/kamailio.pid ## Extra start options - default is: not set

1 0

git:master:42610691: modules: readme files regenerated - async ... [skip ci]
by Kamailio Dev 07 Mar '18

07 Mar '18

Module: kamailio Branch: master Commit: 42610691aa3b19fe47caed0b186a10253e6aaabd URL: https://github.com/kamailio/kamailio/commit/42610691aa3b19fe47caed0b186a102… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-03-07T22:31:26+01:00 modules: readme files regenerated - async ... [skip ci] --- Modified: src/modules/async/README --- Diff: https://github.com/kamailio/kamailio/commit/42610691aa3b19fe47caed0b186a102… Patch: https://github.com/kamailio/kamailio/commit/42610691aa3b19fe47caed0b186a102… --- diff --git a/src/modules/async/README b/src/modules/async/README index 26db487939..2e8357b52d 100644 --- a/src/modules/async/README +++ b/src/modules/async/README @@ -136,8 +136,11 @@ modparam("async", "workers", 2) Example 1.2. async_route usage ... -async_route("RESUME", "4"); -... +request_route { + ... + async_route("RESUME", "4"); + ... +} route[RESUME] { send_reply("404", "Not found"); exit; @@ -177,7 +180,7 @@ exit; Example 1.4. async_workers usage ... -; Enable 8 worker processes used by async and other modules +# Enable 8 worker processes used by async and other modules async_workers=8 ... @@ -197,8 +200,11 @@ async_workers=8 Example 1.5. async_task_route usage ... -async_task_route("RESUME"); -... +request_route { + ... + async_task_route("RESUME"); + ... +} route[RESUME] { t_relay(); exit;

1 0

git:master:15731d40: async: docs - some improvements to examples
by Daniel-Constantin Mierla 07 Mar '18

07 Mar '18

Module: kamailio Branch: master Commit: 15731d40ff1af78bf568d19bdbe4704d35931afd URL: https://github.com/kamailio/kamailio/commit/15731d40ff1af78bf568d19bdbe4704… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-07T22:29:55+01:00 async: docs - some improvements to examples --- Modified: src/modules/async/doc/async_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/15731d40ff1af78bf568d19bdbe4704… Patch: https://github.com/kamailio/kamailio/commit/15731d40ff1af78bf568d19bdbe4704… --- diff --git a/src/modules/async/doc/async_admin.xml b/src/modules/async/doc/async_admin.xml index f7de934bdb..d829679b2d 100644 --- a/src/modules/async/doc/async_admin.xml +++ b/src/modules/async/doc/async_admin.xml @@ -10,9 +10,9 @@  <chapter> - + <title>&adminguide;</title> - + <section> <title>Overview</title> <para> @@ -24,7 +24,7 @@ </para> <para> Note that after invoking the asynchronous operation, the processing - will continue later in another application process. Therefore variables + will continue later in another application process. Therefore variables stored in private memory should not be used, try to use shared memory if you want to get values after the processing is resumed (e.g., $avp(...), $xavp(...), $shv(...), htable $sht(...)). @@ -72,7 +72,7 @@ <title><varname>workers</varname> (int)</title> <para> Number of worker processes to be started to handle the asynchronous - tasks for async_route() and async_sleep(). + tasks for async_route() and async_sleep(). </para> <para> <emphasis> @@ -124,8 +124,11 @@ modparam("async", "workers", 2) <title><function>async_route</function> usage</title> <programlisting format="linespecific"> ... -async_route("RESUME", "4"); -... +request_route { + ... + async_route("RESUME", "4"); + ... +} route[RESUME] { send_reply("404", "Not found"); exit; @@ -184,7 +187,7 @@ exit; <title><function>async_workers</function> usage</title> <programlisting format="linespecific"> ... -; Enable 8 worker processes used by async and other modules +# Enable 8 worker processes used by async and other modules async_workers=8 ... </programlisting> @@ -212,8 +215,11 @@ async_workers=8 <title><function>async_task_route</function> usage</title> <programlisting format="linespecific"> ... -async_task_route("RESUME"); -... +request_route { + ... + async_task_route("RESUME"); + ... +} route[RESUME] { t_relay(); exit; @@ -224,4 +230,3 @@ route[RESUME] { </section> </section> </chapter> -

1 0

[kamailio/kamailio] cannot load app_perl (#1465)
by sergey-safarov 07 Mar '18

07 Mar '18

### Description i wants load this [config](https://github.com/nemergent/NG112LIS/blob/master/kamailio.cfg) on docker image `kamailio/kamailio-ci:5.1-alpine.debug` During config parsing i got error 0(10) ERROR: <core> [core/sr_module.c:636]: load_module(): Symbol not found: exports 0(10) CRITICAL: <core> [core/cfg.y:3446]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 300, column 12-24: failed to load module ### Troubleshooting I checked symbol inside `app_perl.so` and cannot find `exports` ``` @a7c6ee5895f8:/usr/lib/kamailio/modules$ readelf -all /usr/lib/kamailio/modules/app_perl.so | grep export 000000218d00 000b00000006 R_X86_64_GLOB_DAT 0000000000000000 find_export + 0 000000218db8 002100000006 R_X86_64_GLOB_DAT 0000000000000000 find_export_record + 0 11: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND find_export 33: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND find_export_record 97: 00000000002190c0 96 OBJECT GLOBAL DEFAULT 18 _app_perl_exports ``` When make same test for other module then this sympols is exists ``` @a7c6ee5895f8:/usr/lib/kamailio/modules$ readelf -all /usr/lib/kamailio/modules/kazoo.so | grep export 0000002586a8 001200000006 R_X86_64_GLOB_DAT 0000000000000000 find_export + 0 18: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND find_export 187: 0000000000259260 96 OBJECT GLOBAL DEFAULT 21 exports ``` #### Reproduction start docker container ``` docker run --entrypoint=sh -it kamailio/kamailio-ci:5.1-alpine.debug ``` install tools ``` apk add wget binutils ``` copy config ``` wget https://raw.githubusercontent.com/nemergent/NG112LIS/master/kamailio.cfg -o /etc/kamailio/kamailio.cfg ``` start kamaillio and fix errors ``` kamailio -DD -E ``` #### Debugging Data none #### Log Messages ``` 0(10) ERROR: <core> [core/sr_module.c:636]: load_module(): Symbol not found: exports 0(10) CRITICAL: <core> [core/cfg.y:3446]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 300, column 12-24: failed to load module 0(10) ERROR: <core> [core/modparam.c:152]: set_mod_param_regex(): No module matching <app_perl> found ``` #### SIP Traffic none ### Possible Solutions not known ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` @a7c6ee5895f8:/usr/lib/kamailio/modules$ kamailio -v version: kamailio 5.2.0-dev1 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 15:02:10 Mar 1 2018 with gcc 6.4.0 ``` * **Operating System**: Fedora 27 + docker 1.12 ``` Linux a7c6ee5895f8 3.10.0-693.5.2.el7.x86_64 #1 SMP Fri Oct 20 20:32:50 UTC 2017 x86_64 Linux ``` -- 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/issues/1465

2 10

git:master:d1d151e8: README: change twitter handle to the new one
by Henning Westerholt 07 Mar '18

07 Mar '18

Module: kamailio Branch: master Commit: d1d151e8ef792be4a711fcd183ff0b43a48fb204 URL: https://github.com/kamailio/kamailio/commit/d1d151e8ef792be4a711fcd183ff0b4… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-07T09:57:01+01:00 README: change twitter handle to the new one --- Modified: README --- Diff: https://github.com/kamailio/kamailio/commit/d1d151e8ef792be4a711fcd183ff0b4… Patch: https://github.com/kamailio/kamailio/commit/d1d151e8ef792be4a711fcd183ff0b4… --- diff --git a/README b/README index fbd0f2e38d..44645b73d1 100644 --- a/README +++ b/README @@ -141,5 +141,5 @@ Particularly, it includes: - download links - etc. -You can also follow us on Twitter as @kamailioproject and like us on Facebook +You can also follow us on Twitter as @kamailio and like us on Facebook to get regular updates.

1 0

git:master:7738461d: db_text: small updates to sample config used in docs
by Daniel-Constantin Mierla 07 Mar '18

07 Mar '18

Module: kamailio Branch: master Commit: 7738461dda1595ee71cbda47bd129e3f13ebc77d URL: https://github.com/kamailio/kamailio/commit/7738461dda1595ee71cbda47bd129e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-06T23:30:40+01:00 db_text: small updates to sample config used in docs --- Modified: src/modules/db_text/doc/db_text.cfg --- Diff: https://github.com/kamailio/kamailio/commit/7738461dda1595ee71cbda47bd129e3… Patch: https://github.com/kamailio/kamailio/commit/7738461dda1595ee71cbda47bd129e3… --- diff --git a/src/modules/db_text/doc/db_text.cfg b/src/modules/db_text/doc/db_text.cfg index 83fd09990f..8c94d7c56a 100644 --- a/src/modules/db_text/doc/db_text.cfg +++ b/src/modules/db_text/doc/db_text.cfg @@ -1,12 +1,11 @@ # -# $Id$ # # simple quick-start config script with dbtext # # ----------- global configuration parameters ------------------------ -#debug=9 # debug level (cmd line: -dddddddddd) +#debug=3 # debug level (cmd line: -ddd) #fork=yes #log_stderror=no # (cmd line: -E) @@ -30,7 +29,7 @@ loadmodule "modules/maxfwd/maxfwd.so" loadmodule "modules/usrloc/usrloc.so" loadmodule "modules/registrar/registrar.so" loadmodule "modules/textops/textops.so" -loadmodule "modules/textops/mi_fifo.so" +loadmodule "modules/jonrpcs/jsonrpcs.so" # modules for digest authentication loadmodule "modules/auth/auth.so" @@ -38,15 +37,11 @@ loadmodule "modules/auth_db/auth_db.so" # ----------------- setting module-specific parameters --------------- -# -- mi_fifo params -- - -modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo") - # -- usrloc params -- # use dbtext database for persistent storage modparam("usrloc", "db_mode", 2) -modparam("usrloc|auth_db", "db_url", "dbtext:///tmp/openserdb") +modparam("usrloc|auth_db", "db_url", "db_text:///tmp/kamailiodb") # -- auth params -- #

1 0

Build failed in Jenkins: kamailiodev-nightly-binaries » i386,wheezy,slave #1054
by jenkins＠sipwise.com 07 Mar '18

07 Mar '18

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> ------------------------------------------ [...truncated 430.88 KB...] CC (gcc) [M http_client.so] curl_api.o CC (gcc) [M http_client.so] curlcon.o CC (gcc) [M http_client.so] curlrpc.o CC (gcc) [M http_client.so] functions.o CC (gcc) [M http_client.so] http_client.o LD (gcc) [M http_client.so] http_client.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy' /usr/bin/make every-module group_include="klua" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy/src' CC (gcc) [M app_lua.so] app_lua_api.o CC (gcc) [M app_lua.so] app_lua_exp.o CC (gcc) [M app_lua.so] app_lua_kemi_export.o CC (gcc) [M app_lua.so] app_lua_mod.o CC (gcc) [M app_lua.so] app_lua_sr.o LD (gcc) [M app_lua.so] app_lua.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy' /usr/bin/make every-module group_include="kmemcached" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy/src' CC (gcc) [M memcached.so] mcd_var.o CC (gcc) [M memcached.so] memcached.o LD (gcc) [M memcached.so] memcached.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy' /usr/bin/make every-module group_include="ksnmpstats" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy/src' CC (gcc) [M snmpstats.so] alarm_checks.o CC (gcc) [M snmpstats.so] hashTable.o CC (gcc) [M snmpstats.so] interprocess_buffer.o CC (gcc) [M snmpstats.so] kamailioNet.o CC (gcc) [M snmpstats.so] kamailioNetConfig.o CC (gcc) [M snmpstats.so] kamailioServer.o CC (gcc) [M snmpstats.so] snmpMIBNotifications.o CC (gcc) [M snmpstats.so] snmpObjects.o CC (gcc) [M snmpstats.so] snmpSIPCommonObjects.o CC (gcc) [M snmpstats.so] snmpSIPContactTable.o CC (gcc) [M snmpstats.so] snmpSIPMethodSupportedTable.o CC (gcc) [M snmpstats.so] snmpSIPPortTable.o CC (gcc) [M snmpstats.so] snmpSIPRegUserLookupTable.o CC (gcc) [M snmpstats.so] snmpSIPRegUserTable.o CC (gcc) [M snmpstats.so] snmpSIPServerObjects.o CC (gcc) [M snmpstats.so] snmpSIPStatusCodesTable.o CC (gcc) [M snmpstats.so] snmp_statistics.o CC (gcc) [M snmpstats.so] snmpstats.o CC (gcc) [M snmpstats.so] sub_agent.o CC (gcc) [M snmpstats.so] utilities.o LD (gcc) [M snmpstats.so] snmpstats.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy' /usr/bin/make every-module group_include="kcarrierroute" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy/src' CC (gcc) [M carrierroute.so] carrierroute.o CC (gcc) [M carrierroute.so] config.o CC (gcc) [M carrierroute.so] cr_carrier.o CC (gcc) [M carrierroute.so] cr_config.o CC (gcc) [M carrierroute.so] cr_data.o CC (gcc) [M carrierroute.so] cr_db.o CC (gcc) [M carrierroute.so] cr_domain.o CC (gcc) [M carrierroute.so] cr_fifo.o CC (gcc) [M carrierroute.so] cr_fixup.o CC (gcc) [M carrierroute.so] cr_func.o CC (gcc) [M carrierroute.so] cr_map.o CC (gcc) [M carrierroute.so] cr_rule.o CC (gcc) [M carrierroute.so] db_carrierroute.o CC (gcc) [M carrierroute.so] parser_carrierroute.o CC (gcc) [M carrierroute.so] prime_hash.o make[4]: `libtrie.so.1.0' is up to date. make[4]: `libsrdb1.so.1.0' is up to date. LD (gcc) [M carrierroute.so] carrierroute.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy' /usr/bin/make every-module group_include="kxmpp" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy/src' CC (gcc) [M xmpp.so] network.o CC (gcc) [M xmpp.so] sha.o CC (gcc) [M xmpp.so] util.o CC (gcc) [M xmpp.so] xmpp.o CC (gcc) [M xmpp.so] xmpp_api.o CC (gcc) [M xmpp.so] xmpp_component.o CC (gcc) [M xmpp.so] xmpp_server.o CC (gcc) [M xmpp.so] xode.o CC (gcc) [M xmpp.so] xode_from.o CC (gcc) [M xmpp.so] xode_str.o CC (gcc) [M xmpp.so] xpool.o CC (gcc) [M xmpp.so] xsnprintf.o CC (gcc) [M xmpp.so] xstream.o LD (gcc) [M xmpp.so] xmpp.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy' /usr/bin/make every-module group_include="kcpl" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy/src' CC (gcc) [M cplc.so] cpl_db.o CC (gcc) [M cplc.so] cpl_loader.o CC (gcc) [M cplc.so] cpl_log.o CC (gcc) [M cplc.so] cpl_nonsig.o CC (gcc) [M cplc.so] cpl_parser.o CC (gcc) [M cplc.so] cpl_run.o CC (gcc) [M cplc.so] cpl_sig.o CC (gcc) [M cplc.so] cpl_time.o CC (gcc) [M cplc.so] cplc.o CC (gcc) [M cplc.so] sub_list.o make[4]: `libsrdb1.so.1.0' is up to date. LD (gcc) [M cplc.so] cplc.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy' /usr/bin/make every-module group_include="kredis" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy/src' CC (gcc) [M db_redis.so] db_redis_mod.o CC (gcc) [M db_redis.so] redis_connection.o CC (gcc) [M db_redis.so] redis_dbase.o redis_dbase.c: In function 'db_redis_dump_reply': redis_dbase.c:39:9: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat] redis_dbase.c:39:9: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat] redis_dbase.c: In function 'db_redis_scan_query_keys': redis_dbase.c:679:13: warning: format '%lu' expects argument of type 'long unsigned int', but argument 12 has type 'size_t' [-Wformat] redis_dbase.c:679:13: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat] redis_dbase.c:711:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat] redis_dbase.c:711:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat] redis_dbase.c:716:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat] redis_dbase.c:716:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat] redis_dbase.c: In function 'db_redis_convert_row': redis_dbase.c:980:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat] redis_dbase.c:980:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat] redis_dbase.c:995:9: warning: format '%lu' expects argument of type 'long unsigned int', but argument 13 has type 'size_t' [-Wformat] redis_dbase.c:995:9: warning: format '%lu' expects argument of type 'long unsigned int', but argument 11 has type 'size_t' [-Wformat] redis_dbase.c:1006:9: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat] redis_dbase.c:1006:9: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat] redis_dbase.c: In function 'db_redis_perform_delete': redis_dbase.c:1311:21: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat] redis_dbase.c:1311:21: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat] redis_dbase.c: In function 'db_redis_perform_update': redis_dbase.c:1563:21: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat] redis_dbase.c:1563:21: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat] CC (gcc) [M db_redis.so] redis_table.o make[4]: `libsrdb2.so.1.0' is up to date. make[4]: `libsrdb1.so.1.0' is up to date. LD (gcc) [M db_redis.so] db_redis.so CC (gcc) [M ndb_redis.so] ndb_redis_mod.o CC (gcc) [M ndb_redis.so] redis_client.o LD (gcc) [M ndb_redis.so] ndb_redis.so CC (gcc) [M topos_redis.so] topos_redis_mod.o CC (gcc) [M topos_redis.so] topos_redis_storage.o LD (gcc) [M topos_redis.so] topos_redis.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy' /usr/bin/make every-module group_include="kpython" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy/src' CC (gcc) [M app_python.so] app_python_mod.o CC (gcc) [M app_python.so] apy_kemi.o In file included from /usr/include/python2.7/Python.h:8:0, from apy_kemi.c:25: /usr/include/python2.7/pyconfig.h:1161:0: warning: "_POSIX_C_SOURCE" redefined [enabled by default] In file included from /usr/include/stdio.h:28:0, from apy_kemi.c:21: /usr/include/features.h:214:0: note: this is the location of the previous definition CC (gcc) [M app_python.so] apy_kemi_export.o In file included from /usr/include/python2.7/Python.h:8:0, from apy_kemi_export.c:30: /usr/include/python2.7/pyconfig.h:1161:0: warning: "_POSIX_C_SOURCE" redefined [enabled by default] In file included from /usr/include/stdio.h:28:0, from apy_kemi_export.c:26: /usr/include/features.h:214:0: note: this is the location of the previous definition CC (gcc) [M app_python.so] mod_Core.o CC (gcc) [M app_python.so] mod_Logger.o CC (gcc) [M app_python.so] mod_Ranks.o CC (gcc) [M app_python.so] mod_Router.o CC (gcc) [M app_python.so] python_exec.o CC (gcc) [M app_python.so] python_iface.o CC (gcc) [M app_python.so] python_msgobj.o CC (gcc) [M app_python.so] python_support.o python_support.c: In function 'python_handle_exception': python_support.c:54:3: error: incompatible type for argument 1 of '__builtin_va_start' #'reference_type' not supported by pp_c_direct_abstract_declarator#''const char *'python_support.c:54:3: note: expected but argument is of type make[3]: *** [python_support.o] Error 1 make[2]: *** [modules] Error 1 make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy/src' make[1]: *** [every-module] Error 2 make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005927.1059+wheezy' make: *** [build-stamp] Error 2 dpkg-buildpackage: error: debian/rules build-arch gave error exit status 2 E: Failed autobuilding of package I: user script /var/cache/pbuilder/build/cow.28896/tmp/hooks/C10shell starting ERROR: ld.so: object 'libeatmydata.so' from LD_PRELOAD cannot be preloaded: ignored. ERROR: ld.so: object 'libeatmydata.so' from LD_PRELOAD cannot be preloaded: ignored. ERROR: ld.so: object 'libeatmydata.so' from LD_PRELOAD cannot be preloaded: ignored. ┌──────────────────────────────────────────────────────────────────────────────┐ │ FTBFS - problem with building Debian package │ └──────────────────────────────────────────────────────────────────────────────┘ ERROR: ld.so: object 'libeatmydata.so' from LD_PRELOAD cannot be preloaded: ignored. ┌──────────────────────────────────────────────────────────────────────────────┐ │ DEB_KEEP_BUILD_ENV is not set to 'true', not keeping build environment │ └──────────────────────────────────────────────────────────────────────────────┘ I: user script /var/cache/pbuilder/build/cow.28896/tmp/hooks/C10shell finished I: unmounting /tmp/apt-jdg_SKVMze filesystem I: unmounting dev/pts filesystem I: unmounting run/shm filesystem I: unmounting proc filesystem -> Cleaning COW directory forking: rm -rf /var/cache/pbuilder/build//cow.28896 + '[' 1 -eq 0 ']' + bailout 1 'Error: Failed to build with cowbuilder.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to build with cowbuilder.' ']' + echo 'Error: Failed to build with cowbuilder.' Error: Failed to build with cowbuilder. + rm -f /var/run/lock/wheezy-i386.building.25947 + '[' -r /var/run/lock/wheezy-i386.update.25947 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. *** + rm -f '<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…'> + '[' -n /tmp/tmp.7yK4m517Zh ']' + rm -rf /tmp/tmp.7yK4m517Zh + '[' -n /tmp/apt-jdg_SKVMze ']' + sudo rm -rf /tmp/apt-jdg_SKVMze + '[' -n 5003 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=261 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Tue Mar 6 03:07:09 UTC 2018 [running 261 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Tue Mar 6 03:07:09 UTC 2018 [running 261 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts Recording fingerprints TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap Did not find any matching files. Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: No test report files were found. Configuration error?

1 2

Build failed in Jenkins: kamailiodev-nightly-binaries » i386,precise,slave #1054
by jenkins＠sipwise.com 07 Mar '18

07 Mar '18

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> ------------------------------------------ [...truncated 317.50 KB...] /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise/src' CC (gcc) [M utils.so] conf.o CC (gcc) [M utils.so] pidf.o CC (gcc) [M utils.so] utils.o CC (gcc) [M utils.so] xcap_auth.o make[4]: `libsrdb1.so.1.0' is up to date. LD (gcc) [M utils.so] utils.so CC (gcc) [M http_client.so] curl_api.o CC (gcc) [M http_client.so] curlcon.o CC (gcc) [M http_client.so] curlrpc.o CC (gcc) [M http_client.so] functions.o CC (gcc) [M http_client.so] http_client.o LD (gcc) [M http_client.so] http_client.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise' /usr/bin/make every-module group_include="klua" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise/src' CC (gcc) [M app_lua.so] app_lua_api.o CC (gcc) [M app_lua.so] app_lua_exp.o CC (gcc) [M app_lua.so] app_lua_kemi_export.o CC (gcc) [M app_lua.so] app_lua_mod.o CC (gcc) [M app_lua.so] app_lua_sr.o LD (gcc) [M app_lua.so] app_lua.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise' /usr/bin/make every-module group_include="kmemcached" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise/src' CC (gcc) [M memcached.so] mcd_var.o CC (gcc) [M memcached.so] memcached.o LD (gcc) [M memcached.so] memcached.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise' /usr/bin/make every-module group_include="ksnmpstats" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise/src' CC (gcc) [M snmpstats.so] alarm_checks.o CC (gcc) [M snmpstats.so] hashTable.o CC (gcc) [M snmpstats.so] interprocess_buffer.o CC (gcc) [M snmpstats.so] kamailioNet.o CC (gcc) [M snmpstats.so] kamailioNetConfig.o CC (gcc) [M snmpstats.so] kamailioServer.o CC (gcc) [M snmpstats.so] snmpMIBNotifications.o CC (gcc) [M snmpstats.so] snmpObjects.o CC (gcc) [M snmpstats.so] snmpSIPCommonObjects.o CC (gcc) [M snmpstats.so] snmpSIPContactTable.o CC (gcc) [M snmpstats.so] snmpSIPMethodSupportedTable.o CC (gcc) [M snmpstats.so] snmpSIPPortTable.o CC (gcc) [M snmpstats.so] snmpSIPRegUserLookupTable.o CC (gcc) [M snmpstats.so] snmpSIPRegUserTable.o CC (gcc) [M snmpstats.so] snmpSIPServerObjects.o CC (gcc) [M snmpstats.so] snmpSIPStatusCodesTable.o CC (gcc) [M snmpstats.so] snmp_statistics.o CC (gcc) [M snmpstats.so] snmpstats.o CC (gcc) [M snmpstats.so] sub_agent.o CC (gcc) [M snmpstats.so] utilities.o LD (gcc) [M snmpstats.so] snmpstats.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise' /usr/bin/make every-module group_include="kcarrierroute" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise/src' CC (gcc) [M carrierroute.so] carrierroute.o CC (gcc) [M carrierroute.so] config.o CC (gcc) [M carrierroute.so] cr_carrier.o CC (gcc) [M carrierroute.so] cr_config.o CC (gcc) [M carrierroute.so] cr_data.o CC (gcc) [M carrierroute.so] cr_db.o CC (gcc) [M carrierroute.so] cr_domain.o CC (gcc) [M carrierroute.so] cr_fifo.o CC (gcc) [M carrierroute.so] cr_fixup.o CC (gcc) [M carrierroute.so] cr_func.o CC (gcc) [M carrierroute.so] cr_map.o CC (gcc) [M carrierroute.so] cr_rule.o CC (gcc) [M carrierroute.so] db_carrierroute.o CC (gcc) [M carrierroute.so] parser_carrierroute.o CC (gcc) [M carrierroute.so] prime_hash.o make[4]: `libtrie.so.1.0' is up to date. make[4]: `libsrdb1.so.1.0' is up to date. LD (gcc) [M carrierroute.so] carrierroute.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise' /usr/bin/make every-module group_include="kxmpp" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise/src' CC (gcc) [M xmpp.so] network.o CC (gcc) [M xmpp.so] sha.o CC (gcc) [M xmpp.so] util.o CC (gcc) [M xmpp.so] xmpp.o CC (gcc) [M xmpp.so] xmpp_api.o CC (gcc) [M xmpp.so] xmpp_component.o CC (gcc) [M xmpp.so] xmpp_server.o CC (gcc) [M xmpp.so] xode.o CC (gcc) [M xmpp.so] xode_from.o CC (gcc) [M xmpp.so] xode_str.o CC (gcc) [M xmpp.so] xpool.o CC (gcc) [M xmpp.so] xsnprintf.o CC (gcc) [M xmpp.so] xstream.o LD (gcc) [M xmpp.so] xmpp.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise' /usr/bin/make every-module group_include="kcpl" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise/src' CC (gcc) [M cplc.so] cpl_db.o CC (gcc) [M cplc.so] cpl_loader.o CC (gcc) [M cplc.so] cpl_log.o CC (gcc) [M cplc.so] cpl_nonsig.o CC (gcc) [M cplc.so] cpl_parser.o CC (gcc) [M cplc.so] cpl_run.o CC (gcc) [M cplc.so] cpl_sig.o CC (gcc) [M cplc.so] cpl_time.o CC (gcc) [M cplc.so] cplc.o CC (gcc) [M cplc.so] sub_list.o make[4]: `libsrdb1.so.1.0' is up to date. LD (gcc) [M cplc.so] cplc.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise' /usr/bin/make every-module group_include="kredis" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise/src' CC (gcc) [M db_redis.so] db_redis_mod.o CC (gcc) [M db_redis.so] redis_connection.o CC (gcc) [M db_redis.so] redis_dbase.o redis_dbase.c: In function 'db_redis_dump_reply': redis_dbase.c:39:9: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat] redis_dbase.c:39:9: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat] redis_dbase.c: In function 'db_redis_scan_query_keys': redis_dbase.c:679:13: warning: format '%lu' expects argument of type 'long unsigned int', but argument 12 has type 'size_t' [-Wformat] redis_dbase.c:679:13: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat] redis_dbase.c:711:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat] redis_dbase.c:711:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat] redis_dbase.c:716:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat] redis_dbase.c:716:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat] redis_dbase.c: In function 'db_redis_convert_row': redis_dbase.c:980:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat] redis_dbase.c:980:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat] redis_dbase.c:995:9: warning: format '%lu' expects argument of type 'long unsigned int', but argument 13 has type 'size_t' [-Wformat] redis_dbase.c:995:9: warning: format '%lu' expects argument of type 'long unsigned int', but argument 11 has type 'size_t' [-Wformat] redis_dbase.c:1006:9: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat] redis_dbase.c:1006:9: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat] redis_dbase.c: In function 'db_redis_perform_delete': redis_dbase.c:1311:21: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat] redis_dbase.c:1311:21: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat] redis_dbase.c: In function 'db_redis_perform_update': redis_dbase.c:1563:21: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat] redis_dbase.c:1563:21: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat] CC (gcc) [M db_redis.so] redis_table.o make[4]: `libsrdb2.so.1.0' is up to date. make[4]: `libsrdb1.so.1.0' is up to date. LD (gcc) [M db_redis.so] db_redis.so CC (gcc) [M ndb_redis.so] ndb_redis_mod.o CC (gcc) [M ndb_redis.so] redis_client.o LD (gcc) [M ndb_redis.so] ndb_redis.so CC (gcc) [M topos_redis.so] topos_redis_mod.o CC (gcc) [M topos_redis.so] topos_redis_storage.o LD (gcc) [M topos_redis.so] topos_redis.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise' /usr/bin/make every-module group_include="kpython" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise/src' CC (gcc) [M app_python.so] app_python_mod.o CC (gcc) [M app_python.so] apy_kemi.o In file included from /usr/include/python2.7/Python.h:8:0, from apy_kemi.c:25: /usr/include/python2.7/pyconfig.h:1161:0: warning: "_POSIX_C_SOURCE" redefined [enabled by default] /usr/include/features.h:215:0: note: this is the location of the previous definition CC (gcc) [M app_python.so] apy_kemi_export.o In file included from /usr/include/python2.7/Python.h:8:0, from apy_kemi_export.c:30: /usr/include/python2.7/pyconfig.h:1161:0: warning: "_POSIX_C_SOURCE" redefined [enabled by default] /usr/include/features.h:215:0: note: this is the location of the previous definition CC (gcc) [M app_python.so] mod_Core.o CC (gcc) [M app_python.so] mod_Logger.o CC (gcc) [M app_python.so] mod_Ranks.o CC (gcc) [M app_python.so] mod_Router.o CC (gcc) [M app_python.so] python_exec.o CC (gcc) [M app_python.so] python_iface.o CC (gcc) [M app_python.so] python_msgobj.o CC (gcc) [M app_python.so] python_support.o python_support.c: In function 'python_handle_exception': python_support.c:54:3: error: incompatible type for argument 1 of '__builtin_va_start' #'reference_type' not supported by pp_c_direct_abstract_declarator#''const char *'python_support.c:54:3: note: expected but argument is of type make[3]: *** [python_support.o] Error 1 make[2]: *** [modules] Error 1 make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise/src' make[1]: *** [every-module] Error 2 make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304010727.1059+precise' make: *** [build-stamp] Error 2 dpkg-buildpackage: error: debian/rules build gave error exit status 2 E: Failed autobuilding of package I: user script /var/cache/pbuilder/build/cow.3777/tmp/hooks/C10shell starting ┌──────────────────────────────────────────────────────────────────────────────┐ │ FTBFS - problem with building Debian package │ └──────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────┐ │ DEB_KEEP_BUILD_ENV is not set to 'true', not keeping build environment │ └──────────────────────────────────────────────────────────────────────────────┘ I: user script /var/cache/pbuilder/build/cow.3777/tmp/hooks/C10shell finished I: unmounting /tmp/apt-jdg_mO9WXG filesystem I: unmounting dev/pts filesystem I: unmounting run/shm filesystem I: unmounting proc filesystem -> Cleaning COW directory forking: rm -rf /var/cache/pbuilder/build//cow.3777 + '[' 1 -eq 0 ']' + bailout 1 'Error: Failed to build with cowbuilder.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to build with cowbuilder.' ']' + echo 'Error: Failed to build with cowbuilder.' Error: Failed to build with cowbuilder. + rm -f /var/run/lock/precise-i386.building.31596 + '[' -r /var/run/lock/precise-i386.update.31596 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. *** + rm -f '<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…'> + '[' -n /tmp/tmp.Dy3CRB0DoL ']' + rm -rf /tmp/tmp.Dy3CRB0DoL + '[' -n /tmp/apt-jdg_mO9WXG ']' + sudo rm -rf /tmp/apt-jdg_mO9WXG + '[' -n 9545 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=246 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Tue Mar 6 04:22:36 UTC 2018 [running 246 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Tue Mar 6 04:22:36 UTC 2018 [running 246 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts Recording fingerprints TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap Did not find any matching files. Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: No test report files were found. Configuration error?

1 2

Build failed in Jenkins: kamailiodev-nightly-binaries » i386,trusty,slave #1054
by jenkins＠sipwise.com 07 Mar '18

07 Mar '18

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> ------------------------------------------ [...truncated 332.57 KB...] CC (gcc) [M http_client.so] http_client.o LD (gcc) [M http_client.so] http_client.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty' /usr/bin/make every-module group_include="klua" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty/src' CC (gcc) [M app_lua.so] app_lua_api.o CC (gcc) [M app_lua.so] app_lua_exp.o CC (gcc) [M app_lua.so] app_lua_kemi_export.o CC (gcc) [M app_lua.so] app_lua_mod.o CC (gcc) [M app_lua.so] app_lua_sr.o LD (gcc) [M app_lua.so] app_lua.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty' /usr/bin/make every-module group_include="kmemcached" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty/src' CC (gcc) [M memcached.so] mcd_var.o CC (gcc) [M memcached.so] memcached.o LD (gcc) [M memcached.so] memcached.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty' /usr/bin/make every-module group_include="ksnmpstats" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty/src' CC (gcc) [M snmpstats.so] alarm_checks.o CC (gcc) [M snmpstats.so] hashTable.o CC (gcc) [M snmpstats.so] interprocess_buffer.o CC (gcc) [M snmpstats.so] kamailioNet.o CC (gcc) [M snmpstats.so] kamailioNetConfig.o CC (gcc) [M snmpstats.so] kamailioServer.o CC (gcc) [M snmpstats.so] snmpMIBNotifications.o CC (gcc) [M snmpstats.so] snmpObjects.o CC (gcc) [M snmpstats.so] snmpSIPCommonObjects.o CC (gcc) [M snmpstats.so] snmpSIPContactTable.o CC (gcc) [M snmpstats.so] snmpSIPMethodSupportedTable.o CC (gcc) [M snmpstats.so] snmpSIPPortTable.o CC (gcc) [M snmpstats.so] snmpSIPRegUserLookupTable.o CC (gcc) [M snmpstats.so] snmpSIPRegUserTable.o CC (gcc) [M snmpstats.so] snmpSIPServerObjects.o CC (gcc) [M snmpstats.so] snmpSIPStatusCodesTable.o CC (gcc) [M snmpstats.so] snmp_statistics.o CC (gcc) [M snmpstats.so] snmpstats.o CC (gcc) [M snmpstats.so] sub_agent.o CC (gcc) [M snmpstats.so] utilities.o LD (gcc) [M snmpstats.so] snmpstats.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty' /usr/bin/make every-module group_include="kcarrierroute" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty/src' CC (gcc) [M carrierroute.so] carrierroute.o CC (gcc) [M carrierroute.so] config.o CC (gcc) [M carrierroute.so] cr_carrier.o CC (gcc) [M carrierroute.so] cr_config.o CC (gcc) [M carrierroute.so] cr_data.o CC (gcc) [M carrierroute.so] cr_db.o CC (gcc) [M carrierroute.so] cr_domain.o CC (gcc) [M carrierroute.so] cr_fifo.o CC (gcc) [M carrierroute.so] cr_fixup.o CC (gcc) [M carrierroute.so] cr_func.o CC (gcc) [M carrierroute.so] cr_map.o CC (gcc) [M carrierroute.so] cr_rule.o CC (gcc) [M carrierroute.so] db_carrierroute.o CC (gcc) [M carrierroute.so] parser_carrierroute.o CC (gcc) [M carrierroute.so] prime_hash.o make[4]: `libtrie.so.1.0' is up to date. make[4]: `libsrdb1.so.1.0' is up to date. LD (gcc) [M carrierroute.so] carrierroute.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty' /usr/bin/make every-module group_include="kxmpp" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty/src' CC (gcc) [M xmpp.so] network.o CC (gcc) [M xmpp.so] sha.o CC (gcc) [M xmpp.so] util.o CC (gcc) [M xmpp.so] xmpp.o CC (gcc) [M xmpp.so] xmpp_api.o CC (gcc) [M xmpp.so] xmpp_component.o CC (gcc) [M xmpp.so] xmpp_server.o CC (gcc) [M xmpp.so] xode.o CC (gcc) [M xmpp.so] xode_from.o CC (gcc) [M xmpp.so] xode_str.o CC (gcc) [M xmpp.so] xpool.o CC (gcc) [M xmpp.so] xsnprintf.o CC (gcc) [M xmpp.so] xstream.o LD (gcc) [M xmpp.so] xmpp.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty' /usr/bin/make every-module group_include="kcpl" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty/src' CC (gcc) [M cplc.so] cpl_db.o CC (gcc) [M cplc.so] cpl_loader.o CC (gcc) [M cplc.so] cpl_log.o CC (gcc) [M cplc.so] cpl_nonsig.o CC (gcc) [M cplc.so] cpl_parser.o CC (gcc) [M cplc.so] cpl_run.o CC (gcc) [M cplc.so] cpl_sig.o CC (gcc) [M cplc.so] cpl_time.o CC (gcc) [M cplc.so] cplc.o CC (gcc) [M cplc.so] sub_list.o make[4]: `libsrdb1.so.1.0' is up to date. LD (gcc) [M cplc.so] cplc.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty' /usr/bin/make every-module group_include="kredis" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty/src' CC (gcc) [M db_redis.so] db_redis_mod.o CC (gcc) [M db_redis.so] redis_connection.o CC (gcc) [M db_redis.so] redis_dbase.o redis_dbase.c: In function 'db_redis_dump_reply': redis_dbase.c:39:9: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat=] LM_DBG("printing %lu elements in array reply\n", reply->elements); ^ redis_dbase.c:39:9: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat=] redis_dbase.c: In function 'db_redis_scan_query_keys': redis_dbase.c:679:13: warning: format '%lu' expects argument of type 'long unsigned int', but argument 12 has type 'size_t' [-Wformat=] LM_ERR("Invalid number of reply elements for scan on table '%.*s', expected 2, got %lu\n", ^ redis_dbase.c:679:13: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat=] redis_dbase.c:711:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat=] LM_ERR("Invalid null key at cursor result index %lu while scanning table '%.*s'\n", ^ redis_dbase.c:711:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat=] redis_dbase.c:716:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat=] LM_ERR("Invalid key type at cursor result index %lu while scanning table '%.*s', expected string\n", ^ redis_dbase.c:716:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat=] redis_dbase.c: In function 'db_redis_convert_row': redis_dbase.c:980:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat=] LM_DBG("column %lu does not match, ignore row\n", col); ^ redis_dbase.c:980:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat=] redis_dbase.c:995:9: warning: format '%lu' expects argument of type 'long unsigned int', but argument 13 has type 'size_t' [-Wformat=] LM_ERR("Invalid number of columns at row %d/%d, expecting %d, got %lu\n", ^ redis_dbase.c:995:9: warning: format '%lu' expects argument of type 'long unsigned int', but argument 11 has type 'size_t' [-Wformat=] redis_dbase.c:1006:9: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat=] LM_DBG("converting column #%lu of row #%d", colidx, RES_ROW_N(_r)); ^ redis_dbase.c:1006:9: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat=] redis_dbase.c: In function 'db_redis_perform_delete': redis_dbase.c:1311:21: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat=] LM_DBG("column %lu does not match, ignore row\n", col); ^ redis_dbase.c:1311:21: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat=] redis_dbase.c: In function 'db_redis_perform_update': redis_dbase.c:1563:21: warning: format '%lu' expects argument of type 'long unsigned int', but argument 10 has type 'size_t' [-Wformat=] LM_DBG("column %lu does not match, ignore row\n", col); ^ redis_dbase.c:1563:21: warning: format '%lu' expects argument of type 'long unsigned int', but argument 8 has type 'size_t' [-Wformat=] CC (gcc) [M db_redis.so] redis_table.o make[4]: `libsrdb2.so.1.0' is up to date. make[4]: `libsrdb1.so.1.0' is up to date. LD (gcc) [M db_redis.so] db_redis.so CC (gcc) [M ndb_redis.so] ndb_redis_mod.o CC (gcc) [M ndb_redis.so] redis_client.o LD (gcc) [M ndb_redis.so] ndb_redis.so CC (gcc) [M topos_redis.so] topos_redis_mod.o CC (gcc) [M topos_redis.so] topos_redis_storage.o LD (gcc) [M topos_redis.so] topos_redis.so make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty/src' make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty' /usr/bin/make every-module group_include="kpython" make[1]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty' /usr/bin/make -C src/ every-module make[2]: Entering directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty/src' CC (gcc) [M app_python.so] app_python_mod.o CC (gcc) [M app_python.so] apy_kemi.o CC (gcc) [M app_python.so] apy_kemi_export.o CC (gcc) [M app_python.so] mod_Core.o CC (gcc) [M app_python.so] mod_Logger.o CC (gcc) [M app_python.so] mod_Ranks.o CC (gcc) [M app_python.so] mod_Router.o CC (gcc) [M app_python.so] python_exec.o CC (gcc) [M app_python.so] python_iface.o CC (gcc) [M app_python.so] python_msgobj.o CC (gcc) [M app_python.so] python_support.o python_support.c: In function 'python_handle_exception': python_support.c:54:3: error: incompatible type for argument 1 of '__builtin_va_start' va_start(fmt, ap); ^ #'reference_type' not supported by pp_c_direct_abstract_declarator#''const char *'python_support.c:54:3: note: expected but argument is of type make[3]: *** [python_support.o] Error 1 make[2]: *** [modules] Error 1 make[2]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty/src' make[1]: *** [every-module] Error 2 make[1]: Leaving directory `/tmp/buildd/kamailio-5.2.0~dev4+0~20180304005654.1059+trusty' make: *** [build-stamp] Error 2 dpkg-buildpackage: error: debian/rules build-arch gave error exit status 2 E: Failed autobuilding of package I: user script /var/cache/pbuilder/build/cow.15474/tmp/hooks/C10shell starting ┌──────────────────────────────────────────────────────────────────────────────┐ │ FTBFS - problem with building Debian package │ └──────────────────────────────────────────────────────────────────────────────┘ ┌──────────────────────────────────────────────────────────────────────────────┐ │ DEB_KEEP_BUILD_ENV is not set to 'true', not keeping build environment │ └──────────────────────────────────────────────────────────────────────────────┘ I: user script /var/cache/pbuilder/build/cow.15474/tmp/hooks/C10shell finished I: unmounting /tmp/apt-jdg_W3Ox53 filesystem I: unmounting dev/pts filesystem I: unmounting run/shm filesystem I: unmounting proc filesystem -> Cleaning COW directory forking: rm -rf /var/cache/pbuilder/build//cow.15474 + '[' 1 -eq 0 ']' + bailout 1 'Error: Failed to build with cowbuilder.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to build with cowbuilder.' ']' + echo 'Error: Failed to build with cowbuilder.' Error: Failed to build with cowbuilder. + rm -f /var/run/lock/trusty-i386.building.12572 + '[' -r /var/run/lock/trusty-i386.update.12572 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. *** + rm -f '<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…'> + '[' -n /tmp/tmp.FaW3cq3e96 ']' + rm -rf /tmp/tmp.FaW3cq3e96 + '[' -n /tmp/apt-jdg_W3Ox53 ']' + sudo rm -rf /tmp/apt-jdg_W3Ox53 + '[' -n 5660 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=284 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Tue Mar 6 04:13:01 UTC 2018 [running 284 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Tue Mar 6 04:13:01 UTC 2018 [running 284 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts Recording fingerprints TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap Did not find any matching files. Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: No test report files were found. Configuration error?

1 2

git:master:e94f1b93: db_unixodbc: data converting log improvement - errors should be logged as such
by Henning Westerholt 06 Mar '18

06 Mar '18

Module: kamailio Branch: master Commit: e94f1b93c1f69d605c03b02121a1dbfd9cbe00db URL: https://github.com/kamailio/kamailio/commit/e94f1b93c1f69d605c03b02121a1dbf… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-06T08:41:31+01:00 db_unixodbc: data converting log improvement - errors should be logged as such --- Modified: src/modules/db_unixodbc/val.c --- Diff: https://github.com/kamailio/kamailio/commit/e94f1b93c1f69d605c03b02121a1dbf… Patch: https://github.com/kamailio/kamailio/commit/e94f1b93c1f69d605c03b02121a1dbf… --- diff --git a/src/modules/db_unixodbc/val.c b/src/modules/db_unixodbc/val.c index 352f25cfd6..642b34e95f 100644 --- a/src/modules/db_unixodbc/val.c +++ b/src/modules/db_unixodbc/val.c @@ -151,7 +151,7 @@ int db_unixodbc_val2str(const db1_con_t* _c, const db_val_t* _v, char* _s, int* break; default: - LM_DBG("unknown data type\n"); + LM_ERR("unknown data type\n"); return -10; } }

1 0

git:master:8cc0ee08: db_posgres: data converting log improvement - errors should be logged as such
by Henning Westerholt 06 Mar '18

06 Mar '18

Module: kamailio Branch: master Commit: 8cc0ee0899a6767d34b0a3b06871273b0a6f72b2 URL: https://github.com/kamailio/kamailio/commit/8cc0ee0899a6767d34b0a3b06871273… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-06T08:41:14+01:00 db_posgres: data converting log improvement - errors should be logged as such --- Modified: src/modules/db_postgres/km_val.c --- Diff: https://github.com/kamailio/kamailio/commit/8cc0ee0899a6767d34b0a3b06871273… Patch: https://github.com/kamailio/kamailio/commit/8cc0ee0899a6767d34b0a3b06871273… --- diff --git a/src/modules/db_postgres/km_val.c b/src/modules/db_postgres/km_val.c index fdfc407ee0..35914f290c 100644 --- a/src/modules/db_postgres/km_val.c +++ b/src/modules/db_postgres/km_val.c @@ -191,7 +191,7 @@ int db_postgres_val2str( break; default: - LM_DBG("unknown data type\n"); + LM_ERR("unknown data type\n"); return -10; } }

1 0

git:master:8c592dc5: db_mysql: data converting log improvement - errors should be logged as such
by Henning Westerholt 06 Mar '18

06 Mar '18

Module: kamailio Branch: master Commit: 8c592dc54e7e963cb608b2b71c1549d9c61bac7a URL: https://github.com/kamailio/kamailio/commit/8c592dc54e7e963cb608b2b71c1549d… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-06T08:41:01+01:00 db_mysql: data converting log improvement - errors should be logged as such --- Modified: src/modules/db_mysql/km_val.c --- Diff: https://github.com/kamailio/kamailio/commit/8c592dc54e7e963cb608b2b71c1549d… Patch: https://github.com/kamailio/kamailio/commit/8c592dc54e7e963cb608b2b71c1549d… --- diff --git a/src/modules/db_mysql/km_val.c b/src/modules/db_mysql/km_val.c index 7f832d0ad9..9ad0127082 100644 --- a/src/modules/db_mysql/km_val.c +++ b/src/modules/db_mysql/km_val.c @@ -123,7 +123,7 @@ int db_mysql_val2str(const db1_con_t* _c, const db_val_t* _v, char* _s, int* _le break; default: - LM_DBG("unknown data type\n"); + LM_ERR("unknown data type\n"); return -10; } }

1 0

git:master:3aaeb350: db_berkeley: data converting log improvement - errors should be logged as such
by Henning Westerholt 06 Mar '18

06 Mar '18

Module: kamailio Branch: master Commit: 3aaeb350f3cd63ecb8662ba1087bffceeb1321ea URL: https://github.com/kamailio/kamailio/commit/3aaeb350f3cd63ecb8662ba1087bffc… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-06T08:38:15+01:00 db_berkeley: data converting log improvement - errors should be logged as such --- Modified: src/modules/db_berkeley/bdb_lib.c Modified: src/modules/db_berkeley/km_bdb_val.c --- Diff: https://github.com/kamailio/kamailio/commit/3aaeb350f3cd63ecb8662ba1087bffc… Patch: https://github.com/kamailio/kamailio/commit/3aaeb350f3cd63ecb8662ba1087bffc… --- diff --git a/src/modules/db_berkeley/bdb_lib.c b/src/modules/db_berkeley/bdb_lib.c index 53d2a67c22..9d566b9bab 100644 --- a/src/modules/db_berkeley/bdb_lib.c +++ b/src/modules/db_berkeley/bdb_lib.c @@ -1082,7 +1082,7 @@ int bdb_val2str(db_fld_t *fld, char *sout, int *slen) break; default: - DBG("Unknown data type\n"); + ERR("Unknown data type\n"); return -8; } } diff --git a/src/modules/db_berkeley/km_bdb_val.c b/src/modules/db_berkeley/km_bdb_val.c index c2d273d1ed..d895a870c9 100644 --- a/src/modules/db_berkeley/km_bdb_val.c +++ b/src/modules/db_berkeley/km_bdb_val.c @@ -274,7 +274,7 @@ int km_bdb_val2str(db_val_t *_v, char *_s, int *_len) break; default: - LM_DBG("Unknown data type\n"); + LM_ERR("Unknown data type\n"); return -8; } }

1 0

git:master:56cfefde: db_cassandra: fix warnings: enumeration value âDB1_UNKNOWNâ not handled in switch
by Henning Westerholt 06 Mar '18

06 Mar '18

Module: kamailio Branch: master Commit: 56cfefde6883e476ece14a8e45cc906cd9a2f015 URL: https://github.com/kamailio/kamailio/commit/56cfefde6883e476ece14a8e45cc906… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-06T08:32:52+01:00 db_cassandra: fix warnings: enumeration value âDB1_UNKNOWNâ not handled in switch - fix warnings: enumeration value âDB1_UNKNOWNâ not handled in switch - fix a C++ compilation issue related to variable declaration in a switch case --- Modified: src/modules/db_cassandra/dbcassa_base.cpp --- Diff: https://github.com/kamailio/kamailio/commit/56cfefde6883e476ece14a8e45cc906… Patch: https://github.com/kamailio/kamailio/commit/56cfefde6883e476ece14a8e45cc906… --- diff --git a/src/modules/db_cassandra/dbcassa_base.cpp b/src/modules/db_cassandra/dbcassa_base.cpp index 886073f779..873cef2d89 100644 --- a/src/modules/db_cassandra/dbcassa_base.cpp +++ b/src/modules/db_cassandra/dbcassa_base.cpp @@ -309,6 +309,9 @@ static int cassa_convert_result(db_key_t qcol, std::vector<oac::ColumnOrSuperCol return -1; } break; + default: + LM_ERR("unknown data type\n"); + return -1; } return 0; } @@ -334,6 +337,7 @@ static char* dbval_to_string(db_val_t dbval, char* pk) break; case DB1_DATETIME:pk+= sprintf(pk, "%ld", (long int)dbval.val.time_val); break; + default: LM_ERR("unknown data type\n"); } return pk; } @@ -716,6 +720,9 @@ static int cassa_convert_result_raw(db_val_t* sr_cell, str *col_val) { return -1; } break; + default: + LM_ERR("unknown data type\n"); + return -1; } return 0; } @@ -1149,7 +1156,8 @@ int db_cassa_modify(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, break; case DB1_BLOB: value = std::string(_uv[i].val.blob_val.s, _uv[i].val.blob_val.len); break; - case DB1_DATETIME: unsigned int exp_time = (unsigned int)_uv[i].val.time_val; + case DB1_DATETIME: { /* own block because we declare a variable here */ + unsigned int exp_time = (unsigned int)_uv[i].val.time_val; out << exp_time; value = out.str(); if(ts_col_name.s && ts_col_name.len==_uk[i]->len && @@ -1157,7 +1165,14 @@ int db_cassa_modify(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, ts = exp_time; LM_DBG("Found timestamp col [%.*s]\n", ts_col_name.len, ts_col_name.s); } - break; + } break; + case DB1_UNKNOWN: + LM_ERR("unknown data type\n"); + /* needs probably more errors handling, free at least the memory */ + if(ts_col_name.s) + pkg_free(ts_col_name.s); + ts_col_name.s = 0; + return -1; } if (cont) continue;

1 0

git:master:24d1b3b9: db_cassandra: remove a few unused variables (compiler warnings)
by Henning Westerholt 06 Mar '18

06 Mar '18

Module: kamailio Branch: master Commit: 24d1b3b975ef82400adde37e9851143d7f1b4e4d URL: https://github.com/kamailio/kamailio/commit/24d1b3b975ef82400adde37e9851143… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-06T08:11:43+01:00 db_cassandra: remove a few unused variables (compiler warnings) --- Modified: src/modules/db_cassandra/dbcassa_table.c --- Diff: https://github.com/kamailio/kamailio/commit/24d1b3b975ef82400adde37e9851143… Patch: https://github.com/kamailio/kamailio/commit/24d1b3b975ef82400adde37e9851143… --- diff --git a/src/modules/db_cassandra/dbcassa_table.c b/src/modules/db_cassandra/dbcassa_table.c index 71e027c0eb..0585414ec1 100644 --- a/src/modules/db_cassandra/dbcassa_table.c +++ b/src/modules/db_cassandra/dbcassa_table.c @@ -186,7 +186,7 @@ dbcassa_table_p dbcassa_load_file(str* dbn, str* tbn) #define KEY_MAX_LEN 10 FILE *fin=NULL; char buf[4096]; - int c, crow, ccol, bp, max_auto; + int c, ccol, bp; dbcassa_table_p dtp = 0; dbcassa_column_p colp= 0; dbcassa_column_p key[KEY_MAX_LEN]; @@ -209,9 +209,7 @@ dbcassa_table_p dbcassa_load_file(str* dbn, str* tbn) goto done; state = DBCASSA_FLINE_ST; - crow = ccol = -1; c = fgetc(fin); - max_auto = 0; while(c!=EOF) { switch(state) { case DBCASSA_FLINE_ST:

1 0

git:master:5b0ab6ab: db_cassandra: fix compilation, adapt Makefile for system wide thrift installation
by Henning Westerholt 06 Mar '18

06 Mar '18

Module: kamailio Branch: master Commit: 5b0ab6ab1a3c0d3b0b1c0ae0964604044c62e93c URL: https://github.com/kamailio/kamailio/commit/5b0ab6ab1a3c0d3b0b1c0ae09646040… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-06T07:51:22+01:00 db_cassandra: fix compilation, adapt Makefile for system wide thrift installation - fix compilation after core restructuring (timer and mem includes) - fix Makefile path, use system wide thrift installation (todo - should be probably autodetected) - improve Makefile variable naming for include dir --- Modified: src/modules/db_cassandra/Makefile Modified: src/modules/db_cassandra/dbcassa_base.cpp --- Diff: https://github.com/kamailio/kamailio/commit/5b0ab6ab1a3c0d3b0b1c0ae09646040… Patch: https://github.com/kamailio/kamailio/commit/5b0ab6ab1a3c0d3b0b1c0ae09646040… --- diff --git a/src/modules/db_cassandra/Makefile b/src/modules/db_cassandra/Makefile index 4f6288654a..4915edc579 100644 --- a/src/modules/db_cassandra/Makefile +++ b/src/modules/db_cassandra/Makefile @@ -11,9 +11,9 @@ LD=g++ auto_gen= NAME=db_cassandra.so -THRIFT_DIR = /usr/local/include/thrift -LIB_DIR = /usr/local/lib -DEFS += -I${THRIFT_DIR} -DKAMAILIO_MOD_INTERFACE +INCLUDE_DIR = /usr/include/thrift +LIB_DIR = /usr/lib +DEFS += -I${INCLUDE_DIR} -DKAMAILIO_MOD_INTERFACE LIBS += -L${LIB_DIR} dbcassa_base.o cassandra_constants.o cassandra_types.o Cassandra.o -lthrift CXXFLAGS=$(CFLAGS:-Wno-deprecated option=) @@ -26,15 +26,15 @@ include ../../Makefile.modules cassandra_constants.o: cassandra_constants.cpp cassandra_constants.h @echo "Compiling $<" - $(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@ + $(CXX) $(CXXFLAGS) -I${INCLUDE_DIR} -c $< -o $@ cassandra_types.o: cassandra_types.cpp cassandra_types.h @echo "Compiling $<" - $(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@ + $(CXX) $(CXXFLAGS) -I${INCLUDE_DIR} -c $< -o $@ Cassandra.o: Cassandra.cpp Cassandra.h @echo "Compiling $<" - $(CXX) $(CXXFLAGS) -I/usr/local/include/thrift -c $< -o $@ + $(CXX) $(CXXFLAGS) -I${INCLUDE_DIR} -c $< -o $@ dbcassa_base.o: dbcassa_base.cpp dbcassa_base.h dbcassa_table.h @echo "Compiling $<" diff --git a/src/modules/db_cassandra/dbcassa_base.cpp b/src/modules/db_cassandra/dbcassa_base.cpp index bd336c1fbb..886073f779 100644 --- a/src/modules/db_cassandra/dbcassa_base.cpp +++ b/src/modules/db_cassandra/dbcassa_base.cpp @@ -39,8 +39,8 @@ #include <transport/TTransportUtils.h> extern "C" { -#include "../../timer.h" -#include "../../mem/mem.h" +#include "../../core/timer.h" +#include "../../core/mem/mem.h" #include "dbcassa_table.h" }

1 0

git:master:30aa62a5: app_python: fix jenkins build failure, reversed arguments
by AntonyA 06 Mar '18

06 Mar '18

Module: kamailio Branch: master Commit: 30aa62a5b66a1b16f9012466385bf235688b332e URL: https://github.com/kamailio/kamailio/commit/30aa62a5b66a1b16f9012466385bf23… Author: AntonyA <ascanio.alba7(a)gmail.com> Committer: AntonyA <ascanio.alba7(a)gmail.com> Date: 2018-03-06T03:30:55Z app_python: fix jenkins build failure, reversed arguments --- Modified: src/modules/app_python/python_support.c --- Diff: https://github.com/kamailio/kamailio/commit/30aa62a5b66a1b16f9012466385bf23… Patch: https://github.com/kamailio/kamailio/commit/30aa62a5b66a1b16f9012466385bf23… --- diff --git a/src/modules/app_python/python_support.c b/src/modules/app_python/python_support.c index 8db77af937..7b1a93017e 100644 --- a/src/modules/app_python/python_support.c +++ b/src/modules/app_python/python_support.c @@ -51,7 +51,7 @@ void python_handle_exception(const char *fmt, ...) if (fmt == NULL) srcbuf = NULL; else { - va_start(fmt, ap); + va_start(ap, fmt); srcbuf = make_message(fmt, ap); va_end(ap); }

1 0

Question: kemi cfgengine function never sees rtype == ONSEND_ROUTE being triggered
by Anthony Alba 06 Mar '18

06 Mar '18

Hi list, When I set cfgengine to app_python/app_python3 I never see the ONSEND_ROUTE rtype being hit. 1. when I make use of the native config engine onsend_route{} is invoked 2. In app_python/apy_kemi.c I instrument a log message: int sr_kemi_config_engine_python(sip_msg_t *msg, int rtype, str *rname, str *rparam) { int ret; ret = -1; LM_NOTICE("executing route type %d\n", rtype); // look for ONSEND_ROUTE if(rtype==REQUEST_ROUTE) { if(rname!=NULL && rname->s!=NULL) { ret = apy_exec(msg, rname->s, ONSEND_ROUTE == (1 << 4) but the cfgengine function never sees rtype == 16. In a simple call I see rtype == 1, 4, 8, 128 but never 16. Thanks Anthony

1 0

git:master:795edca9: app_perl: do dlerror() after dlsym() fails to find exports
by Daniel-Constantin Mierla 05 Mar '18

05 Mar '18

Module: kamailio Branch: master Commit: 795edca9215391f7c8f646895c083f8ac8853341 URL: https://github.com/kamailio/kamailio/commit/795edca9215391f7c8f646895c083f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-05T21:56:04+01:00 app_perl: do dlerror() after dlsym() fails to find exports - some OSes do not reset dlerror after a successful dlsym(), pointing to an older error case - reported by GH #1465 --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/795edca9215391f7c8f646895c083f8… Patch: https://github.com/kamailio/kamailio/commit/795edca9215391f7c8f646895c083f8… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 8a195fc12d..f04d486908 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -619,6 +619,9 @@ int load_module(char* mod_path) } exp = (union module_exports_u*)dlsym(handle, "exports"); if(exp==NULL) { + error =(char*)dlerror(); + LM_DBG("attempt to lookup exports structure failed - dlerror: %s\n", + (error)?error:"none"); /* 'exports' structure not found, look up for '_modulename_exports' */ mdir = strrchr(mod_path, '/'); if (!mdir) {

1 0

git:master:2c828e19: modules: readme files regenerated - usrloc ... [skip ci]
by Kamailio Dev 05 Mar '18

05 Mar '18

Module: kamailio Branch: master Commit: 2c828e19fe6e054681f234129aa70d0daab404f8 URL: https://github.com/kamailio/kamailio/commit/2c828e19fe6e054681f234129aa70d0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-03-05T09:47:22+01:00 modules: readme files regenerated - usrloc ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/2c828e19fe6e054681f234129aa70d0… Patch: https://github.com/kamailio/kamailio/commit/2c828e19fe6e054681f234129aa70d0… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index 579b1ff5d6..ffd557e563 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -90,6 +90,7 @@ Carsten Bock 3.44. skip_remote_socket (int) 3.45. db_timer_clean (int) 3.46. rm_expired_delay (int) + 3.47. server_id_filter (int) 4. RPC Commands @@ -183,6 +184,7 @@ Carsten Bock 1.44. Set skip_remote_socket parameter 1.45. Set db_timer_clean parameter 1.46. Set rm_expired_delay parameter + 1.47. Set server_id_filter parameter Chapter 1. Admin Guide @@ -245,6 +247,7 @@ Chapter 1. Admin Guide 3.44. skip_remote_socket (int) 3.45. db_timer_clean (int) 3.46. rm_expired_delay (int) + 3.47. server_id_filter (int) 4. RPC Commands @@ -370,6 +373,7 @@ Chapter 1. Admin Guide 3.44. skip_remote_socket (int) 3.45. db_timer_clean (int) 3.46. rm_expired_delay (int) + 3.47. server_id_filter (int) 3.1. nat_bflag (integer) @@ -995,6 +999,17 @@ modparam("usrloc", "db_timer_clean", 1) modparam("usrloc", "rm_expired_delay", 30) ... +3.47. server_id_filter (int) + + Enable (1) or disable (0) filter records by server_id on load. + + Default value is “0”. + + Example 1.47. Set server_id_filter parameter +... +modparam("usrloc", "server_id_filter", 1) +... + 4. RPC Commands 4.1. ul.dump

1 0

git:5.0:96b8bfdb: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 05 Mar '18

05 Mar '18

Module: kamailio Branch: 5.0 Commit: 96b8bfdbe0ff978e13961e04a251470007d945fe URL: https://github.com/kamailio/kamailio/commit/96b8bfdbe0ff978e13961e04a251470… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-03-05T09:46:27+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/96b8bfdbe0ff978e13961e04a251470… Patch: https://github.com/kamailio/kamailio/commit/96b8bfdbe0ff978e13961e04a251470… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index 06a5728ca6..8378f333e2 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -86,6 +86,7 @@ Carsten Bock 3.40. db_insert_null (int) 3.41. skip_remote_socket (int) 3.42. db_timer_clean (int) + 3.43. server_id_filter (int) 4. RPC Commands @@ -175,6 +176,7 @@ Carsten Bock 1.40. Set db_insert_null parameter 1.41. Set skip_remote_socket parameter 1.42. Set db_timer_clean parameter + 1.43. Set server_id_filter parameter Chapter 1. Admin Guide @@ -233,6 +235,7 @@ Chapter 1. Admin Guide 3.40. db_insert_null (int) 3.41. skip_remote_socket (int) 3.42. db_timer_clean (int) + 3.43. server_id_filter (int) 4. RPC Commands @@ -355,6 +358,7 @@ Chapter 1. Admin Guide 3.40. db_insert_null (int) 3.41. skip_remote_socket (int) 3.42. db_timer_clean (int) + 3.43. server_id_filter (int) 3.1. nat_bflag (integer) @@ -931,6 +935,17 @@ modparam("usrloc", "skip_remote_socket", 1) modparam("usrloc", "db_timer_clean", 1) ... +3.43. server_id_filter (int) + + Enable (1) or disable (0) filter records by server_id on load. + + Default value is “0”. + + Example 1.43. Set server_id_filter parameter +... +modparam("usrloc", "server_id_filter", 1) +... + 4. RPC Commands 4.1. ul.dump

1 0

git:5.0:15858a69: srloc: missing documentation for module parameter 'server_id_filter'
by Victor Seva 05 Mar '18

05 Mar '18

Module: kamailio Branch: 5.0 Commit: 15858a69a18633ff9ee16a1c3cb61fede805dd83 URL: https://github.com/kamailio/kamailio/commit/15858a69a18633ff9ee16a1c3cb61fe… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-03-05T09:44:36+01:00 srloc: missing documentation for module parameter 'server_id_filter' (cherry picked from commit fa9947c7295f364235f9f6417fc44fa486bf0c87) (cherry picked from commit 0928fa7ef1652e0646b08a118592094753ec18c6) --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/15858a69a18633ff9ee16a1c3cb61fe… Patch: https://github.com/kamailio/kamailio/commit/15858a69a18633ff9ee16a1c3cb61fe… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 2f7ab8042f..0a5c65676b 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1115,6 +1115,26 @@ modparam("usrloc", "db_timer_clean", 1) </example> </section> + <section id="usrloc.p.server_id_filter"> + <title><varname>server_id_filter</varname> (int)</title> + <para> + Enable (1) or disable (0) filter records by server_id on load. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>server_id_filter</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "server_id_filter", 1) +... +</programlisting> + </example> + </section> + </section> <section>

1 0

git:5.1:0928fa7e: srloc: missing documentation for module parameter 'server_id_filter'
by Victor Seva 05 Mar '18

05 Mar '18

Module: kamailio Branch: 5.1 Commit: 0928fa7ef1652e0646b08a118592094753ec18c6 URL: https://github.com/kamailio/kamailio/commit/0928fa7ef1652e0646b08a118592094… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-03-05T09:43:23+01:00 srloc: missing documentation for module parameter 'server_id_filter' (cherry picked from commit fa9947c7295f364235f9f6417fc44fa486bf0c87) --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0928fa7ef1652e0646b08a118592094… Patch: https://github.com/kamailio/kamailio/commit/0928fa7ef1652e0646b08a118592094… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 96ff750f97..177a5aef80 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1177,6 +1177,26 @@ modparam("usrloc", "db_timer_clean", 1) </example> </section> + <section id="usrloc.p.server_id_filter"> + <title><varname>server_id_filter</varname> (int)</title> + <para> + Enable (1) or disable (0) filter records by server_id on load. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>server_id_filter</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "server_id_filter", 1) +... +</programlisting> + </example> + </section> + </section> <section>

1 0

git:master:fa9947c7: usrloc: missing documentation for module parameter 'server_id_filter'
by Victor Seva 05 Mar '18

05 Mar '18

Module: kamailio Branch: master Commit: fa9947c7295f364235f9f6417fc44fa486bf0c87 URL: https://github.com/kamailio/kamailio/commit/fa9947c7295f364235f9f6417fc44fa… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-03-05T09:34:36+01:00 usrloc: missing documentation for module parameter 'server_id_filter' --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fa9947c7295f364235f9f6417fc44fa… Patch: https://github.com/kamailio/kamailio/commit/fa9947c7295f364235f9f6417fc44fa… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index bceb11c9f1..5de9b82c08 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1198,6 +1198,26 @@ modparam("usrloc", "rm_expired_delay", 30) </example> </section> + <section id="usrloc.p.server_id_filter"> + <title><varname>server_id_filter</varname> (int)</title> + <para> + Enable (1) or disable (0) filter records by server_id on load. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>server_id_filter</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "server_id_filter", 1) +... +</programlisting> + </example> + </section> + </section> <section>

1 0

[kamailio/kamailio] db_cassandra can't find table version (#618)
by goharahmed 03 Mar '18

03 Mar '18

Hi devs, I'm trying to make the db_cassandra work for my kamailio specifically userblacklist module. I've cassanda keyspace and tables defined along with the db_schema directory structure defined as instructed however the debug logs keep telling me that table 'version' doesn't exist. I've taken a look inside the dbcassa_table.c file https://github.com/kamailio/kamailio/blob/master/modules/db_cassandra/dbcas… Somewhere in this function it just doesn't get hold of "tbc" and hence it throws up error. Here is how I've figured out this code. hash = core_hash(dbn, tbn, DBCASSA_TABLE_SIZE); **if(!hash) LM_ERR("hash NOT FOUND\n");** hashidx = hash % DBCASSA_TABLE_SIZE; **if(!hashidx) LM_ERR("hashidx NOT FOUND\n");** ref_read_data(dbcassa_tbl_htable[hashidx].lock); tbc = dbcassa_tbl_htable[hashidx].dtp; **if(!tbc) LM_ERR("TBC NOT FOUND\n");** while(tbc) { LM_DBG("found dbname=%.*s, table=%.*s\n", tbc->dbname.len, tbc->dbname.s, tbc->name.len, tbc->name.s); if(tbc->hash==hash && tbc->dbname.len == dbn->len && tbc->name.len == tbn->len && !strncasecmp(tbc->dbname.s, dbn->s, dbn->len) && !strncasecmp(tbc->name.s, tbn->s, tbn->len)) { memcpy(full_path_buf + dbcassa_schema_path.len, dbn->s, dbn->len); len = dbcassa_schema_path.len + dbn->len; full_path_buf[len++] = '/'; memcpy(full_path_buf + len, tbn->s, tbn->len); full_path_buf[len + tbn->len] = '\0'; if(dbcassa_check_mtime(&tbc->mt) == 0) return tbc; old_tbc = tbc; break; } tbc = tbc->next; } unref_read_data(dbcassa_tbl_htable[hashidx].lock); **if(!old_tbc) { LM_ERR("OLD_TBC NOT FOUND\n");** return NULL; } and upon starting of kamailio after recompiling the module I see these lines printed. 0(15574) DEBUG: db_cassandra [dbcassa_base.cpp:149]: db_cassa_new_connection(): opening connection: cassa://xxxx:xxxx@127.0.0.1:9160/kamailio 0(15574) DEBUG: <core> [mem/f_malloc.c:439]: fm_malloc(): fm_malloc(0x7f9c14f8a010, 48) called from db_cassandra: dbcassa_base.cpp: db_cassa_new_connection(155) 0(15574) DEBUG: <core> [mem/f_malloc.c:514]: fm_malloc(): fm_malloc(0x7f9c14f8a010, 48) returns address 0x7f9c150055f0 0(15574) DEBUG: db_cassandra [dbcassa_base.cpp:161]: db_cassa_new_connection(): 0x7f9c150055f0=pkg_malloc(48) 0(15574) DEBUG: db_cassandra [dbcassa_base.cpp:117]: dbcassa_open(): Opened connection to Cassandra cluster 127.0.0.1:9160 0(15574) DEBUG: db_cassandra [dbcassa_base.cpp:955]: db_cassa_query(): query table=version **0(15574) ERROR: db_cassandra [dbcassa_table.c:463]: dbcassa_db_get_table(): TBC NOT FOUND 0(15574) ERROR: db_cassandra [dbcassa_table.c:486]: dbcassa_db_get_table(): OLD_TBC NOT FOUND** 0(15574) ERROR: db_cassandra [dbcassa_base.cpp:449]: cassa_translate_query(): table version does not exist! 0(15574) ERROR: db_cassandra [dbcassa_base.cpp:962]: db_cassa_query(): Failed to query Cassandra cluster 0(15574) ERROR: <core> [db.c:397]: db_table_version(): error in db_query 0(15574) ERROR: <core> [db.c:436]: db_check_table_version(): querying version for table userblacklist 0(15574) ERROR: userblacklist [db_userblacklist.c:86]: userblacklist_db_init(): during table version check. 0(15574) DEBUG: <core> [db_pool.c:100]: pool_remove(): removing connection from the pool 0(15574) DEBUG: <core> [mem/f_malloc.c:575]: fm_free(): fm_free(0x7f9c14f8a010, 0x7f9c150055f0), called from db_cassandra: dbcassa_base.cpp: db_cassa_free_connection(203) 0(15574) DEBUG: <core> [mem/f_malloc.c:594]: fm_free(): fm_free: freeing block alloc'ed from db_cassandra: dbcassa_base.cpp: db_cassa_new_connection(155) 0(15574) DEBUG: <core> [mem/f_malloc.c:575]: fm_free(): fm_free(0x7f9c14f8a010, 0x7f9c15005318), called from core: db.c: db_do_close(356) 0(15574) DEBUG: <core> [mem/f_malloc.c:594]: fm_free(): fm_free: freeing block alloc'ed from core: db.c: db_do_init2(298) 0(15574) ERROR: <core> [sr_module.c:968]: init_mod(): Error while initializing module userblacklist (/usr/local/lib64/kamailio/modules/userblacklist.so) ERROR: error while initializing modules Kindly look into this and let me know how to make this work. Thanks, Sammy --- 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/issues/618

3 14

git:master:1bf9eac9: misc/db script: change e-mail adress in ser database scripts
by Henning Westerholt 03 Mar '18

03 Mar '18

Module: kamailio Branch: master Commit: 1bf9eac9d1531cf8e7492ba6c21f60493c309cee URL: https://github.com/kamailio/kamailio/commit/1bf9eac9d1531cf8e7492ba6c21f604… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-03T19:28:25+01:00 misc/db script: change e-mail adress in ser database scripts - change e-mail adress in ser database scripts to sr-dev list - these scripts are probably obselete - but this way we will at least notice if somebody tries to use them --- Modified: misc/scripts/dbtext/ser_dbtext.sh Modified: misc/scripts/mysql/sip-router_mysql.sh Modified: misc/scripts/postgres/ser_postgres.sh --- Diff: https://github.com/kamailio/kamailio/commit/1bf9eac9d1531cf8e7492ba6c21f604… Patch: https://github.com/kamailio/kamailio/commit/1bf9eac9d1531cf8e7492ba6c21f604… --- diff --git a/misc/scripts/dbtext/ser_dbtext.sh b/misc/scripts/dbtext/ser_dbtext.sh index ce34142184..d572dca06c 100755 --- a/misc/scripts/dbtext/ser_dbtext.sh +++ b/misc/scripts/dbtext/ser_dbtext.sh @@ -104,7 +104,7 @@ FILES ${SRCDB_DIR}/${SRCDB} REPORTING BUGS - Report bugs to <ser-bugs(a)iptel.org> + Report bugs to <sr-dev(a)lists.kamailio.org> EOF } #usage diff --git a/misc/scripts/mysql/sip-router_mysql.sh b/misc/scripts/mysql/sip-router_mysql.sh index 3b40132ecd..aba468c7aa 100755 --- a/misc/scripts/mysql/sip-router_mysql.sh +++ b/misc/scripts/mysql/sip-router_mysql.sh @@ -175,7 +175,7 @@ FILES ${SCRIPT_DIR}/${DROP_SCRIPT} REPORTING BUGS - Report bugs to <ser-bugs(a)iptel.org> + Report bugs to <sr-dev(a)lists.kamailio.org> EOF } #usage diff --git a/misc/scripts/postgres/ser_postgres.sh b/misc/scripts/postgres/ser_postgres.sh index 9412ba0d21..cca43e1eee 100755 --- a/misc/scripts/postgres/ser_postgres.sh +++ b/misc/scripts/postgres/ser_postgres.sh @@ -53,7 +53,7 @@ Usage: $COMMAND create [database] to create databases, tables, and users) PSQL Full path to mysql command (${PSQL}) -Report bugs to <ser-bugs(a)iptel.org> +Report bugs to <sr-dev(a)lists.kamailio.org> EOF } #usage

1 0

git:master:52a8def8: utils: kamdbctl - updated help message for migrate command
by Daniel-Constantin Mierla 03 Mar '18

03 Mar '18

Module: kamailio Branch: master Commit: 52a8def8d2a3e83170ab554a85b26d977d99f51a URL: https://github.com/kamailio/kamailio/commit/52a8def8d2a3e83170ab554a85b26d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-14T11:24:37+01:00 utils: kamdbctl - updated help message for migrate command --- Modified: utils/kamctl/kamdbctl.base --- Diff: https://github.com/kamailio/kamailio/commit/52a8def8d2a3e83170ab554a85b26d9… Patch: https://github.com/kamailio/kamailio/commit/52a8def8d2a3e83170ab554a85b26d9… --- diff --git a/utils/kamctl/kamdbctl.base b/utils/kamctl/kamdbctl.base index 2abde29d26..13af37e7c6 100644 --- a/utils/kamctl/kamdbctl.base +++ b/utils/kamctl/kamdbctl.base @@ -97,7 +97,7 @@ usage: $COMMAND create <db name or db_path, optional> ...(creates a new database $COMMAND backup <file> ...........................(dumps current database to file) $COMMAND restore <file> ..........................(restores tables from a file) $COMMAND copy <new_db> ...........................(creates a new db from an existing one) - $COMMAND migrate <old_db> <new_db> ...............(migrates DB from 1.2 to 1.3, not implemented yet!) + $COMMAND migrate <old_db> <new_db> ...............(migrates DB - no longer maintained!) $COMMAND presence ................................(adds the presence related tables) $COMMAND extra ...................................(adds the extra tables) $COMMAND dbuid ...................................(adds the uid tables)

2 3

git:master:4d447560: kamdbctl: remove not working db migrate command
by Henning Westerholt 03 Mar '18

03 Mar '18

Module: kamailio Branch: master Commit: 4d447560ccfb253e5b5627c9900d46458bfcbe5d URL: https://github.com/kamailio/kamailio/commit/4d447560ccfb253e5b5627c9900d464… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-03T19:08:30+01:00 kamdbctl: remove not working db migrate command - remove db migrate implementation in kamdbctl, .base, .mysql and .db_berkley files - it was not working for mysql anyway, and not implemented for berkleydb - this state was already documtend some weeks ago in commit 52a8def8d2a3e831 --- Modified: utils/kamctl/kamdbctl Modified: utils/kamctl/kamdbctl.base Modified: utils/kamctl/kamdbctl.db_berkeley Modified: utils/kamctl/kamdbctl.mysql --- Diff: https://github.com/kamailio/kamailio/commit/4d447560ccfb253e5b5627c9900d464… Patch: https://github.com/kamailio/kamailio/commit/4d447560ccfb253e5b5627c9900d464…

1 0

git:master:06480434: Merge pull request #1467 from que273/master
by GitHub 03 Mar '18

03 Mar '18

Module: kamailio Branch: master Commit: 064804347421088e01c9f702933aa76ed59c7c13 URL: https://github.com/kamailio/kamailio/commit/064804347421088e01c9f702933aa76… Author: henningw <henningw(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2018-03-03T19:03:27+01:00 Merge pull request #1467 from que273/master sqlops: sqlops_do_query - Make result parameter optional in C API --- Modified: src/modules/sqlops/sql_api.c --- Diff: https://github.com/kamailio/kamailio/commit/064804347421088e01c9f702933aa76… Patch: https://github.com/kamailio/kamailio/commit/064804347421088e01c9f702933aa76… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index 16492300bc..21fbfa950f 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -697,17 +697,27 @@ int sqlops_do_query(str *scon, str *squery, str *sres) sql_con_t *con = NULL; sql_result_t *res = NULL; + if (scon == NULL || scon->s == NULL) + { + LM_ERR("invalid connection name\n"); + goto error; + } + con = sql_get_connection(scon); if(con==NULL) { LM_ERR("invalid connection [%.*s]\n", scon->len, scon->s); goto error; } - res = sql_get_result(sres); - if(res==NULL) + /* Result parameter is optional */ + if (sres && sres->s) { - LM_ERR("invalid result [%.*s]\n", sres->len, sres->s); - goto error; + res = sql_get_result(sres); + if(res==NULL) + { + LM_ERR("invalid result [%.*s]\n", sres->len, sres->s); + goto error; + } } if(sql_do_query(con, squery, res)<0) goto error; @@ -724,6 +734,12 @@ int sqlops_get_value(str *sres, int i, int j, sql_val_t **val) { sql_result_t *res = NULL; + if (sres == NULL || sres->s == NULL) + { + LM_ERR("invalid result name\n"); + goto error; + } + res = sql_get_result(sres); if(res==NULL) { @@ -754,6 +770,12 @@ int sqlops_is_null(str *sres, int i, int j) { sql_result_t *res = NULL; + if (sres == NULL || sres->s == NULL) + { + LM_ERR("invalid result name\n"); + goto error; + } + res = sql_get_result(sres); if(res==NULL) { @@ -784,6 +806,12 @@ int sqlops_get_column(str *sres, int i, str *col) { sql_result_t *res = NULL; + if (sres == NULL || sres->s == NULL) + { + LM_ERR("invalid result name\n"); + goto error; + } + res = sql_get_result(sres); if(res==NULL) { @@ -808,6 +836,12 @@ int sqlops_num_columns(str *sres) { sql_result_t *res = NULL; + if (sres == NULL || sres->s == NULL) + { + LM_ERR("invalid result name\n"); + goto error; + } + res = sql_get_result(sres); if(res==NULL) { @@ -826,6 +860,12 @@ int sqlops_num_rows(str *sres) { sql_result_t *res = NULL; + if (sres == NULL || sres->s == NULL) + { + LM_ERR("invalid result name\n"); + goto error; + } + res = sql_get_result(sres); if(res==NULL) { @@ -844,6 +884,12 @@ void sqlops_reset_result(str *sres) { sql_result_t *res = NULL; + if (sres == NULL || sres->s == NULL) + { + LM_ERR("invalid result name\n"); + return; + } + res = sql_get_result(sres); if(res==NULL) { @@ -862,6 +908,12 @@ int sqlops_do_xquery(sip_msg_t *msg, str *scon, str *squery, str *xavp) { sql_con_t *con = NULL; + if (scon == NULL || scon->s == NULL) + { + LM_ERR("invalid connection name\n"); + goto error; + } + con = sql_get_connection(scon); if(con==NULL) {

1 0

git:master:53e1326f: sqlops: Add NULL parameter check to C/KEMI API functions
by Hugh Waite 03 Mar '18

03 Mar '18

Module: kamailio Branch: master Commit: 53e1326f25e57491343a86a52b7ddf7919acce12 URL: https://github.com/kamailio/kamailio/commit/53e1326f25e57491343a86a52b7ddf7… Author: Hugh Waite <hughw273(a)gmail.com> Committer: Hugh Waite <hughw273(a)gmail.com> Date: 2018-03-01T22:54:18Z sqlops: Add NULL parameter check to C/KEMI API functions - Check for NULL string parameters to prevent crashes sqlops_do_query, sqlops_get_value, sqlops_is_null, sqlops_get_column, sqlops_reset_result, sqlops_num_rows, sqlops_num_columns, sqlops_do_xquery --- Modified: src/modules/sqlops/sql_api.c --- Diff: https://github.com/kamailio/kamailio/commit/53e1326f25e57491343a86a52b7ddf7… Patch: https://github.com/kamailio/kamailio/commit/53e1326f25e57491343a86a52b7ddf7… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index 825f77602a..21fbfa950f 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -697,16 +697,27 @@ int sqlops_do_query(str *scon, str *squery, str *sres) sql_con_t *con = NULL; sql_result_t *res = NULL; + if (scon == NULL || scon->s == NULL) + { + LM_ERR("invalid connection name\n"); + goto error; + } + con = sql_get_connection(scon); if(con==NULL) { LM_ERR("invalid connection [%.*s]\n", scon->len, scon->s); goto error; } - if (sres && ((res = sql_get_result(sres)) == NULL)) + /* Result parameter is optional */ + if (sres && sres->s) { - LM_ERR("invalid result [%.*s]\n", sres->len, sres->s); - goto error; + res = sql_get_result(sres); + if(res==NULL) + { + LM_ERR("invalid result [%.*s]\n", sres->len, sres->s); + goto error; + } } if(sql_do_query(con, squery, res)<0) goto error; @@ -723,6 +734,12 @@ int sqlops_get_value(str *sres, int i, int j, sql_val_t **val) { sql_result_t *res = NULL; + if (sres == NULL || sres->s == NULL) + { + LM_ERR("invalid result name\n"); + goto error; + } + res = sql_get_result(sres); if(res==NULL) { @@ -753,6 +770,12 @@ int sqlops_is_null(str *sres, int i, int j) { sql_result_t *res = NULL; + if (sres == NULL || sres->s == NULL) + { + LM_ERR("invalid result name\n"); + goto error; + } + res = sql_get_result(sres); if(res==NULL) { @@ -783,6 +806,12 @@ int sqlops_get_column(str *sres, int i, str *col) { sql_result_t *res = NULL; + if (sres == NULL || sres->s == NULL) + { + LM_ERR("invalid result name\n"); + goto error; + } + res = sql_get_result(sres); if(res==NULL) { @@ -807,6 +836,12 @@ int sqlops_num_columns(str *sres) { sql_result_t *res = NULL; + if (sres == NULL || sres->s == NULL) + { + LM_ERR("invalid result name\n"); + goto error; + } + res = sql_get_result(sres); if(res==NULL) { @@ -825,6 +860,12 @@ int sqlops_num_rows(str *sres) { sql_result_t *res = NULL; + if (sres == NULL || sres->s == NULL) + { + LM_ERR("invalid result name\n"); + goto error; + } + res = sql_get_result(sres); if(res==NULL) { @@ -843,6 +884,12 @@ void sqlops_reset_result(str *sres) { sql_result_t *res = NULL; + if (sres == NULL || sres->s == NULL) + { + LM_ERR("invalid result name\n"); + return; + } + res = sql_get_result(sres); if(res==NULL) { @@ -861,6 +908,12 @@ int sqlops_do_xquery(sip_msg_t *msg, str *scon, str *squery, str *xavp) { sql_con_t *con = NULL; + if (scon == NULL || scon->s == NULL) + { + LM_ERR("invalid connection name\n"); + goto error; + } + con = sql_get_connection(scon); if(con==NULL) {

1 0

git:master:40183854: sqlops: sqlops_do_query - Make result parameter optional in C API
by Hugh Waite 03 Mar '18

03 Mar '18

Module: kamailio Branch: master Commit: 401838544fde5a11fbdf2b17f21a59ca34cc3db2 URL: https://github.com/kamailio/kamailio/commit/401838544fde5a11fbdf2b17f21a59c… Author: Hugh Waite <hughw273(a)gmail.com> Committer: Hugh Waite <hughw273(a)gmail.com> Date: 2018-03-01T20:57:27Z sqlops: sqlops_do_query - Make result parameter optional in C API - The sqlops_do_query wrapper function will fail if the 'sres' string parameter is NULL - This change prevents a NULL string parameter from causing an error. - The sql_do_query function already handles NULL parameters correctly. --- Modified: src/modules/sqlops/sql_api.c --- Diff: https://github.com/kamailio/kamailio/commit/401838544fde5a11fbdf2b17f21a59c… Patch: https://github.com/kamailio/kamailio/commit/401838544fde5a11fbdf2b17f21a59c… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index 16492300bc..825f77602a 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -703,8 +703,7 @@ int sqlops_do_query(str *scon, str *squery, str *sres) LM_ERR("invalid connection [%.*s]\n", scon->len, scon->s); goto error; } - res = sql_get_result(sres); - if(res==NULL) + if (sres && ((res = sql_get_result(sres)) == NULL)) { LM_ERR("invalid result [%.*s]\n", sres->len, sres->s); goto error;

1 0

[kamailio/kamailio] sqlops: sqlops_do_query - Make result parameter optional in C API (#1467)
by Hugh Waite 03 Mar '18

03 Mar '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1467 -- Commit Summary -- * sqlops: sqlops_do_query - Make result parameter optional in C API -- File Changes -- M src/modules/sqlops/sql_api.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1467.patch https://github.com/kamailio/kamailio/pull/1467.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/1467

2 9

git:master:f8b8cecb: app_python: improve exception debugging
by AnthonyA 03 Mar '18

03 Mar '18

Module: kamailio Branch: master Commit: f8b8cecb7d713b37e3184b4720c992296005a427 URL: https://github.com/kamailio/kamailio/commit/f8b8cecb7d713b37e3184b4720c9922… Author: AnthonyA <ascanio.alba7(a)gmail.com> Committer: AnthonyA <ascanio.alba7(a)gmail.com> Date: 2018-03-03T21:57:28+08:00 app_python: improve exception debugging - print method name and arg on error --- Modified: src/modules/app_python/python_exec.c Modified: src/modules/app_python/python_support.c Modified: src/modules/app_python/python_support.h --- Diff: https://github.com/kamailio/kamailio/commit/f8b8cecb7d713b37e3184b4720c9922… Patch: https://github.com/kamailio/kamailio/commit/f8b8cecb7d713b37e3184b4720c9922… --- diff --git a/src/modules/app_python/python_exec.c b/src/modules/app_python/python_exec.c index 91c93d0e18..f5f4d02532 100644 --- a/src/modules/app_python/python_exec.c +++ b/src/modules/app_python/python_exec.c @@ -146,7 +146,7 @@ int apy_exec(sip_msg_t *_msg, char *fname, char *fparam, int emode) Py_DECREF(pFunc); if (PyErr_Occurred()) { Py_XDECREF(pResult); - python_handle_exception("python_exec2"); + python_handle_exception("apy_exec: %s(%s)", fname, fparam); _sr_apy_env.msg = bmsg; goto err; } diff --git a/src/modules/app_python/python_support.c b/src/modules/app_python/python_support.c index 0a57068719..8db77af937 100644 --- a/src/modules/app_python/python_support.c +++ b/src/modules/app_python/python_support.c @@ -29,6 +29,8 @@ #include "app_python_mod.h" #include "python_support.h" +static char *make_message(const char *fmt, va_list ap); + void python_handle_exception(const char *fmt, ...) { PyObject *pResult; @@ -40,6 +42,7 @@ void python_handle_exception(const char *fmt, ...) int i; char *srcbuf; int exc_exit = 0; + va_list ap; // We don't want to generate traceback when no errors occurred if (!PyErr_Occurred()) @@ -47,8 +50,11 @@ void python_handle_exception(const char *fmt, ...) if (fmt == NULL) srcbuf = NULL; - else - srcbuf = make_message(fmt); + else { + va_start(fmt, ap); + srcbuf = make_message(fmt, ap); + va_end(ap); + } PyErr_Fetch(&exception, &v, &tb); PyErr_Clear(); @@ -184,12 +190,11 @@ PyObject *InitTracebackModule() } -char *make_message(const char *fmt, ...) +static char *make_message(const char *fmt, va_list ap) { int n; size_t size; char *p, *np; - va_list ap; size = 100; /* Guess we need no more than 100 bytes. */ p = (char *)pkg_realloc(NULL, size * sizeof(char)); @@ -203,9 +208,7 @@ char *make_message(const char *fmt, ...) while (1) { - va_start(ap, fmt); n = vsnprintf(p, size, fmt, ap); - va_end(ap); if (n > -1 && n < size) return p; diff --git a/src/modules/app_python/python_support.h b/src/modules/app_python/python_support.h index 032340dcdd..4d25564119 100644 --- a/src/modules/app_python/python_support.h +++ b/src/modules/app_python/python_support.h @@ -28,7 +28,6 @@ PyObject *format_exc_obj; void python_handle_exception(const char *, ...); -char *make_message(const char *fmt, ...); PyObject *InitTracebackModule(void); char *get_class_name(PyObject *);

1 0

git:master:8c1f1c16: app_python3: improve exception debugging
by AnthonyA 03 Mar '18

03 Mar '18

Module: kamailio Branch: master Commit: 8c1f1c16c1d054cbc01dc26341f6770934d46ead URL: https://github.com/kamailio/kamailio/commit/8c1f1c16c1d054cbc01dc26341f6770… Author: AnthonyA <ascanio.alba7(a)gmail.com> Committer: AnthonyA <ascanio.alba7(a)gmail.com> Date: 2018-03-03T21:57:28+08:00 app_python3: improve exception debugging - print method name and arg on error --- Modified: src/modules/app_python3/python_exec.c Modified: src/modules/app_python3/python_support.c Modified: src/modules/app_python3/python_support.h --- Diff: https://github.com/kamailio/kamailio/commit/8c1f1c16c1d054cbc01dc26341f6770… Patch: https://github.com/kamailio/kamailio/commit/8c1f1c16c1d054cbc01dc26341f6770… --- diff --git a/src/modules/app_python3/python_exec.c b/src/modules/app_python3/python_exec.c index 12a8008d66..55f40c1e47 100644 --- a/src/modules/app_python3/python_exec.c +++ b/src/modules/app_python3/python_exec.c @@ -142,7 +142,7 @@ int apy_exec(sip_msg_t *_msg, char *fname, char *fparam, int emode) Py_DECREF(pFunc); if (PyErr_Occurred()) { Py_XDECREF(pResult); - python_handle_exception("python_exec2"); + python_handle_exception("apy_exec: %s(%s)", fname, fparam); _sr_apy_env.msg = bmsg; goto err; } diff --git a/src/modules/app_python3/python_support.c b/src/modules/app_python3/python_support.c index a08cd9ee11..2ad522901a 100644 --- a/src/modules/app_python3/python_support.c +++ b/src/modules/app_python3/python_support.c @@ -29,6 +29,8 @@ #include "app_python_mod.h" #include "python_support.h" +static char *make_message(const char *fmt, va_list args); + void python_handle_exception(const char *fmt, ...) { PyObject *pResult; @@ -40,6 +42,7 @@ void python_handle_exception(const char *fmt, ...) int i; char *srcbuf; int exc_exit = 0; + va_list ap; // We don't want to generate traceback when no errors occurred if (!PyErr_Occurred()) @@ -47,8 +50,11 @@ void python_handle_exception(const char *fmt, ...) if (fmt == NULL) srcbuf = NULL; - else - srcbuf = make_message(fmt); + else { + va_start(ap, fmt); + srcbuf = make_message(fmt, ap); + va_end(ap); + } PyErr_Fetch(&exception, &v, &tb); PyErr_Clear(); @@ -184,12 +190,11 @@ PyObject *InitTracebackModule() } -char *make_message(const char *fmt, ...) +static char *make_message(const char *fmt, va_list ap) { int n; size_t size; char *p, *np; - va_list ap; size = 100; /* Guess we need no more than 100 bytes. */ p = (char *)pkg_realloc(NULL, size * sizeof(char)); @@ -203,9 +208,7 @@ char *make_message(const char *fmt, ...) while (1) { - va_start(ap, fmt); n = vsnprintf(p, size, fmt, ap); - va_end(ap); if (n > -1 && n < size) return p; diff --git a/src/modules/app_python3/python_support.h b/src/modules/app_python3/python_support.h index 032340dcdd..4d25564119 100644 --- a/src/modules/app_python3/python_support.h +++ b/src/modules/app_python3/python_support.h @@ -28,7 +28,6 @@ PyObject *format_exc_obj; void python_handle_exception(const char *, ...); -char *make_message(const char *fmt, ...); PyObject *InitTracebackModule(void); char *get_class_name(PyObject *);

1 0

git:master:9831bba7: app_python3: code cleanup
by AnthonyA 03 Mar '18

03 Mar '18

Module: kamailio Branch: master Commit: 9831bba76bbdde62513c6b7f2c35e6cfe5a5a566 URL: https://github.com/kamailio/kamailio/commit/9831bba76bbdde62513c6b7f2c35e6c… Author: AnthonyA <ascanio.alba7(a)gmail.com> Committer: AnthonyA <ascanio.alba7(a)gmail.com> Date: 2018-03-03T21:32:02+08:00 app_python3: code cleanup --- Modified: src/modules/app_python3/app_python_mod.c Modified: src/modules/app_python3/apy_kemi.c Modified: src/modules/app_python3/python_exec.c --- Diff: https://github.com/kamailio/kamailio/commit/9831bba76bbdde62513c6b7f2c35e6c… Patch: https://github.com/kamailio/kamailio/commit/9831bba76bbdde62513c6b7f2c35e6c…

1 0

git:master:045d4476: core: check return of dlsym() before dlerror() handling
by Daniel-Constantin Mierla 03 Mar '18

03 Mar '18

Module: kamailio Branch: master Commit: 045d44762ce7cd267e64849c1c138d45b1fa040f URL: https://github.com/kamailio/kamailio/commit/045d44762ce7cd267e64849c1c138d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-03T07:39:45+01:00 core: check return of dlsym() before dlerror() handling - cope with the case when dlerror is not reset by dlsym - related to GH #1465 --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/045d44762ce7cd267e64849c1c138d4… Patch: https://github.com/kamailio/kamailio/commit/045d44762ce7cd267e64849c1c138d4… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 594f3d6af8..8a195fc12d 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -630,11 +630,14 @@ int load_module(char* mod_path) if(expref.len>3 && strcmp(expref.s+expref.len-3, ".so")==0) expref.len -= 3; snprintf(exbuf, 62, "_%.*s_exports", expref.len, expref.s); - exp = (union module_exports_u*)dlsym(handle, exbuf); LM_DBG("looking up exports with name: %s\n", exbuf); - if ( (error =(char*)dlerror())!=0 ){ - LM_ERR("%s\n", error); - goto error1; + exp = (union module_exports_u*)dlsym(handle, exbuf); + if(exp==NULL) { + if ( (error =(char*)dlerror())!=0 ){ + LM_ERR("failure for exports symbol: %s - dlerror: %s\n", + exbuf, error); + goto error1; + } } } /* hack to allow for kamailio style dlflags inside exports */

1 0

git:master:310c60cb: app_python: don't hide the real exception on load failure
by Daniel-Constantin Mierla 02 Mar '18

02 Mar '18

Module: kamailio Branch: master Commit: 310c60cb34641f73ac0e8b48c9bf68efa5fb3533 URL: https://github.com/kamailio/kamailio/commit/310c60cb34641f73ac0e8b48c9bf68e… Author: AnthonyA <ascanio.alba7(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-02T21:00:00+01:00 app_python: don't hide the real exception on load failure - don't call PyErr_PrintEx() as this clears the error indicator --- Modified: src/modules/app_python/app_python_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/310c60cb34641f73ac0e8b48c9bf68e… Patch: https://github.com/kamailio/kamailio/commit/310c60cb34641f73ac0e8b48c9bf68e… --- diff --git a/src/modules/app_python/app_python_mod.c b/src/modules/app_python/app_python_mod.c index 78cee45c66..98738ee66c 100644 --- a/src/modules/app_python/app_python_mod.c +++ b/src/modules/app_python/app_python_mod.c @@ -287,7 +287,7 @@ int apy_reload_script(void) PY_GIL_ENSURE; pModule = PyImport_ReloadModule(_sr_apy_module); if (!pModule) { - PyErr_PrintEx(0); + // PyErr_PrintEx(0); - don't hide the real exception if (!PyErr_Occurred()) PyErr_Format(PyExc_ImportError, "Reload module '%s'", bname); python_handle_exception("mod_init");

1 0

[kamailio/kamailio] app_python: don't hide the real exception on load failure (#1471)
by aalba6675 02 Mar '18

02 Mar '18

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Calling PyErr_Print() clears the error indicator and hides the real cause of failing to load the module as the output is lost (module has no stderr). The error should be left to python_handle_exception() to display via LM_ERR. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1471 -- Commit Summary -- * app_python: don't hide the real exception on load failure -- File Changes -- M src/modules/app_python/app_python_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1471.patch https://github.com/kamailio/kamailio/pull/1471.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/1471

2 2

git:master:829941d0: app_python3: don't hide the real exception on load failure
by AnthonyA 02 Mar '18

02 Mar '18

Module: kamailio Branch: master Commit: 829941d0079cb7f46a20ec975252790fd17019ba URL: https://github.com/kamailio/kamailio/commit/829941d0079cb7f46a20ec975252790… Author: AnthonyA <ascanio.alba7(a)gmail.com> Committer: AnthonyA <ascanio.alba7(a)gmail.com> Date: 2018-03-03T01:02:48+08:00 app_python3: don't hide the real exception on load failure - don't call PyErr_PrintEx() as this clears the error indicator --- Modified: src/modules/app_python3/app_python_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/829941d0079cb7f46a20ec975252790… Patch: https://github.com/kamailio/kamailio/commit/829941d0079cb7f46a20ec975252790… --- diff --git a/src/modules/app_python3/app_python_mod.c b/src/modules/app_python3/app_python_mod.c index e851b105d7..06d7a9d6f2 100644 --- a/src/modules/app_python3/app_python_mod.c +++ b/src/modules/app_python3/app_python_mod.c @@ -300,7 +300,6 @@ int apy_reload_script(void) PY_GIL_ENSURE PyObject *pModule = PyImport_ReloadModule(_sr_apy_module); if (!pModule) { - PyErr_PrintEx(0); if (!PyErr_Occurred()) PyErr_Format(PyExc_ImportError, "Reload module '%s'", bname); python_handle_exception("mod_init"); @@ -408,7 +407,6 @@ int apy_load_script(void) pModule = PyImport_ImportModule(bname); if (pModule == NULL) { - PyErr_PrintEx(0); if (!PyErr_Occurred()) PyErr_Format(PyExc_ImportError, "No module named '%s'", bname); python_handle_exception("mod_init");

1 0

git:5.1:4c840b7e: kamctl: fixed the name of rpc command for dialplan reload
by Daniel-Constantin Mierla 02 Mar '18

02 Mar '18

Module: kamailio Branch: 5.1 Commit: 4c840b7e9144e0540e97be5c9d3444b38a901a27 URL: https://github.com/kamailio/kamailio/commit/4c840b7e9144e0540e97be5c9d3444b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-02T16:19:12+01:00 kamctl: fixed the name of rpc command for dialplan reload (cherry picked from commit 9b7bb4ea6c100f5f33d2dddc9061febf33c47f5e) --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/4c840b7e9144e0540e97be5c9d3444b… Patch: https://github.com/kamailio/kamailio/commit/4c840b7e9144e0540e97be5c9d3444b… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index f82f6f540a..05505a7648 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1902,7 +1902,7 @@ dialplan() { ;; reload) - ctl_cmd_run dp_reload dp.reload + ctl_cmd_run dp_reload dialplan.reload ;; *)

1 0

git:master:9b7bb4ea: kamctl: fixed the name of rpc command for dialplan reload
by Daniel-Constantin Mierla 02 Mar '18

02 Mar '18

Module: kamailio Branch: master Commit: 9b7bb4ea6c100f5f33d2dddc9061febf33c47f5e URL: https://github.com/kamailio/kamailio/commit/9b7bb4ea6c100f5f33d2dddc9061feb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-02T16:15:40+01:00 kamctl: fixed the name of rpc command for dialplan reload --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/9b7bb4ea6c100f5f33d2dddc9061feb… Patch: https://github.com/kamailio/kamailio/commit/9b7bb4ea6c100f5f33d2dddc9061feb… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index de667187d6..e57f2a7695 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1902,7 +1902,7 @@ dialplan() { ;; reload) - ctl_cmd_run dp_reload dp.reload + ctl_cmd_run dp_reload dialplan.reload ;; *)

1 0

[kamailio/kamailio] pkg/kamailio/obs: Fixed kamailio tmpfiles creation durring … (#1470)
by sergey-safarov 02 Mar '18

02 Mar '18

…rpm installation You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1470 -- Commit Summary -- * pkg/kamailio/obs: Fixed kamailio tmpfiles creation durring rpm installation -- File Changes -- M pkg/kamailio/obs/kamailio.spec (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1470.patch https://github.com/kamailio/kamailio/pull/1470.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/1470

2 2

git:5.1:9b3aa0c7: pkg/kamailio/obs: Fixed kamailio tmpfiles creation durring rpm installation
by Daniel-Constantin Mierla 02 Mar '18

02 Mar '18

Module: kamailio Branch: 5.1 Commit: 9b3aa0c75bb2b4a643713c428d1a8a3d2d1c9e5c URL: https://github.com/kamailio/kamailio/commit/9b3aa0c75bb2b4a643713c428d1a8a3… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-02T16:02:47+01:00 pkg/kamailio/obs: Fixed kamailio tmpfiles creation durring rpm installation --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/9b3aa0c75bb2b4a643713c428d1a8a3… Patch: https://github.com/kamailio/kamailio/commit/9b3aa0c75bb2b4a643713c428d1a8a3… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 23de6c2bc4..3f0ba2a401 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1118,7 +1118,7 @@ rm -rf %{buildroot} %if "%{?_unitdir}" == "" /sbin/chkconfig --add kamailio %else -%tmpfiles_create kamailio +%tmpfiles_create kamailio.conf /usr/bin/systemctl -q enable kamailio.service %endif

1 0

SIP header when 911 called
by Abdul Basit 02 Mar '18

02 Mar '18

Hi Team, Does kamailio has compatibility with E911, i.e. through location in SIP header when 911 called? Is there any reference document? -- regards, abdul basit

1 0

[kamailio/kamailio] Add /var/run management to systemd script (#1464)
by udf2457 02 Mar '18

02 Mar '18

Hi, Would be nice if you could add `/var/run` management to the systemd script provided with the repo install. You know, something along the lines of: ``` ExecStartPre=-/usr/bin/mkdir /var/run/kamailio ExecStartPre=/usr/bin/chown -R kamailio:daemon /var/run/kamailio/ ``` -- 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/issues/1464

5 12

git:master:8926698e: modules: readme files regenerated - json ... [skip ci]
by Kamailio Dev 02 Mar '18

02 Mar '18

Module: kamailio Branch: master Commit: 8926698e92675d712db318c335f30d4f43f1a53d URL: https://github.com/kamailio/kamailio/commit/8926698e92675d712db318c335f30d4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-03-02T15:31:30+01:00 modules: readme files regenerated - json ... [skip ci] --- Modified: src/modules/json/README --- Diff: https://github.com/kamailio/kamailio/commit/8926698e92675d712db318c335f30d4… Patch: https://github.com/kamailio/kamailio/commit/8926698e92675d712db318c335f30d4… --- diff --git a/src/modules/json/README b/src/modules/json/README index 1f17cb328b..1bc0c1112c 100644 --- a/src/modules/json/README +++ b/src/modules/json/README @@ -26,13 +26,15 @@ Matthew Williams 3. Functions 3.1. json_get_field(json_string, field_name, destination) + 3.2. json_get_string(json_string, field_name, destination) 4. Transformations List of Examples 1.1. json_get_field usage - 1.2. json.parse usage + 1.2. json_get_string usage + 1.3. json.parse usage Chapter 1. Admin Guide @@ -47,6 +49,7 @@ Chapter 1. Admin Guide 3. Functions 3.1. json_get_field(json_string, field_name, destination) + 3.2. json_get_string(json_string, field_name, destination) 4. Transformations @@ -76,6 +79,7 @@ Chapter 1. Admin Guide 3. Functions 3.1. json_get_field(json_string, field_name, destination) + 3.2. json_get_string(json_string, field_name, destination) 3.1. json_get_field(json_string, field_name, destination) @@ -94,12 +98,23 @@ json_get_field("{'foo':'bar'}", "foo", "$var(foo)"); xlog("foo is $var(foo)"); ... +3.2. json_get_string(json_string, field_name, destination) + + Copy field 'field_name' from json object 'json_string' and store it in + pvar 'destination'. + + Example 1.2. json_get_string usage +... +json_get_string("{'foo':'bar'}", "foo", "$var(foo)"); +xlog("foo is $var(foo)"); +... + 4. Transformations You can use the transformation to extract values from the json structured pseudo-variables * json - Example 1.2. json.parse usage + Example 1.3. json.parse usage ... # extract value of "Custom-Data" from $rb pseudo-variable and set it to $var(Custom-Data)

1 0

git:master:bff50c44: json: add new function json_get_string() to return string value without quotes
by Daniel-Constantin Mierla 02 Mar '18

02 Mar '18

Module: kamailio Branch: master Commit: bff50c44e32c48b5449e405f67ca02f7d8055ba0 URL: https://github.com/kamailio/kamailio/commit/bff50c44e32c48b5449e405f67ca02f… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-02T15:17:03+01:00 json: add new function json_get_string() to return string value without quotes --- Modified: src/modules/json/doc/json_admin.xml Modified: src/modules/json/json_funcs.c Modified: src/modules/json/json_funcs.h Modified: src/modules/json/json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bff50c44e32c48b5449e405f67ca02f… Patch: https://github.com/kamailio/kamailio/commit/bff50c44e32c48b5449e405f67ca02f… --- diff --git a/src/modules/json/doc/json_admin.xml b/src/modules/json/doc/json_admin.xml index d510090285..72c7cb1344 100644 --- a/src/modules/json/doc/json_admin.xml +++ b/src/modules/json/doc/json_admin.xml @@ -75,6 +75,25 @@ ... json_get_field("{'foo':'bar'}", "foo", "$var(foo)"); xlog("foo is $var(foo)"); +... + </programlisting> + </example> + </section> + <section id="json.f.json_get_string"> + <title> + <function moreinfo="none">json_get_string(json_string, field_name, destination)</function> + </title> + <para> + Copy field 'field_name' from json object 'json_string' and store it in pvar 'destination'. + </para> + <para> + </para> + <example> + <title><function>json_get_string</function> usage</title> + <programlisting format="linespecific"> +... +json_get_string("{'foo':'bar'}", "foo", "$var(foo)"); +xlog("foo is $var(foo)"); ... </programlisting> </example> diff --git a/src/modules/json/json_funcs.c b/src/modules/json/json_funcs.c index ae036ac1f1..360bfc172c 100644 --- a/src/modules/json/json_funcs.c +++ b/src/modules/json/json_funcs.c @@ -30,7 +30,7 @@ #include "json_funcs.h" -int json_get_field(struct sip_msg* msg, char* json, char* field, char* dst) +int _json_get_field(struct sip_msg *msg, char *json, char *field, char *dst, int field_type) { str json_s; str field_s; @@ -53,7 +53,6 @@ int json_get_field(struct sip_msg* msg, char* json, char* field, char* dst) dst_pv = (pv_spec_t *)dst; - j = json_tokener_parse(json_s.s); if (j==NULL) { @@ -63,7 +62,11 @@ int json_get_field(struct sip_msg* msg, char* json, char* field, char* dst) json_object_object_get_ex(j, field_s.s, &oj); if(oj!=NULL) { - value = (char*)json_object_to_json_string(oj); + if (field_type == JSON_FIELD_STRING) { + value = (char*)json_object_get_string(oj); + } else { + value = (char*)json_object_to_json_string(oj); + } dst_val.rs.s = value; dst_val.rs.len = strlen(value); dst_val.flags = PV_VAL_STR; @@ -77,6 +80,17 @@ int json_get_field(struct sip_msg* msg, char* json, char* field, char* dst) return ret; } +int json_get_field(struct sip_msg* msg, char* json, char* field, char* dst) +{ + return _json_get_field(msg, json, field, dst, JSON_FIELD_DEFAULT); +} + + +int json_get_string(struct sip_msg* msg, char* json, char* field, char* dst) +{ + return _json_get_field(msg, json, field, dst, JSON_FIELD_STRING); +} + #define json_foreach_key(obj, key) \ char *key; \ struct lh_entry *entry##key; \ diff --git a/src/modules/json/json_funcs.h b/src/modules/json/json_funcs.h index 747232efac..60b67e037b 100644 --- a/src/modules/json/json_funcs.h +++ b/src/modules/json/json_funcs.h @@ -27,7 +27,14 @@ #include "../../core/parser/msg_parser.h" #include <json.h> +enum _json_get_field_type +{ + JSON_FIELD_DEFAULT = 0, + JSON_FIELD_STRING +}; + int json_get_field(struct sip_msg* msg, char* json, char* field, char* dst); +int json_get_string(struct sip_msg* msg, char* json, char* field, char* dst); #define json_extract_field(json_name, field) \ do { \ diff --git a/src/modules/json/json_mod.c b/src/modules/json/json_mod.c index f5de53d692..91452b3a55 100644 --- a/src/modules/json/json_mod.c +++ b/src/modules/json/json_mod.c @@ -45,6 +45,8 @@ static tr_export_t mod_trans[] = { static cmd_export_t cmds[] = { {"json_get_field", (cmd_function)json_get_field, 3, fixup_get_field, fixup_get_field_free, ANY_ROUTE}, + {"json_get_string", (cmd_function)json_get_string, 3, fixup_get_field, + fixup_get_field_free, ANY_ROUTE}, {"bind_json", (cmd_function)bind_json, 0, 0, 0, ANY_ROUTE}, {0, 0, 0, 0, 0, 0}};

1 0

[kamailio/kamailio] json: add new function json_get_string() to return string value witho… (#1466)
by Emmanuel Schmidbauer 02 Mar '18

02 Mar '18

adds new function to resolve #1452 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1466 -- Commit Summary -- * json: add new function json_get_string() to return string value without quotes -- File Changes -- M src/modules/json/doc/json_admin.xml (19) M src/modules/json/json_funcs.c (20) M src/modules/json/json_funcs.h (7) M src/modules/json/json_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1466.patch https://github.com/kamailio/kamailio/pull/1466.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/1466

2 1

[kamailio/kamailio] pkg/kamailio/obs: Fixed kamailio tmpfiles creation … (#1469)
by sergey-safarov 02 Mar '18

02 Mar '18

…durring rpm installation You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1469 -- Commit Summary -- * pkg/kamailio/obs: Fixed kamailio tmpfiles creation durring rpm installation -- File Changes -- M pkg/kamailio/obs/kamailio.spec (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1469.patch https://github.com/kamailio/kamailio/pull/1469.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/1469

2 1

git:master:630a697c: pkg/kamailio/obs: Fixed kamailio tmpfiles creation durring rpm installation
by Daniel-Constantin Mierla 02 Mar '18

02 Mar '18

Module: kamailio Branch: master Commit: 630a697cd928d01f92f4de1b232567c52592df04 URL: https://github.com/kamailio/kamailio/commit/630a697cd928d01f92f4de1b232567c… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-02T15:16:43+01:00 pkg/kamailio/obs: Fixed kamailio tmpfiles creation durring rpm installation --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/630a697cd928d01f92f4de1b232567c… Patch: https://github.com/kamailio/kamailio/commit/630a697cd928d01f92f4de1b232567c… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index ba802c83ad..3dabb21985 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1118,7 +1118,7 @@ rm -rf %{buildroot} %if "%{?_unitdir}" == "" /sbin/chkconfig --add kamailio %else -%tmpfiles_create kamailio +%tmpfiles_create kamailio.conf /usr/bin/systemctl -q enable kamailio.service %endif

1 0

[kamailio/kamailio] 5.1.2: rtpengine module hijacks DTLS key (#1468)
by aalba6675 02 Mar '18

02 Mar '18

### Description rtpengine module is hijacking the DTLS key rtpengine_manage("DTLS=off") DTLS=off is a valid command to rtpengine, but the module uses that flag to set transport as UDP/TLS/RTP/SAVP Unfortunately even though the transport can be fixed by RTP/SAVP, the lines outputted by rtpengine a=setup:actpass a=fingerprint:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx confuse some UACs that were expecting only SDES. FreeSWITCH is affected. ### Troubleshooting #### Reproduction rtpengine_manage("DTLS=off"). tcpdump the traffic between kamailio and rtpengine. Obseve that there is no DTLS=off key. #### Debugging Data #### Log Messages #### SIP Traffic ### Possible Solutions Don't look for DTLS key, let that be passthrough to kamailio ### Additional Information 5.1.2 * **Operating System**: Linux CentOS 7.4 -- 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/issues/1468

4 8

git:5.1:db971272: rtpengine: allow dual usage of DTLS flag and DTLS= switch
by Richard Fuchs 02 Mar '18

02 Mar '18

Module: kamailio Branch: 5.1 Commit: db97127276fc116ef55874cc4b0171936ed50ff8 URL: https://github.com/kamailio/kamailio/commit/db97127276fc116ef55874cc4b01719… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2018-03-02T08:41:44-05:00 rtpengine: allow dual usage of DTLS flag and DTLS= switch fixes regression from ff209e978 fixes #1468 (cherry picked from commit 0d89dc5e3c4c06084af8aae03e9b705673289703) --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/db97127276fc116ef55874cc4b01719… Patch: https://github.com/kamailio/kamailio/commit/db97127276fc116ef55874cc4b01719… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 3d4d17718a..f2ca1a9f2e 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -1926,29 +1926,27 @@ static int parse_flags(struct ng_flags_parse *ng_flags, struct sip_msg *msg, enu /* check for specially handled items */ switch (key.len) { case 3: - if (str_eq(&key, "RTP")) { + if (str_eq(&key, "RTP") && !val.s) { ng_flags->transport |= 0x100; ng_flags->transport &= ~0x001; } - else if (str_eq(&key, "AVP")) { + else if (str_eq(&key, "AVP") && !val.s) { ng_flags->transport |= 0x100; ng_flags->transport &= ~0x002; } else if (str_eq(&key, "TOS") && val.s) bencode_dictionary_add_integer(ng_flags->dict, "TOS", atoi(val.s)); - else if (str_eq(&key, "delete-delay") && val.s) - bencode_dictionary_add_integer(ng_flags->dict, "delete delay", atoi(val.s)); else goto generic; goto next; break; case 4: - if (str_eq(&key, "SRTP")) + if (str_eq(&key, "SRTP") && !val.s) ng_flags->transport |= 0x101; - else if (str_eq(&key, "AVPF")) + else if (str_eq(&key, "AVPF") && !val.s) ng_flags->transport |= 0x102; - else if (str_eq(&key, "DTLS")) + else if (str_eq(&key, "DTLS") && !val.s) ng_flags->transport |= 0x104; else goto generic; @@ -1965,7 +1963,7 @@ static int parse_flags(struct ng_flags_parse *ng_flags, struct sip_msg *msg, enu break; case 7: - if (str_eq(&key, "RTP/AVP")) + if (str_eq(&key, "RTP/AVP") && !val.s) ng_flags->transport = 0x100; else if (str_eq(&key, "call-id")) { err = "missing value"; @@ -1981,9 +1979,9 @@ static int parse_flags(struct ng_flags_parse *ng_flags, struct sip_msg *msg, enu case 8: if (str_eq(&key, "internal") || str_eq(&key, "external")) bencode_list_add_str(ng_flags->direction, &key); - else if (str_eq(&key, "RTP/AVPF")) + else if (str_eq(&key, "RTP/AVPF") && !val.s) ng_flags->transport = 0x102; - else if (str_eq(&key, "RTP/SAVP")) + else if (str_eq(&key, "RTP/SAVP") && !val.s) ng_flags->transport = 0x101; else if (str_eq(&key, "from-tag")) { err = "missing value"; @@ -1997,7 +1995,7 @@ static int parse_flags(struct ng_flags_parse *ng_flags, struct sip_msg *msg, enu break; case 9: - if (str_eq(&key, "RTP/SAVPF")) + if (str_eq(&key, "RTP/SAVPF") && !val.s) ng_flags->transport = 0x103; else if (str_eq(&key, "direction")) bencode_list_add_str(ng_flags->direction, &val); @@ -2051,10 +2049,12 @@ static int parse_flags(struct ng_flags_parse *ng_flags, struct sip_msg *msg, enu *op = OP_ANSWER; goto next; } + else if (str_eq(&key, "delete-delay") && val.s) + bencode_dictionary_add_integer(ng_flags->dict, "delete delay", atoi(val.s)); break; case 16: - if (str_eq(&key, "UDP/TLS/RTP/SAVP")) + if (str_eq(&key, "UDP/TLS/RTP/SAVP") && !val.s) ng_flags->transport = 0x104; else goto generic; @@ -2062,7 +2062,7 @@ static int parse_flags(struct ng_flags_parse *ng_flags, struct sip_msg *msg, enu break; case 17: - if (str_eq(&key, "UDP/TLS/RTP/SAVPF")) + if (str_eq(&key, "UDP/TLS/RTP/SAVPF") && !val.s) ng_flags->transport = 0x106; else goto generic;

1 0

git:master:0d89dc5e: rtpengine: allow dual usage of DTLS flag and DTLS= switch
by Richard Fuchs 02 Mar '18

02 Mar '18

Module: kamailio Branch: master Commit: 0d89dc5e3c4c06084af8aae03e9b705673289703 URL: https://github.com/kamailio/kamailio/commit/0d89dc5e3c4c06084af8aae03e9b705… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2018-03-02T08:34:55-05:00 rtpengine: allow dual usage of DTLS flag and DTLS= switch fixes regression from ff209e978 fixes #1468 --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/0d89dc5e3c4c06084af8aae03e9b705… Patch: https://github.com/kamailio/kamailio/commit/0d89dc5e3c4c06084af8aae03e9b705… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 927558f437..df26234504 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -1943,29 +1943,27 @@ static int parse_flags(struct ng_flags_parse *ng_flags, struct sip_msg *msg, enu /* check for specially handled items */ switch (key.len) { case 3: - if (str_eq(&key, "RTP")) { + if (str_eq(&key, "RTP") && !val.s) { ng_flags->transport |= 0x100; ng_flags->transport &= ~0x001; } - else if (str_eq(&key, "AVP")) { + else if (str_eq(&key, "AVP") && !val.s) { ng_flags->transport |= 0x100; ng_flags->transport &= ~0x002; } else if (str_eq(&key, "TOS") && val.s) bencode_dictionary_add_integer(ng_flags->dict, "TOS", atoi(val.s)); - else if (str_eq(&key, "delete-delay") && val.s) - bencode_dictionary_add_integer(ng_flags->dict, "delete delay", atoi(val.s)); else goto generic; goto next; break; case 4: - if (str_eq(&key, "SRTP")) + if (str_eq(&key, "SRTP") && !val.s) ng_flags->transport |= 0x101; - else if (str_eq(&key, "AVPF")) + else if (str_eq(&key, "AVPF") && !val.s) ng_flags->transport |= 0x102; - else if (str_eq(&key, "DTLS")) + else if (str_eq(&key, "DTLS") && !val.s) ng_flags->transport |= 0x104; else goto generic; @@ -1982,7 +1980,7 @@ static int parse_flags(struct ng_flags_parse *ng_flags, struct sip_msg *msg, enu break; case 7: - if (str_eq(&key, "RTP/AVP")) + if (str_eq(&key, "RTP/AVP") && !val.s) ng_flags->transport = 0x100; else if (str_eq(&key, "call-id")) { err = "missing value"; @@ -1998,9 +1996,9 @@ static int parse_flags(struct ng_flags_parse *ng_flags, struct sip_msg *msg, enu case 8: if (str_eq(&key, "internal") || str_eq(&key, "external")) bencode_list_add_str(ng_flags->direction, &key); - else if (str_eq(&key, "RTP/AVPF")) + else if (str_eq(&key, "RTP/AVPF") && !val.s) ng_flags->transport = 0x102; - else if (str_eq(&key, "RTP/SAVP")) + else if (str_eq(&key, "RTP/SAVP") && !val.s) ng_flags->transport = 0x101; else if (str_eq(&key, "from-tag")) { err = "missing value"; @@ -2014,7 +2012,7 @@ static int parse_flags(struct ng_flags_parse *ng_flags, struct sip_msg *msg, enu break; case 9: - if (str_eq(&key, "RTP/SAVPF")) + if (str_eq(&key, "RTP/SAVPF") && !val.s) ng_flags->transport = 0x103; else if (str_eq(&key, "direction")) bencode_list_add_str(ng_flags->direction, &val); @@ -2068,10 +2066,12 @@ static int parse_flags(struct ng_flags_parse *ng_flags, struct sip_msg *msg, enu *op = OP_ANSWER; goto next; } + else if (str_eq(&key, "delete-delay") && val.s) + bencode_dictionary_add_integer(ng_flags->dict, "delete delay", atoi(val.s)); break; case 16: - if (str_eq(&key, "UDP/TLS/RTP/SAVP")) + if (str_eq(&key, "UDP/TLS/RTP/SAVP") && !val.s) ng_flags->transport = 0x104; else goto generic; @@ -2079,7 +2079,7 @@ static int parse_flags(struct ng_flags_parse *ng_flags, struct sip_msg *msg, enu break; case 17: - if (str_eq(&key, "UDP/TLS/RTP/SAVPF")) + if (str_eq(&key, "UDP/TLS/RTP/SAVPF") && !val.s) ng_flags->transport = 0x106; else goto generic;

1 0

git:master:af6c1f70: pkg/kamailio/deb: kamailio.service fix for /run in tmpfs
by Victor Seva 02 Mar '18

02 Mar '18

Module: kamailio Branch: master Commit: af6c1f709ad4343539a4e47c84ff94c2f237eb16 URL: https://github.com/kamailio/kamailio/commit/af6c1f709ad4343539a4e47c84ff94c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-03-02T13:29:15+01:00 pkg/kamailio/deb: kamailio.service fix for /run in tmpfs See #1464 --- Modified: pkg/kamailio/deb/buster/kamailio.service Modified: pkg/kamailio/deb/debian/kamailio.service Modified: pkg/kamailio/deb/jessie/kamailio.service Modified: pkg/kamailio/deb/sid/kamailio.service Modified: pkg/kamailio/deb/stretch/kamailio.service Modified: pkg/kamailio/deb/xenial/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/af6c1f709ad4343539a4e47c84ff94c… Patch: https://github.com/kamailio/kamailio/commit/af6c1f709ad4343539a4e47c84ff94c… --- diff --git a/pkg/kamailio/deb/buster/kamailio.service b/pkg/kamailio/deb/buster/kamailio.service index 06c3334bd7..e7a9e18484 100644 --- a/pkg/kamailio/deb/buster/kamailio.service +++ b/pkg/kamailio/deb/buster/kamailio.service @@ -16,6 +16,9 @@ PIDFile=/var/run/kamailio/kamailio.pid # ExecStart requires a full absolute path ExecStart=/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP Restart=on-abort +# /var/run/kamailio in tmpfs +RuntimeDirectory=kamailio +RuntimeDirectoryMode=0750 [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/deb/debian/kamailio.service b/pkg/kamailio/deb/debian/kamailio.service index 06c3334bd7..e7a9e18484 100644 --- a/pkg/kamailio/deb/debian/kamailio.service +++ b/pkg/kamailio/deb/debian/kamailio.service @@ -16,6 +16,9 @@ PIDFile=/var/run/kamailio/kamailio.pid # ExecStart requires a full absolute path ExecStart=/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP Restart=on-abort +# /var/run/kamailio in tmpfs +RuntimeDirectory=kamailio +RuntimeDirectoryMode=0750 [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/deb/jessie/kamailio.service b/pkg/kamailio/deb/jessie/kamailio.service index 06c3334bd7..e7a9e18484 100644 --- a/pkg/kamailio/deb/jessie/kamailio.service +++ b/pkg/kamailio/deb/jessie/kamailio.service @@ -16,6 +16,9 @@ PIDFile=/var/run/kamailio/kamailio.pid # ExecStart requires a full absolute path ExecStart=/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP Restart=on-abort +# /var/run/kamailio in tmpfs +RuntimeDirectory=kamailio +RuntimeDirectoryMode=0750 [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/deb/sid/kamailio.service b/pkg/kamailio/deb/sid/kamailio.service index 06c3334bd7..e7a9e18484 100644 --- a/pkg/kamailio/deb/sid/kamailio.service +++ b/pkg/kamailio/deb/sid/kamailio.service @@ -16,6 +16,9 @@ PIDFile=/var/run/kamailio/kamailio.pid # ExecStart requires a full absolute path ExecStart=/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP Restart=on-abort +# /var/run/kamailio in tmpfs +RuntimeDirectory=kamailio +RuntimeDirectoryMode=0750 [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/deb/stretch/kamailio.service b/pkg/kamailio/deb/stretch/kamailio.service index 06c3334bd7..e7a9e18484 100644 --- a/pkg/kamailio/deb/stretch/kamailio.service +++ b/pkg/kamailio/deb/stretch/kamailio.service @@ -16,6 +16,9 @@ PIDFile=/var/run/kamailio/kamailio.pid # ExecStart requires a full absolute path ExecStart=/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP Restart=on-abort +# /var/run/kamailio in tmpfs +RuntimeDirectory=kamailio +RuntimeDirectoryMode=0750 [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/deb/xenial/kamailio.service b/pkg/kamailio/deb/xenial/kamailio.service index 06c3334bd7..e7a9e18484 100644 --- a/pkg/kamailio/deb/xenial/kamailio.service +++ b/pkg/kamailio/deb/xenial/kamailio.service @@ -16,6 +16,9 @@ PIDFile=/var/run/kamailio/kamailio.pid # ExecStart requires a full absolute path ExecStart=/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP Restart=on-abort +# /var/run/kamailio in tmpfs +RuntimeDirectory=kamailio +RuntimeDirectoryMode=0750 [Install] WantedBy=multi-user.target

1 0

[kamailio/kamailio] rtpengine: added support for DTLS transports (#1460)
by jerzyptak 02 Mar '18

02 Mar '18

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #1458 #### Description  Added ability to explicitly request usage of DTLS transports UDP/TLS/RTP/SAVP and UDP/TLS/RTP/SAVPF via rtpengine API. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1460 -- Commit Summary -- * rtpengine: added support for DTLS transports -- File Changes -- M src/modules/rtpengine/doc/rtpengine_admin.xml (6) M src/modules/rtpengine/rtpengine.c (23) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1460.patch https://github.com/kamailio/kamailio/pull/1460.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/1460

4 8

[kamailio/kamailio] Problem with topos together with track_cseq_updates (#1038)
by lamSteven 01 Mar '18

01 Mar '18

### Description When using the dialog track_cseq_updates feature (to increase the cseq for calls that are authenticated using the uac uac_auth) together with topos, it seems like a reply is not handled by topos. #### Log Messages I have a 2219 line debug log demonstrating this, i can supply this on request. -- 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/issues/1038

4 15

git:master:41156083: README.md: change kamailio twitter handle to the new one
by Henning Westerholt 01 Mar '18

01 Mar '18

Module: kamailio Branch: master Commit: 4115608372a2a5c7c1c97067ecc8fbd2f07c1026 URL: https://github.com/kamailio/kamailio/commit/4115608372a2a5c7c1c97067ecc8fbd… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-01T21:40:05+01:00 README.md: change kamailio twitter handle to the new one --- Modified: README.md --- Diff: https://github.com/kamailio/kamailio/commit/4115608372a2a5c7c1c97067ecc8fbd… Patch: https://github.com/kamailio/kamailio/commit/4115608372a2a5c7c1c97067ecc8fbd… --- diff --git a/README.md b/README.md index 6cc093737d..8005030775 100644 --- a/README.md +++ b/README.md @@ -110,7 +110,7 @@ An open IRC discussion channel is managed by the community: News: * https://www.kamailio.org/w/category/news/ - * Twitter @kamailioproject + * Twitter @kamailio ## Travis-CI - Testing Build Environment

1 0

Kamailio v5.1.2 Released
by Daniel-Constantin Mierla 01 Mar '18

01 Mar '18

Hello, Kamailio SIP Server v5.1.2 stable release is out. This is a maintenance release of the latest stable branch, 5.1, that includes fixes since the release of v5.1.1. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.1.x. Deployments running previous v5.1.x versions are strongly recommended to be upgraded to v5.1.2. For more details about version 5.1.2 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2018/03/kamailio-v5-1-2-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - www.asipto.com Kamailio World Conference - May 14-16, 2018 - www.kamailioworld.com

1 0

git:5.1:bf92f37d: ChangeLog: content prepared for v5.1.2
by Daniel-Constantin Mierla 01 Mar '18

01 Mar '18

Module: kamailio Branch: 5.1 Commit: bf92f37d0b1bc02142c8e3a967510eb21fe31d65 URL: https://github.com/kamailio/kamailio/commit/bf92f37d0b1bc02142c8e3a967510eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-01T17:19:21+01:00 ChangeLog: content prepared for v5.1.2 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/bf92f37d0b1bc02142c8e3a967510eb… Patch: https://github.com/kamailio/kamailio/commit/bf92f37d0b1bc02142c8e3a967510eb… --- diff --git a/ChangeLog b/ChangeLog index 8e972a735d..70152dd6bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,16 @@ ===================== Changes Since Version 5.1.1 =========================== +commit fbea348d0b2a09a08a4a9de4e9ebf65f689d63c5 +Author: AnthonyA <ascanio.alba7(a)gmail.com> +Date: Thu Mar 1 21:28:21 2018 +0800 + + app_python: KEMI accept int-int-str for t_continue + + - t_continue() needs int-int-str arguments; enable in apy_kemi.c + + (cherry picked from commit 0ca711665e1299269ca2ca1e566af6e40749f22a) + commit e4b76b0eb7637e404611b28dad1f063f1433bc9e Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Mar 1 16:40:18 2018 +0100

1 0

git:5.1:fbea348d: app_python: KEMI accept int-int-str for t_continue
by Daniel-Constantin Mierla 01 Mar '18

01 Mar '18

Module: kamailio Branch: 5.1 Commit: fbea348d0b2a09a08a4a9de4e9ebf65f689d63c5 URL: https://github.com/kamailio/kamailio/commit/fbea348d0b2a09a08a4a9de4e9ebf65… Author: AnthonyA <ascanio.alba7(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-01T17:11:04+01:00 app_python: KEMI accept int-int-str for t_continue - t_continue() needs int-int-str arguments; enable in apy_kemi.c (cherry picked from commit 0ca711665e1299269ca2ca1e566af6e40749f22a) --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/fbea348d0b2a09a08a4a9de4e9ebf65… Patch: https://github.com/kamailio/kamailio/commit/fbea348d0b2a09a08a4a9de4e9ebf65… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index e221c1d9ac..79e55e3da3 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -288,6 +288,16 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) } LM_DBG("params[%d] for: %.*s are int-int-int: [%d] [%d] [%d]\n", i, fname.len, fname.s, vps[0].n, vps[1].n, vps[2].n); + } else if(ket->ptypes[0]==SR_KEMIP_INT && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_STR) { + if(!PyArg_ParseTuple(args, "iis:kemi-param-nns", &vps[0].n, + &vps[1].n, &vps[2].s.s)) { + LM_ERR("unable to retrieve int-int-str params %d\n", i); + return sr_kemi_apy_return_false(); + } + vps[2].s.len = strlen(vps[2].s.s); + LM_DBG("params[%d] for: %.*s are int-int-str: [%d] [%d] [%.*s]\n", i, + fname.len, fname.s, vps[0].n, vps[1].n, vps[2].s.len, vps[2].s.s); } else if(ket->ptypes[0]==SR_KEMIP_INT && ket->ptypes[1]==SR_KEMIP_STR && ket->ptypes[2]==SR_KEMIP_INT) { if(!PyArg_ParseTuple(args, "isi:kemi-param-nsn", &vps[0].n,

1 0

[kamailio/kamailio] app_python: kemi accept int-int-str for t_continue (#1463)
by aalba6675 01 Mar '18

01 Mar '18

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description app_python: kemi add int-int-str to accept list of wrapper arguments - used, for example, by the t_continue() wrapper You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1463 -- Commit Summary -- * app_python: KEMI accept int-int-str for t_continue -- File Changes -- M src/modules/app_python/apy_kemi.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1463.patch https://github.com/kamailio/kamailio/pull/1463.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/1463

2 1

git:master:0ca71166: app_python: KEMI accept int-int-str for t_continue
by Daniel-Constantin Mierla 01 Mar '18

01 Mar '18

Module: kamailio Branch: master Commit: 0ca711665e1299269ca2ca1e566af6e40749f22a URL: https://github.com/kamailio/kamailio/commit/0ca711665e1299269ca2ca1e566af6e… Author: AnthonyA <ascanio.alba7(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-01T16:59:45+01:00 app_python: KEMI accept int-int-str for t_continue - t_continue() needs int-int-str arguments; enable in apy_kemi.c --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/0ca711665e1299269ca2ca1e566af6e… Patch: https://github.com/kamailio/kamailio/commit/0ca711665e1299269ca2ca1e566af6e… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index 6dba098ab7..9a683250de 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -265,6 +265,16 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) } LM_DBG("params[%d] for: %.*s are int-int-int: [%d] [%d] [%d]\n", i, fname.len, fname.s, vps[0].n, vps[1].n, vps[2].n); + } else if(ket->ptypes[0]==SR_KEMIP_INT && ket->ptypes[1]==SR_KEMIP_INT + && ket->ptypes[2]==SR_KEMIP_STR) { + if(!PyArg_ParseTuple(args, "iis:kemi-param-nns", &vps[0].n, + &vps[1].n, &vps[2].s.s)) { + LM_ERR("unable to retrieve int-int-str params %d\n", i); + return sr_kemi_apy_return_false(); + } + vps[2].s.len = strlen(vps[2].s.s); + LM_DBG("params[%d] for: %.*s are int-int-str: [%d] [%d] [%.*s]\n", i, + fname.len, fname.s, vps[0].n, vps[1].n, vps[2].s.len, vps[2].s.s); } else if(ket->ptypes[0]==SR_KEMIP_INT && ket->ptypes[1]==SR_KEMIP_STR && ket->ptypes[2]==SR_KEMIP_INT) { if(!PyArg_ParseTuple(args, "isi:kemi-param-nsn", &vps[0].n,

1 0

git:5.1:9aa1028a: ChangeLog: content updated for v5.1.2
by Daniel-Constantin Mierla 01 Mar '18

01 Mar '18

Module: kamailio Branch: 5.1 Commit: 9aa1028a8d6da9ca9738ab814f9915de4b45bbd0 URL: https://github.com/kamailio/kamailio/commit/9aa1028a8d6da9ca9738ab814f9915d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-01T16:42:46+01:00 ChangeLog: content updated for v5.1.2 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/9aa1028a8d6da9ca9738ab814f9915d… Patch: https://github.com/kamailio/kamailio/commit/9aa1028a8d6da9ca9738ab814f9915d…

1 0

git:5.1:e4b76b0e: Makefile.defs: version set to 5.1.2
by Daniel-Constantin Mierla 01 Mar '18

01 Mar '18

Module: kamailio Branch: 5.1 Commit: e4b76b0eb7637e404611b28dad1f063f1433bc9e URL: https://github.com/kamailio/kamailio/commit/e4b76b0eb7637e404611b28dad1f063… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-01T16:40:18+01:00 Makefile.defs: version set to 5.1.2 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/e4b76b0eb7637e404611b28dad1f063… Patch: https://github.com/kamailio/kamailio/commit/e4b76b0eb7637e404611b28dad1f063… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 5bfc0bf792..b7346a71fe 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 1 -SUBLEVEL = 1 +SUBLEVEL = 2 EXTRAVERSION = # memory manager switcher

1 0

git:5.1:9ec0cc9d: pkg/rpms: updated version to 5.1.2 in spec files
by Daniel-Constantin Mierla 01 Mar '18

01 Mar '18

Module: kamailio Branch: 5.1 Commit: 9ec0cc9d4a4ca70ce2ef13d6830cb5e30f4112c5 URL: https://github.com/kamailio/kamailio/commit/9ec0cc9d4a4ca70ce2ef13d6830cb5e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-01T16:01:35+01:00 pkg/rpms: updated version to 5.1.2 in spec files --- Modified: pkg/kamailio/centos/6/kamailio.spec Modified: pkg/kamailio/centos/7/kamailio.spec Modified: pkg/kamailio/fedora/17/kamailio.spec Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/openbsd/Makefile Modified: pkg/kamailio/oracle/el6/kamailio.spec Modified: pkg/kamailio/oracle/el7/kamailio.spec Modified: pkg/kamailio/rpm/kamailio.spec-4.1 Modified: pkg/kamailio/rpm/kamailio.spec.CenOS Modified: pkg/kamailio/rpm/kamailio.spec.SuSE Modified: pkg/kamailio/solaris/pkginfo --- Diff: https://github.com/kamailio/kamailio/commit/9ec0cc9d4a4ca70ce2ef13d6830cb5e… Patch: https://github.com/kamailio/kamailio/commit/9ec0cc9d4a4ca70ce2ef13d6830cb5e… --- diff --git a/pkg/kamailio/centos/6/kamailio.spec b/pkg/kamailio/centos/6/kamailio.spec index d6df4c05a6..4a3538f927 100644 --- a/pkg/kamailio/centos/6/kamailio.spec +++ b/pkg/kamailio/centos/6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.1 +%define ver 5.1.2 %define rel 0%{dist} diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index 147908d046..c0e030af4c 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.1 +%define ver 5.1.2 %define rel dev6%{dist} %bcond_with dnssec diff --git a/pkg/kamailio/fedora/17/kamailio.spec b/pkg/kamailio/fedora/17/kamailio.spec index 224094e16b..c6a8ce986f 100644 --- a/pkg/kamailio/fedora/17/kamailio.spec +++ b/pkg/kamailio/fedora/17/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.1 +%define ver 5.1.2 %define rel 0%{dist} diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 68be69c6c8..23de6c2bc4 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.1 +%define ver 5.1.2 %define rel 0%{dist} %if 0%{?fedora} == 25 diff --git a/pkg/kamailio/openbsd/Makefile b/pkg/kamailio/openbsd/Makefile index 3c8053f984..3c53ad1ef9 100644 --- a/pkg/kamailio/openbsd/Makefile +++ b/pkg/kamailio/openbsd/Makefile @@ -12,7 +12,7 @@ COMMENT-carrierroute = kamailio carrierroute module COMMENT-snmpstats = kamailio snmpstats module COMMENT-perl = kamailio perl modules -VERSION = 5.1.1 +VERSION = 5.1.2 DISTNAME = kamailio-${VERSION} PKGNAME-main = kamailio-${VERSION} PKGNAME-mysql = kamailio-mysql-${VERSION} diff --git a/pkg/kamailio/oracle/el6/kamailio.spec b/pkg/kamailio/oracle/el6/kamailio.spec index 23f6de0c0c..1f89b9e128 100644 --- a/pkg/kamailio/oracle/el6/kamailio.spec +++ b/pkg/kamailio/oracle/el6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.1 +%define ver 5.1.2 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/oracle/el7/kamailio.spec b/pkg/kamailio/oracle/el7/kamailio.spec index a0da154b3c..2b05409df5 100644 --- a/pkg/kamailio/oracle/el7/kamailio.spec +++ b/pkg/kamailio/oracle/el7/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.1 +%define ver 5.1.2 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec-4.1 b/pkg/kamailio/rpm/kamailio.spec-4.1 index b6e3ef0282..6d9d1bc690 100644 --- a/pkg/kamailio/rpm/kamailio.spec-4.1 +++ b/pkg/kamailio/rpm/kamailio.spec-4.1 @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.1 +%define ver 5.1.2 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c avp_radius auth_radius group_radius uri_radius pa postgres osp tlsops unixodbc diff --git a/pkg/kamailio/rpm/kamailio.spec.CenOS b/pkg/kamailio/rpm/kamailio.spec.CenOS index dd5325ee76..a6d52e9513 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.1 +%define ver 5.1.2 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec.SuSE b/pkg/kamailio/rpm/kamailio.spec.SuSE index c679d99f22..bff991171c 100644 --- a/pkg/kamailio/rpm/kamailio.spec.SuSE +++ b/pkg/kamailio/rpm/kamailio.spec.SuSE @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.1 +%define ver 5.1.2 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c auth_radius misc_radius peering postgress pa unixodbc osp tlsops diff --git a/pkg/kamailio/solaris/pkginfo b/pkg/kamailio/solaris/pkginfo index 66f5c4cbc7..6b800c12c5 100644 --- a/pkg/kamailio/solaris/pkginfo +++ b/pkg/kamailio/solaris/pkginfo @@ -1,6 +1,6 @@ PKG=Kamailio ARCH=sparc -VERSION=5.1.1 +VERSION=5.1.2 CATEGORY=application EMAIL=miconda(a)gmail.com NAME=Kamailio is a very fast and flexible SIP (RFC3261) proxy server

1 0

git:5.1:49dee7f4: db_mongodb: use projection iterator to convert bson for result
by Daniel-Constantin Mierla 01 Mar '18

01 Mar '18

Module: kamailio Branch: 5.1 Commit: 49dee7f498e1001ce3e29c1691a7ec322392baca URL: https://github.com/kamailio/kamailio/commit/49dee7f498e1001ce3e29c1691a7ec3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-01T15:52:38+01:00 db_mongodb: use projection iterator to convert bson for result (cherry picked from commit 899ab355fb58e22eaa02336e9b5b1f2f53dba375) --- Modified: src/modules/db_mongodb/mongodb_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/49dee7f498e1001ce3e29c1691a7ec3… Patch: https://github.com/kamailio/kamailio/commit/49dee7f498e1001ce3e29c1691a7ec3… --- diff --git a/src/modules/db_mongodb/mongodb_dbase.c b/src/modules/db_mongodb/mongodb_dbase.c index aba482d352..b1c9ac2bb7 100644 --- a/src/modules/db_mongodb/mongodb_dbase.c +++ b/src/modules/db_mongodb/mongodb_dbase.c @@ -506,6 +506,7 @@ static int db_mongodb_convert_bson(const db1_con_t* _h, db1_res_t* _r, const char *colname; bson_type_t coltype; bson_iter_t riter; + bson_iter_t titer; bson_iter_t citer; bson_iter_t *piter; db_val_t* dval; @@ -520,14 +521,27 @@ static int db_mongodb_convert_bson(const db1_con_t* _h, db1_res_t* _r, } if(mgres->colsdoc==NULL) { cdoc = (bson_t*)_rdoc; + if (!bson_iter_init (&citer, cdoc)) { + LM_ERR("failed to initialize columns iterator\n"); + return -3; + } } else { cdoc = (bson_t*)mgres->colsdoc; + if (!bson_iter_init (&titer, cdoc)) { + LM_ERR("failed to initialize columns iterator\n"); + return -3; + } + if(!bson_iter_find(&titer, "projection") + || !BSON_ITER_HOLDS_DOCUMENT (&titer)) { + LM_ERR("failed to find projection field\n"); + return -3; + } + if(!bson_iter_recurse (&titer, &citer)) { + LM_ERR("failed to init projection iterator\n"); + return -3; + } } - if (!bson_iter_init (&citer, cdoc)) { - LM_ERR("failed to initialize columns iterator\n"); - return -3; - } if(mgres->colsdoc) { if (!bson_iter_init (&riter, _rdoc)) { LM_ERR("failed to initialize result iterator\n");

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev