sr-dev June 2021

sr-dev@lists.kamailio.org

15 participants
314 discussions

git:master:e6f4e929: dispatcher: print eol in some log messages
by Daniel-Constantin Mierla 17 Jun '21

17 Jun '21

Module: kamailio Branch: master Commit: e6f4e929efb61a1a51aa1b4b5587999acc8dc55d URL: https://github.com/kamailio/kamailio/commit/e6f4e929efb61a1a51aa1b4b5587999… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-17T16:40:39+02:00 dispatcher: print eol in some log messages --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/e6f4e929efb61a1a51aa1b4b5587999… Patch: https://github.com/kamailio/kamailio/commit/e6f4e929efb61a1a51aa1b4b5587999… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 78ece3fffe..674678417d 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -325,7 +325,7 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) dest->attrs.weight = tmp_ival; } else { dest->attrs.weight = 0; - LM_ERR("weight %d not in 1-100 range - ignoring destination", + LM_ERR("weight %d not in 1-100 range - ignoring destination\n", tmp_ival); } } else if(pit->name.len == 7 @@ -350,7 +350,7 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) dest->attrs.rweight = tmp_ival; } else { dest->attrs.rweight = 0; - LM_WARN("rweight %d not in 1-100 range - ignoring", tmp_ival); + LM_WARN("rweight %d not in 1-100 range - ignoring\n", tmp_ival); } } else if(pit->name.len == 9 && strncasecmp(pit->name.s, "ping_from", 9) == 0) {

1 0

git:master:cf828521: secsipid: docs for secsipid_build_identity(...) function
by Daniel-Constantin Mierla 17 Jun '21

17 Jun '21

Module: kamailio Branch: master Commit: cf82852199f1fee7ee01e4a25d5e79a2ab1bbf8d URL: https://github.com/kamailio/kamailio/commit/cf82852199f1fee7ee01e4a25d5e79a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-17T16:35:55+02:00 secsipid: docs for secsipid_build_identity(...) function --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cf82852199f1fee7ee01e4a25d5e79a… Patch: https://github.com/kamailio/kamailio/commit/cf82852199f1fee7ee01e4a25d5e79a… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 527db1aecf..bc1a8ac332 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -322,6 +322,42 @@ request_route { ... } ... +</programlisting> + </example> + </section> + <section id="secsipid.f.secsipid_build_identity"> + <title> + <function moreinfo="none">secsipid_build_identity(origTN, destTN, attest, origID, x5u, keyPath)</function> + </title> + <para> + Build Identity value using the key specified by "keyPath" to sign the JWT body. + If origID is empty, a UUID string is generated to fill the field. The origTN + represents the origination telephone number; destTN represents the destination + telephone number; x5u is the HTTP URL referencing to the public key that + should be used to verify the signature; attest represents the attestation + level (should be "A", "B" or "C"). On success, the Indentity value is + stored in variable $secsipid(val). It also sets $secsipid(ret) to + the return value of the libsecsipid functions. + </para> + <para> + The parameters can contain pseudo-variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>secsipid_build_identity</function> usage</title> + <programlisting format="linespecific"> +... +request_route { + ... + if(secsipid_build_identity("$fU", "$rU", "A", "", + "https://kamailio.org/stir/$rd/cert.pem", "/secsipid/$rd/key.pem")) { + xinfo("Identity value: $secsipid(val)\n"); + } + ... +} +... </programlisting> </example> </section>

1 0

git:master:6ebcd34b: secsipid: add function to build identity value and store in pv
by Daniel-Constantin Mierla 17 Jun '21

17 Jun '21

Module: kamailio Branch: master Commit: 6ebcd34b74452642c44b296525766791bb33a7b0 URL: https://github.com/kamailio/kamailio/commit/6ebcd34b74452642c44b29652576679… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-17T15:40:16+02:00 secsipid: add function to build identity value and store in pv - new function secsipid_build_identity(...) - if successful, identity value is available in $secsipid(val) --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6ebcd34b74452642c44b29652576679… Patch: https://github.com/kamailio/kamailio/commit/6ebcd34b74452642c44b29652576679…

1 0

git:master:abbe5187: pua_json: exported KSR.pua_json.publish() to kemi
by Daniel-Constantin Mierla 16 Jun '21

