sr-dev September 2019

sr-dev@lists.kamailio.org

24 participants
368 discussions

git:master:f99b8731: modules: readme files regenerated - uac ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: f99b8731a9e91315f75e584f34f15d3c83f086d5 URL: https://github.com/kamailio/kamailio/commit/f99b8731a9e91315f75e584f34f15d3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-02T18:46:48+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/f99b8731a9e91315f75e584f34f15d3… Patch: https://github.com/kamailio/kamailio/commit/f99b8731a9e91315f75e584f34f15d3…

5 years, 5 months

git:master:3c980e1a: uac: docs - updates about use of auth_ha1 for remote registrations

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3c980e1a820bd5981b8f68e393a8404131b49bec URL: https://github.com/kamailio/kamailio/commit/3c980e1a820bd5981b8f68e393a8404… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-02T16:43:59+02:00 uac: docs - updates about use of auth_ha1 for remote registrations - added docs for rpc uac.reg_add command --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3c980e1a820bd5981b8f68e393a8404… Patch: https://github.com/kamailio/kamailio/commit/3c980e1a820bd5981b8f68e393a8404… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 3ac4cc2a17..e6211d398b 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -1278,6 +1278,43 @@ event_route[uac:reply] { </example> </section> + <section id="uac.r.uac.reg_add"> + <para> + Add a new UAC remote registration record. If one with the same + unique id is found, it is deleted. + </para> + <para> + The parameters are: + <itemizedlist> + <listitem><para>l_uuid</para></listitem> + <listitem><para>l_username</para></listitem> + <listitem><para>l_domain</para></listitem> + <listitem><para>r_username</para></listitem> + <listitem><para>r_domain</para></listitem> + <listitem><para>realm</para></listitem> + <listitem><para>auth_username</para></listitem> + <listitem><para>auth_password</para></listitem> + <listitem><para>auth_ha1</para></listitem> + <listitem><para>auth_proxy</para></listitem> + <listitem><para>expires</para></listitem> + <listitem><para>flags</para></listitem> + <listitem><para>reg_delay</para></listitem> + <listitem><para>socket</para></listitem> + </itemizedlist> + </para> + <para> + Use a dot (.) if no value should be set for auth_password or auth_ha1. + </para> + + <example> + <title><function>uac.reg_add</function> usage</title> + <programlisting format="linespecific"> +... + kamcmd uac.reg_add ... +... + </programlisting> + </example> + </section> <section> @@ -1331,8 +1368,14 @@ event_route[uac:reply] { </itemizedlist> <itemizedlist> <listitem><para> - <emphasis>auth_password</emphasis> - authentication password, - e.g.,: xxxxxx + <emphasis>auth_password</emphasis> - authentication password in + clear text, e.g.,: xxxxxx + </para></listitem> + </itemizedlist> + <itemizedlist> + <listitem><para> + <emphasis>auth_ha1</emphasis> - hashed (HA1) authentication password, + it has priority over auth_password. </para></listitem> </itemizedlist> <itemizedlist>

5 years, 5 months

git:master:163f73fe: lib/srdb1: uac_reg schema - updated notes about auth_password and auth_ha1

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 163f73feb1f423270c3ecab7dec30b5d7cee0964 URL: https://github.com/kamailio/kamailio/commit/163f73feb1f423270c3ecab7dec30b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-02T16:43:09+02:00 lib/srdb1: uac_reg schema - updated notes about auth_password and auth_ha1 --- Modified: src/lib/srdb1/schema/uacreg.xml --- Diff: https://github.com/kamailio/kamailio/commit/163f73feb1f423270c3ecab7dec30b5… Patch: https://github.com/kamailio/kamailio/commit/163f73feb1f423270c3ecab7dec30b5… --- diff --git a/src/lib/srdb1/schema/uacreg.xml b/src/lib/srdb1/schema/uacreg.xml index 2ce0f1262b..bf967f2655 100644 --- a/src/lib/srdb1/schema/uacreg.xml +++ b/src/lib/srdb1/schema/uacreg.xml @@ -94,7 +94,7 @@ <type>string</type> <size>&password_len;</size> <default/> - <description>Authentication password</description> + <description>Authentication password in clear text</description> </column> <column id="auth_ha1"> @@ -102,7 +102,8 @@ <type>string</type> <size>&ha1_len;</size> <default/> - <description>Hashed (HA1) authentication password - currently unused</description> + <description>Hashed (HA1) authentication password - it has priority over + auth_password field.</description> </column> <column id="auth_proxy">

5 years, 5 months

git:master:9b501c49: uac: use auth_ha1 field if set for remote registrations

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9b501c49450646b47b740c7cc82a6a755f6f10f5 URL: https://github.com/kamailio/kamailio/commit/9b501c49450646b47b740c7cc82a6a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-02T16:23:31+02:00 uac: use auth_ha1 field if set for remote registrations - has priority over auth_password field --- Modified: src/modules/uac/auth.h Modified: src/modules/uac/auth_alg.c Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/9b501c49450646b47b740c7cc82a6a7… Patch: https://github.com/kamailio/kamailio/commit/9b501c49450646b47b740c7cc82a6a7…

5 years, 5 months

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

by Kamailio Dev

Module: kamailio Branch: master Commit: b9cfe696db5f7bbcbe6fc8c3ae63b4f9d640e311 URL: https://github.com/kamailio/kamailio/commit/b9cfe696db5f7bbcbe6fc8c3ae63b4f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-09-02T13:47:22+02:00 modules: readme files regenerated - phonenum ... [skip ci] --- Modified: src/modules/phonenum/README --- Diff: https://github.com/kamailio/kamailio/commit/b9cfe696db5f7bbcbe6fc8c3ae63b4f… Patch: https://github.com/kamailio/kamailio/commit/b9cfe696db5f7bbcbe6fc8c3ae63b4f… --- diff --git a/src/modules/phonenum/README b/src/modules/phonenum/README index 842e2cfcc7..ebe872869b 100644 --- a/src/modules/phonenum/README +++ b/src/modules/phonenum/README @@ -26,6 +26,7 @@ Daniel-Constantin Mierla 3. Parameters 3.1. smode (int) + 3.2. resid (str) 4. Functions @@ -37,8 +38,9 @@ Daniel-Constantin Mierla List of Examples 1.1. Set smode parameter - 1.2. phonenum_match usage - 1.3. phonenum_match_cn usage + 1.2. Set resid parameter + 1.3. phonenum_match usage + 1.4. phonenum_match_cn usage Chapter 1. Admin Guide @@ -53,6 +55,7 @@ Chapter 1. Admin Guide 3. Parameters 3.1. smode (int) + 3.2. resid (str) 4. Functions @@ -95,10 +98,11 @@ Chapter 1. Admin Guide 3. Parameters 3.1. smode (int) + 3.2. resid (str) 3.1. smode (int) - Phone number search mode. + Phone number search mode (not in use yet). Default value is “0”. @@ -107,6 +111,23 @@ Chapter 1. Admin Guide modparam("phonenum", "smode", 0) ... +3.2. resid (str) + + Preregister result container id during initialization, enabling the use + of the module in KEMI scripts. In native Kamailio.cfg file, + registration is done when parsing config and finding variables. + + Default value is “” (empty). + + Example 1.2. Set resid parameter +... +modparam("phonenum", "resid", "src") +... +if(phonenum_match("1-484-555-8888", "src")) { + ... +} +... + 4. Functions 4.1. phonenum_match(num, pvc) @@ -115,14 +136,14 @@ modparam("phonenum", "smode", 0) 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 - via: $phn(pvc=>key). + pvc result container. The function has to be called before accessing a + key via: $phn(pvc=>key). The parameters can be static strings or strings with variables. It can be used from ANY_ROUTE. - Example 1.2. phonenum_match usage + Example 1.3. phonenum_match usage ... if(phonenum_match("1-484-555-8888", "src")) { if($phn(src=>valid)==1) { @@ -144,7 +165,7 @@ if(phonenum_match("1-484-555-8888", "src")) { It can be used from ANY_ROUTE. - Example 1.3. phonenum_match_cn usage + Example 1.4. phonenum_match_cn usage ... if(phonenum_match_cn("1-484-555-8888", "US", "src")) { if($phn(src=>valid)==1) {