16 Jun '21

Module: kamailio Branch: master Commit: abbe518724d645b6f977ca526011285bc03c581c URL: https://github.com/kamailio/kamailio/commit/abbe518724d645b6f977ca526011285… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-16T12:29:33+02:00 pua_json: exported KSR.pua_json.publish() to kemi - corresponding to config pua_json_publish() - use fixup_spve_null() and fixup_free_spve_null() for pua_json_publish() config export --- Modified: src/modules/pua_json/pua_json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/abbe518724d645b6f977ca526011285… Patch: https://github.com/kamailio/kamailio/commit/abbe518724d645b6f977ca526011285… --- diff --git a/src/modules/pua_json/pua_json_mod.c b/src/modules/pua_json/pua_json_mod.c index 2c7e7f5513..2b51e5020e 100644 --- a/src/modules/pua_json/pua_json_mod.c +++ b/src/modules/pua_json/pua_json_mod.c @@ -27,31 +27,41 @@ #include "../json/api.h" #include "../presence/bind_presence.h" +#include "../../core/mod_fix.h" +#include "../../core/kemi.h" + #include "pua_json_mod.h" MODULE_VERSION +static int w_pua_json_publish(sip_msg_t *msg, char *p1pjson, char *p2); + +/* clang-format off */ static param_export_t params[] = { - {"pua_include_entity", INT_PARAM, &pua_include_entity}, - {0, 0, 0}}; + {"pua_include_entity", PARAM_INT, &pua_include_entity}, + {0, 0, 0} +}; static cmd_export_t cmds[] = { - {"pua_json_publish", (cmd_function)pua_json_publish, 1, 0, 0, - ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"pua_json_publish", (cmd_function)w_pua_json_publish, 1, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, + + {0, 0, 0, 0, 0, 0} +}; struct module_exports exports = { - "pua_json", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* RPC method exports */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - 0, /* per-child init function */ - 0 /* module destroy function */ + "pua_json", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */ static int mod_init(void) { @@ -66,3 +76,50 @@ static int mod_init(void) return 0; } + +/** + * + */ +static int ki_pua_json_publish(sip_msg_t* msg, str* pjson) +{ + return pua_json_publish(msg, pjson->s); +} + +/** + * + */ +static int w_pua_json_publish(sip_msg_t *msg, char *p1pjson, char *p2) +{ + str pjson = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t*)p1pjson, &pjson)<0) { + LM_ERR("failed to get p1 value\n"); + return -1; + } + + return pua_json_publish(msg, pjson.s); +} + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_pua_json_exports[] = { + { str_init("pua_json"), str_init("publish"), + SR_KEMIP_INT, ki_pua_json_publish, + { SR_KEMIP_STR, 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 } } +}; +/* clang-format on */ + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_pua_json_exports); + return 0; +}

1 0

git:master:f34f9456: modules: readme files regenerated - siputils ... [skip ci]
by Kamailio Dev 16 Jun '21

16 Jun '21

Module: kamailio Branch: master Commit: f34f9456c68d25bcdd49d670d95f16649e14e8d5 URL: https://github.com/kamailio/kamailio/commit/f34f9456c68d25bcdd49d670d95f166… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-16T12:16:28+02:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/f34f9456c68d25bcdd49d670d95f166… Patch: https://github.com/kamailio/kamailio/commit/f34f9456c68d25bcdd49d670d95f166… --- diff --git a/src/modules/siputils/README b/src/modules/siputils/README index 453179d5a1..411d7428cf 100644 --- a/src/modules/siputils/README +++ b/src/modules/siputils/README @@ -102,6 +102,7 @@ Gabriel Vasile 4.36. contact_param_decode(pname) 4.37. contact_param_decode_uri(pname) 4.38. contact_param_rm(pname) + 4.39. hdr_date_check(tdiff) 5. Exported pseudo-variables @@ -160,6 +161,7 @@ Gabriel Vasile 1.45. contact_param_decode usage 1.46. contact_param_decode_ruri usage 1.47. contact_param_rm usage + 1.48. hdr_date_check usage Chapter 1. Admin Guide @@ -223,6 +225,7 @@ Chapter 1. Admin Guide 4.36. contact_param_decode(pname) 4.37. contact_param_decode_uri(pname) 4.38. contact_param_rm(pname) + 4.39. hdr_date_check(tdiff) 5. Exported pseudo-variables @@ -444,6 +447,7 @@ modparam("auth", "rpid_avp", "$avp(myrpid)") 4.36. contact_param_decode(pname) 4.37. contact_param_decode_uri(pname) 4.38. contact_param_rm(pname) + 4.39. hdr_date_check(tdiff) 4.1. ring_insert_callid() @@ -1112,6 +1116,25 @@ if (is_method("REGISTER") and src_ip == 1.2.3.4) { } ... +4.39. hdr_date_check(tdiff) + + Returns true if sip message has Date header and its value is lower than + 'NOW() - tdiff'. + + Meaning of the parameters is as follows: + * tdiff - time difference in seconds, it can be a variable or static + integer value. + + This function can be used from ANY_ROUTE. + + Example 1.48. hdr_date_check usage +... +if (!hdr_date_check("10")) { + sl_send_reply("403", "Outdated date"); + exit; +} +... + 5. Exported pseudo-variables 5.1. $pcv(all)