5 years, 5 months

git:master:d2bac426: phonenum: docs for resid parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d2bac426192c074368bf78014e0d1d0ca97f3274 URL: https://github.com/kamailio/kamailio/commit/d2bac426192c074368bf78014e0d1d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-02T13:45:16+02:00 phonenum: docs for resid parameter --- Modified: src/modules/phonenum/doc/phonenum_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d2bac426192c074368bf78014e0d1d0… Patch: https://github.com/kamailio/kamailio/commit/d2bac426192c074368bf78014e0d1d0… --- diff --git a/src/modules/phonenum/doc/phonenum_admin.xml b/src/modules/phonenum/doc/phonenum_admin.xml index 402edfdb60..d30c2026ee 100644 --- a/src/modules/phonenum/doc/phonenum_admin.xml +++ b/src/modules/phonenum/doc/phonenum_admin.xml @@ -71,7 +71,7 @@ <section id="phonenum.p.smode"> <title><varname>smode</varname> (int)</title> <para> - Phone number search mode. + Phone number search mode (not in use yet). </para> <para> <emphasis> @@ -87,7 +87,31 @@ modparam("phonenum", "smode", 0) </programlisting> </example> </section> - + <section id="phonenum.p.resid"> + <title><varname>resid</varname> (str)</title> + <para> + Preregister result container id during initialization, enabling the use + of the module in KEMI scripts. In native &kamailio;.cfg file, registration + is done when parsing config and finding variables. + </para> + <para> + <emphasis> + Default value is <quote></quote> (empty). + </emphasis> + </para> + <example> + <title>Set <varname>resid</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("phonenum", "resid", "src") +... +if(phonenum_match("1-484-555-8888", "src")) { + ... +} +... +</programlisting> + </example> + </section> </section> <section> @@ -98,7 +122,7 @@ modparam("phonenum", "smode", 0) </title> <para> Match num against the libphonenumber and set the attributes inside - the pvc container. The function has to be called before accessing + the pvc result container. The function has to be called before accessing a key via: $phn(pvc=>key). </para> <para>

5 years, 5 months