1 0

git:master:6a2a1dfb: siputils: docs for hdr_date_check()
by Daniel-Constantin Mierla 16 Jun '21

16 Jun '21

Module: kamailio Branch: master Commit: 6a2a1dfb8a6718f7ecb7cc2f28cf471bdcf0fec3 URL: https://github.com/kamailio/kamailio/commit/6a2a1dfb8a6718f7ecb7cc2f28cf471… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-16T12:09:36+02:00 siputils: docs for hdr_date_check() --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6a2a1dfb8a6718f7ecb7cc2f28cf471… Patch: https://github.com/kamailio/kamailio/commit/6a2a1dfb8a6718f7ecb7cc2f28cf471… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index 8e7140385d..b1dffa1c3e 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -1354,6 +1354,37 @@ if (is_method("REGISTER") and src_ip == 1.2.3.4) { contact_param_rm("myparam"); } ... +</programlisting> + </example> + </section> + <section id="siputils.f.hdr_date_check"> + <title> + <function moreinfo="none">hdr_date_check(tdiff)</function> + </title> + <para> + Returns true if sip message has Date header and its value is lower + than 'NOW() - tdiff'. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>tdiff</emphasis> - time difference in seconds, + it can be a variable or static integer value. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>hdr_date_check</function> usage</title> + <programlisting format="linespecific"> +... +if (!hdr_date_check("10")) { + sl_send_reply("403", "Outdated date"); + exit; +} +... </programlisting> </example> </section>

1 0

git:master:466e5f46: siputils: added hdr_date_check(tdiff)
by Daniel-Constantin Mierla 16 Jun '21

16 Jun '21