git:master:67412b4b: phonenum: new param resid to register result container ids

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 67412b4b2b377cca179de2ebe109bd56fb8a63b9 URL: https://github.com/kamailio/kamailio/commit/67412b4b2b377cca179de2ebe109bd5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-09-02T13:41:03+02:00 phonenum: new param resid to register result container ids - allow use in KEMI scripting by pre-registering container result id via modparam --- Modified: src/modules/phonenum/phonenum_mod.c Modified: src/modules/phonenum/phonenum_pv.c Modified: src/modules/phonenum/phonenum_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/67412b4b2b377cca179de2ebe109bd5… Patch: https://github.com/kamailio/kamailio/commit/67412b4b2b377cca179de2ebe109bd5… --- diff --git a/src/modules/phonenum/phonenum_mod.c b/src/modules/phonenum/phonenum_mod.c index eaaa43c1aa..6c9e0b1d1b 100644 --- a/src/modules/phonenum/phonenum_mod.c +++ b/src/modules/phonenum/phonenum_mod.c @@ -47,6 +47,8 @@ static int w_phonenum_match_cn(struct sip_msg *msg, char *str1, char *str2, char *str3); static int phonenum_match(sip_msg_t *msg, str *tomatch, str *pvclass); +static int phonenum_resid_param(modparam_t type, void* val); + /* clang-format off */ static pv_export_t mod_pvs[] = { { {"phn", sizeof("phn")-1}, PVT_OTHER, pv_get_phonenum, 0, @@ -64,6 +66,7 @@ static cmd_export_t cmds[]={ static param_export_t params[]={ {"smode", PARAM_INT, &phonenum_smode}, + {"resid", PARAM_STR|PARAM_USE_FUNC, &phonenum_resid_param}, {0, 0, 0} }; @@ -102,6 +105,22 @@ static void mod_destroy(void) phonenum_destroy_pv(); } +/** + * + */ +static int phonenum_resid_param(modparam_t type, void* val) +{ + str rname; + + rname.s = (char*)val; + rname.len = strlen(rname.s); + if(sr_phonenum_add_resid(&rname) < 0) { + LM_ERR("failed to register result container with id: %.*s\n", + rname.len, rname.s); + return -1; + } + return 0; +} static int phonenum_match(sip_msg_t *msg, str *tomatch, str *pvclass) { diff --git a/src/modules/phonenum/phonenum_pv.c b/src/modules/phonenum/phonenum_pv.c index a34382239a..6115d9daad 100644 --- a/src/modules/phonenum/phonenum_pv.c +++ b/src/modules/phonenum/phonenum_pv.c @@ -111,6 +111,13 @@ sr_phonenum_item_t *sr_phonenum_add_item(str *name) return it; } +int sr_phonenum_add_resid(str *rname) +{ + if(sr_phonenum_add_item(rname)==NULL) { + return -1; + } + return 0; +} int pv_parse_phonenum_name(pv_spec_p sp, str *in) { diff --git a/src/modules/phonenum/phonenum_pv.h b/src/modules/phonenum/phonenum_pv.h index b56d6f47dd..938bbac297 100644 --- a/src/modules/phonenum/phonenum_pv.h +++ b/src/modules/phonenum/phonenum_pv.h @@ -34,6 +34,7 @@ int phonenum_init_pv(int smode); void phonenum_destroy_pv(void); void phonenum_pv_reset(str *pvclass); int phonenum_update_pv(str *tomatch, str *cncode, str *pvclass); +int sr_phonenum_add_resid(str *rname); #endif

5 years, 5 months

[kamailio/kamailio] to tags generation (#1164)

by Dmitri Savolainen

### Description Not shure is this relevant issue. according to rfc3261: > When a tag is generated by a UA for insertion into a request or > response, it MUST be globally unique and cryptographically random > with at least 32 bits of randomness. Kamailio has 16 instead and distribution is not good. I look at tags for 419485 sip flows (different callid) and table below (top keys ordered by count): tag suffix; count for different flows with this suffix ed54 6258 d118 5988 56ce 5923 a7a5 5220 de51 2150 82d8 1143 cf52 890 af92 740 7b5f 534 85f7 307 e553 163 7f7e 138 1d55 130 1afe 62 5a69 43 7caa 18 8474 18 9db2 18 11d3 18 f9ff 18 5420 17 dae6 17 908d 17 ede4 17 09ee 17 96be 17 25dc 17 af6d 16 2506 16 3da0 16 f161 16 1c29 16 #### SIP Traffic To: <sip:039*101@host:5071>;tag=555d2c3eafafcba8ac92b676e91bb6ed.58eb -- 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/1164

5 years, 5 months

git:master:e4ae7c7a: tm: improve from-tags to include more randomness and use the recommended size from RFC 3261 (GH #1164)

by Henning Westerholt

Module: kamailio Branch: master Commit: e4ae7c7a7c7e8696870535e3399c8b9ddf585a06 URL: https://github.com/kamailio/kamailio/commit/e4ae7c7a7c7e8696870535e3399c8b9… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-02T09:54:21+02:00 tm: improve from-tags to include more randomness and use the recommended size from RFC 3261 (GH #1164) - improve from-tag generation for uac request to include more randomness (request uri) - use the recommended size of 32 bit randomness from RFC 3261 - implementation could be further improved by using a cryptographic hash algorithm - related to GH #1164 --- Modified: src/modules/tm/dlg.c Modified: src/modules/tm/rpc_uac.c Modified: src/modules/tm/t_msgbuilder.c Modified: src/modules/tm/uac.c Modified: src/modules/tm/uac.h --- Diff: https://github.com/kamailio/kamailio/commit/e4ae7c7a7c7e8696870535e3399c8b9… Patch: https://github.com/kamailio/kamailio/commit/e4ae7c7a7c7e8696870535e3399c8b9…

5 years, 5 months

git:master:06e27d36: core: improve to-tags to include more randomness and use the recommended size from RFC 3261 (GH #1164)

by Henning Westerholt

Module: kamailio Branch: master Commit: 06e27d3608b7f75003d54dc43b3a067b511f8e7a URL: https://github.com/kamailio/kamailio/commit/06e27d3608b7f75003d54dc43b3a067… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-01T22:55:59+02:00 core: improve to-tags to include more randomness and use the recommended size from RFC 3261 (GH #1164) - improve to-tag generation to include more randomness (callid body if available) - use the recommended size of 32 bit randomness from RFC 3261 - implementation could be further improved by using a cryptographic hash algorithm - related to GH #1164 --- Modified: src/core/crc.h Modified: src/core/tags.h --- Diff: https://github.com/kamailio/kamailio/commit/06e27d3608b7f75003d54dc43b3a067… Patch: https://github.com/kamailio/kamailio/commit/06e27d3608b7f75003d54dc43b3a067… --- diff --git a/src/core/crc.h b/src/core/crc.h index a52348f168..24ba1d0e15 100644 --- a/src/core/crc.h +++ b/src/core/crc.h @@ -5,6 +5,7 @@ #include "str.h" #define CRC16_LEN 4 +#define CRC32_LEN 8 extern unsigned long int crc_32_tab[]; extern unsigned short int ccitt_tab[]; diff --git a/src/core/tags.h b/src/core/tags.h index ddfdaae411..fff879cfab 100644 --- a/src/core/tags.h +++ b/src/core/tags.h @@ -36,10 +36,10 @@ #include "str.h" #include "socket_info.h" -#define TOTAG_VALUE_LEN (MD5_LEN+CRC16_LEN+1) +#define TOTAG_VALUE_LEN (MD5_LEN+CRC32_LEN+1) /*! generate variable part of to-tag for a request; - * it will have length of CRC16_LEN, sufficiently + * it will have length of CRC32_LEN, sufficiently * long buffer must be passed to the function */ static inline void calc_crc_suffix( struct sip_msg *msg, char *tag_suffix) { @@ -50,9 +50,23 @@ static inline void calc_crc_suffix( struct sip_msg *msg, char *tag_suffix) if (msg->via1==0) return; /* no via, bad message */ suffix_source[0]=msg->via1->host; suffix_source[1]=msg->via1->port_str; - if (msg->via1->branch) - suffix_source[ss_nr++]=msg->via1->branch->value; + if (msg->via1->branch) { + suffix_source[2]=msg->via1->branch->value; + } else { + suffix_source[2].s = NULL; + suffix_source[2].len = 0; + } crcitt_string_array( tag_suffix, suffix_source, ss_nr ); + + suffix_source[0]=msg->via1->port_str; + suffix_source[1]=msg->via1->host; + if (msg->callid) { + suffix_source[2]=msg->callid->body; + } else { + suffix_source[2].s = NULL; + suffix_source[2].len = 0; + } + crcitt_string_array( tag_suffix+4, suffix_source, ss_nr ); } static void inline init_tags( char *tag, char **suffix,

5 years, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2019