Module: kamailio Branch: master Commit: 466e5f469f5b6b9f5d1b30139c2b854e62f4f50b URL: https://github.com/kamailio/kamailio/commit/466e5f469f5b6b9f5d1b30139c2b854… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-16T12:03:38+02:00 siputils: added hdr_date_check(tdiff) - returns true if sip message has Date header and its value is lower than NOW() - tdiff --- Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/466e5f469f5b6b9f5d1b30139c2b854… Patch: https://github.com/kamailio/kamailio/commit/466e5f469f5b6b9f5d1b30139c2b854… --- diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index 57ae9fb262..3dc7188fa8 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -66,6 +66,7 @@ #include "../../core/kemi.h" #include "../../core/parser/parse_option_tags.h" #include "../../core/parser/parse_uri.h" +#include "../../core/parser/parse_date.h" #include "ring.h" #include "options.h" @@ -113,6 +114,8 @@ static int w_contact_param_decode(sip_msg_t *msg, char *pnparam, char *p2); static int w_contact_param_decode_ruri(sip_msg_t *msg, char *pnparam, char *p2); static int w_contact_param_rm(sip_msg_t *msg, char *pnparam, char *p2); +static int w_hdr_date_check(sip_msg_t *msg, char *ptdiff, char *p2); + /* Fixup functions to be defined later */ static int fixup_set_uri(void** param, int param_no); static int fixup_free_set_uri(void** param, int param_no); @@ -205,6 +208,8 @@ static cmd_export_t cmds[]={ fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE}, {"contact_param_rm", (cmd_function)w_contact_param_rm, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE|ONREPLY_ROUTE}, + {"hdr_date_check", (cmd_function)w_hdr_date_check, 1, fixup_igp_null, + fixup_free_igp_null, ANY_ROUTE}, {"bind_siputils", (cmd_function)bind_siputils, 1, 0, 0, 0}, @@ -548,6 +553,66 @@ static int ki_is_uri(sip_msg_t* msg, str* suri) return 1; } +/* + * Check date header value with time difference + */ +static int ki_hdr_date_check(sip_msg_t* msg, int tdiff) +{ + time_t tnow, tmsg; + + if ((!msg->date) && (parse_headers(msg, HDR_DATE_F, 0) == -1)) { + LM_ERR("failed parsing Date header\n"); + return -1; + } + if (!msg->date) { + LM_ERR("Date header field is not found\n"); + return -1; + } + if ((!(msg->date)->parsed) && (parse_date_header(msg) < 0)) { + LM_ERR("failed parsing DATE body\n"); + return -1; + } + +#ifdef HAVE_TIMEGM + tmsg=timegm(&get_date(msg)->date); +#else + tmsg=_timegm(&get_date(msg)->date); +#endif + if (tmsg < 0) { + LM_ERR("timegm error\n"); + return -2; + } + + if ((tnow=time(0)) < 0) { + LM_ERR("time error %s\n", strerror(errno)); + return -3; + } + + if (tnow > tmsg + tdiff) { + LM_ERR("autdated date header value (%ld sec)\n", tnow - tmsg + tdiff); + return -4; + } else { + LM_ERR("Date header value OK\n"); + } + + return 1; + +} + +/** + * + */ +static int w_hdr_date_check(sip_msg_t *msg, char *ptdiff, char *p2) +{ + int tdiff = 0; + + if(fixup_get_ivalue(msg, (gparam_t*)ptdiff, &tdiff)<0) { + LM_ERR("failed to get time diff parameter\n"); + return -1; + } + return ki_hdr_date_check(msg, tdiff); +} + /** * */ @@ -668,6 +733,11 @@ static sr_kemi_t sr_kemi_siputils_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("siputils"), str_init("hdr_date_check"), + SR_KEMIP_INT, ki_hdr_date_check, + { 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 } } };

1 0

Kamailio v5.5.1 Released
by Daniel-Constantin Mierla 16 Jun '21

16 Jun '21

Hello, Kamailio SIP Server v5.5.1 stable release is out. This is a maintenance release of the latest stable branch, 5.5, that includes fixes since the release of v5.5.0. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.5.x. Deployments running previous v5.5.x versions are strongly recommended to be upgraded to v5.5.1. For more details about version 5.5.1 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2021/06/kamailio-v5-5-1-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.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

3 3

[kamailio/kamailio] Typo in htable.seti example (#2782)
by arkadiam 16 Jun '21

16 Jun '21

https://github.com/kamailio/kamailio/blob/30467037a7d97def6fbb40cad14e6f101… It should be `htable.seti` to set as an integer -- 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/2782

3 2

git:master:f22a09da: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 15 Jun '21

15 Jun '21

Module: kamailio Branch: master Commit: f22a09dacf85e6489005a634eb6d907c4b8ef782 URL: https://github.com/kamailio/kamailio/commit/f22a09dacf85e6489005a634eb6d907… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-15T19:16:14+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/f22a09dacf85e6489005a634eb6d907… Patch: https://github.com/kamailio/kamailio/commit/f22a09dacf85e6489005a634eb6d907… --- diff --git a/src/modules/htable/README b/src/modules/htable/README index 85f19c7102..25d6769065 100644 --- a/src/modules/htable/README +++ b/src/modules/htable/README @@ -1065,7 +1065,7 @@ kamcmd htable.sets test x[0] abc kamcmd htable.seti test x 123 # Set first entry in array key x $sht(test=>x[0]) as integer -kamcmd htable.sets test x[0] 123 +kamcmd htable.seti test x[0] 123 ... 6.5. htable.dump htable

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2021