sr-dev August 2021

sr-dev@lists.kamailio.org

19 participants
266 discussions

git:5.5:a629760e: modules: readme files regenerated - modules ... [skip ci]

by The Root

Module: kamailio Branch: 5.5 Commit: a629760eaff8cac4679482f616c8288623c88ec4 URL: https://github.com/kamailio/kamailio/commit/a629760eaff8cac4679482f616c8288… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2021-08-20T10:01:16+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/jwt/README --- Diff: https://github.com/kamailio/kamailio/commit/a629760eaff8cac4679482f616c8288… Patch: https://github.com/kamailio/kamailio/commit/a629760eaff8cac4679482f616c8288… --- diff --git a/src/modules/jwt/README b/src/modules/jwt/README index 7a7400a4b1..459f10a822 100644 --- a/src/modules/jwt/README +++ b/src/modules/jwt/README @@ -122,14 +122,17 @@ modparam("jwt", "key_mode", 1) libjwt (e.g., RS256, HS256, ES256, ...) * claims - the list of claims to be added to JWT, in the format "name1=value1;name2=value2;..." (same as the SIP parameters - format). + format). The string values can be enclosed in single or double + quotes. If a value is not eclosed in between quotes, it is added as + numeric value if it is successfully converted to a long value, + otherwise is added as string value. This function can be used from ANY_ROUTE. Example 1.2. jwt_generate usage ... jwt_generate("/path/to/prvkey.pem", "RS256", - "caller=$fU;callee=$tU;callid=$ci"); + "caller='$fU';callee='$tU';callid='$ci';index=100"); ... 4.2. jwt_verify(pubkey, alg, claims, jwtval) @@ -142,7 +145,8 @@ modparam("jwt", "key_mode", 1) libjwt (e.g., RS256, HS256, ES256, ...) * claims - the list of claims to be checked they are in the JWT, in the format "name1=value1;name2=value2;..." (same as the SIP - parameters format). + parameters format, see also the description of claims parameter for + jwt_generate()). * jwtval - the value of the JWT to verify This function can be used from ANY_ROUTE. @@ -150,7 +154,7 @@ modparam("jwt", "key_mode", 1) Example 1.3. jwt_verify usage ... if(!jwt_verify("/path/to/pubkey.pem", "RS256", - "caller=$fU;callee=$tU;callid=$ci", + "caller='$fU';callee='$tU';callid='$ci';index=100", "$var(jwt)") { xwarn("failed to verify jwt\n"); } @@ -171,6 +175,6 @@ modparam("jwt", "key_mode", 1) Example 1.4. $jwt(name) usage ... jwt_generate("/path/to/prvkey.pem", "RS256", - "caller=$fU;callee=$tU;callid=$ci"); + "caller='$fU';callee='$tU';callid='$ci';index=100"); xinfo("jwt is: $jwt(val)"); ...

2 years, 8 months

git:5.5:de84b32e: core: check message snd and rcv proto for COND_IF_DIFF_PROTO lumps

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: de84b32eb42e19f8626947da1c567eea2d0869fb URL: https://github.com/kamailio/kamailio/commit/de84b32eb42e19f8626947da1c567ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-20T10:00:38+02:00 core: check message snd and rcv proto for COND_IF_DIFF_PROTO lumps - besides comparing the protos of rcv and snd sockets (cherry picked from commit 31377b160df563a222bec5a1bf92590635429240) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/de84b32eb42e19f8626947da1c567ee… Patch: https://github.com/kamailio/kamailio/commit/de84b32eb42e19f8626947da1c567ee… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 0f82033c9f..9fd5635655 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -513,7 +513,8 @@ static inline int lump_check_opt( struct lump *l, } else return 0; case COND_IF_DIFF_PROTO: get_ip_port_proto; - if (proto!=snd_i->send_sock->proto) { + if ((proto!=snd_i->send_sock->proto) + || (msg->rcv.proto!=snd_i->proto)) { LUMP_SET_COND_TRUE(l); return 1; } else return 0;

2 years, 8 months

git:5.5:6b1fb350: lwsc: docs - updated references to libwebsockets version

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 6b1fb350458ad19192327e0dcedafa4749b6eb7c URL: https://github.com/kamailio/kamailio/commit/6b1fb350458ad19192327e0dcedafa4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:34:29+02:00 lwsc: docs - updated references to libwebsockets version - GH #2749 (cherry picked from commit 01afcc7fb2468c21a8e1cfb1a717fa96299794fa) --- Modified: src/modules/lwsc/doc/lwsc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6b1fb350458ad19192327e0dcedafa4… Patch: https://github.com/kamailio/kamailio/commit/6b1fb350458ad19192327e0dcedafa4… --- diff --git a/src/modules/lwsc/doc/lwsc_admin.xml b/src/modules/lwsc/doc/lwsc_admin.xml index 2f00c8fbd6..3e82f4b52b 100644 --- a/src/modules/lwsc/doc/lwsc_admin.xml +++ b/src/modules/lwsc/doc/lwsc_admin.xml @@ -20,7 +20,7 @@ external systems, similar to http client. It is not for routing SIP traffic. </para> <para> - It relies on libwebsockets (tested with v3.1.0) library (https://libwebsockets.org/). + It relies on libwebsockets library (https://libwebsockets.org/). </para> </section> @@ -47,7 +47,7 @@ <itemizedlist> <listitem> <para> - <emphasis>libwebsockets</emphasis> - probably v3.1.0 or newer. + <emphasis>libwebsockets</emphasis> - probably v2.0 or newer. </para> </listitem> </itemizedlist>

2 years, 8 months

git:5.5:52978a08: core: check message rcv and snd proto for diff realms lump conditions

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 52978a0873eb068be31ca0688e64c88e4872efac URL: https://github.com/kamailio/kamailio/commit/52978a0873eb068be31ca0688e64c88… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-20T10:00:27+02:00 core: check message rcv and snd proto for diff realms lump conditions - in addition to receive socket and send socket protos, which may be the same in cases of tcp/tls+ws/wss using same ports (cherry picked from commit 871f8113612148a49e69218e70ed7f475fb665db) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/52978a0873eb068be31ca0688e64c88… Patch: https://github.com/kamailio/kamailio/commit/52978a0873eb068be31ca0688e64c88… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index a2f6505e83..0f82033c9f 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -493,8 +493,9 @@ static inline int lump_check_opt( struct lump *l, case COND_IF_DIFF_REALMS: get_ip_port_proto; /* faster tests first */ - if ((port==snd_i->send_sock->port_no) && + if ((port==snd_i->send_sock->port_no) && (proto==snd_i->send_sock->proto) && + (msg->rcv.proto==snd_i->proto) && #ifdef USE_COMP (msg->rcv.comp==snd_i->comp) && #endif

2 years, 8 months

git:5.5:d8ff1845: kazoo : fix routing of reply events

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: d8ff1845c34a7f9d8e6911ae3d2055b122eb3b79 URL: https://github.com/kamailio/kamailio/commit/d8ff1845c34a7f9d8e6911ae3d2055b… Author: Alan Evans <alan(a)kageds.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:33:47+02:00 kazoo : fix routing of reply events success events should be routed to onreply_route[] failure events should be routed to failure_route[] (cherry picked from commit fb2eee3e175040fef5e76cbed11430976f62df32) --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/d8ff1845c34a7f9d8e6911ae3d2055b… Patch: https://github.com/kamailio/kamailio/commit/d8ff1845c34a7f9d8e6911ae3d2055b… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 8076315dfd..5685f5a845 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -2498,24 +2498,24 @@ void kz_amqp_fire_connection_event(char *event, char* host, char* zone) void kz_amqp_cb_ok(kz_amqp_cmd_ptr cmd) { - int n = route_lookup(&main_rt, cmd->cb_route); + int n = route_lookup(&onreply_rt, cmd->cb_route); if(n==-1) { /* route block not found in the configuration file */ return; } - struct action *a = main_rt.rlist[n]; + struct action *a = onreply_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); ksr_msg_env_reset(); } void kz_amqp_cb_error(kz_amqp_cmd_ptr cmd) { - int n = route_lookup(&main_rt, cmd->err_route); + int n = route_lookup(&failure_rt, cmd->err_route); if(n==-1) { /* route block not found in the configuration file */ return; } - struct action *a = main_rt.rlist[n]; + struct action *a = failure_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); ksr_msg_env_reset(); }

2 years, 8 months

git:5.5:7e3e0a81: cplc: use cpl_ prefix for internal time recurrence functions

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 7e3e0a81bf458bd90bc1454c81bf21d64ed9212c URL: https://github.com/kamailio/kamailio/commit/7e3e0a81bf458bd90bc1454c81bf21d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:34:18+02:00 cplc: use cpl_ prefix for internal time recurrence functions - avoid global symbol conflicts with core tmrec.c - GH #2827 (cherry picked from commit 431544864c97d1848db1c0c42a03251a214f04cd) --- Modified: src/modules/cplc/cpl_switches.h Modified: src/modules/cplc/cpl_time.c Modified: src/modules/cplc/cpl_time.h --- Diff: https://github.com/kamailio/kamailio/commit/7e3e0a81bf458bd90bc1454c81bf21d… Patch: https://github.com/kamailio/kamailio/commit/7e3e0a81bf458bd90bc1454c81bf21d…

2 years, 8 months

git:5.5:b49f23af: drouting: added dr_ prefix to internal time recurrence functions

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: b49f23af03d5e2f0364610739e7ef6e07cfd54a5 URL: https://github.com/kamailio/kamailio/commit/b49f23af03d5e2f0364610739e7ef6e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:34:08+02:00 drouting: added dr_ prefix to internal time recurrence functions - avoids symbol conflicts with the core tmrec.c - GH #2828 (cherry picked from commit 33ea38f35f9911a26a757dbfa22065eb80a9a24a) --- Modified: src/modules/drouting/dr_load.c Modified: src/modules/drouting/dr_time.c Modified: src/modules/drouting/dr_time.h Modified: src/modules/drouting/prefix_tree.c Modified: src/modules/drouting/prefix_tree.h Modified: src/modules/drouting/routing.c Modified: src/modules/drouting/routing.h --- Diff: https://github.com/kamailio/kamailio/commit/b49f23af03d5e2f0364610739e7ef6e… Patch: https://github.com/kamailio/kamailio/commit/b49f23af03d5e2f0364610739e7ef6e…

2 years, 8 months

git:5.5:ad5f0f52: tm: restore xavps & flags after rebuilding message

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: ad5f0f522f43a69e0f7f930cac5aefc3f21607df URL: https://github.com/kamailio/kamailio/commit/ad5f0f522f43a69e0f7f930cac5aefc… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:33:22+02:00 tm: restore xavps & flags after rebuilding message (cherry picked from commit 7ee642c58991e594f38247ab0751fadd07ce758c) --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/ad5f0f522f43a69e0f7f930cac5aefc… Patch: https://github.com/kamailio/kamailio/commit/ad5f0f522f43a69e0f7f930cac5aefc… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index ad6a74c8cb..9cbc9d5f88 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -300,10 +300,6 @@ static inline int t_run_local_req( set_route_type( backup_route_type ); p_onsend=0; - /* restore original environment */ - tm_xdata_swap(new_cell, &backup_xd, 1); - setsflagsval(sflag_bk); - if (unlikely(ra_ctx.run_flags&DROP_R_F)) { LM_DBG("tm:local-request dropped msg. to %.*s\n", lreq.dst_uri.len, lreq.dst_uri.s); @@ -372,6 +368,10 @@ static inline int t_run_local_req( } clean: + /* restore original environment */ + tm_xdata_swap(new_cell, &backup_xd, 1); + setsflagsval(sflag_bk); + /* clean local msg structure */ if (unlikely(lreq.new_uri.s)) {

2 years, 8 months

git:5.5:680d98ca: core: ip addr - use POSIX INET6_ADDRSTRLEN and INET_ADDRSTRLEN to define sizes

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 680d98caccc0216f43c2b5de83935dbc4853ab9d URL: https://github.com/kamailio/kamailio/commit/680d98caccc0216f43c2b5de83935db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:33:35+02:00 core: ip addr - use POSIX INET6_ADDRSTRLEN and INET_ADDRSTRLEN to define sizes - set the values of IP4_MAX_STR_SIZE and IP6_MAX_STR_SIZE based on them, if defined, or to 15 and 45 - cope with IPv6 with IPv4 tunneling representation (RFC 4291 section 2.2) - cover the requirements of using inet_ntop() - GH #2823 (cherry picked from commit 22a72f3a7725d56f00e22bdc52d44bd53da7c091) --- Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/680d98caccc0216f43c2b5de83935db… Patch: https://github.com/kamailio/kamailio/commit/680d98caccc0216f43c2b5de83935db… --- diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index 546c822423..132f653255 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -510,8 +510,20 @@ int hostent2su(union sockaddr_union* su, /* maximum size of a str returned by ip_addr2str */ -#define IP6_MAX_STR_SIZE 39 /*1234:5678:9012:3456:7890:1234:5678:9012*/ -#define IP4_MAX_STR_SIZE 15 /*123.456.789.012*/ +/* POSIX INET6_ADDRSTRLEN (RFC 4291 section 2.2) - IPv6 with IPv4 tunneling + * (39): 1234:5678:9012:3456:7890:1234:5678:9012 + * (45): ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255 */ +#ifdef INET6_ADDRSTRLEN +#define IP6_MAX_STR_SIZE (INET6_ADDRSTRLEN-1) +#else +#define IP6_MAX_STR_SIZE 45 +#endif +/*123.456.789.123*/ +#ifdef INET_ADDRSTRLEN +#define IP4_MAX_STR_SIZE (INET_ADDRSTRLEN-1) +#else +#define IP4_MAX_STR_SIZE 15 +#endif /* converts a raw ipv6 addr (16 bytes) to ascii */ int ip6tosbuf(unsigned char* ip6, char* buff, int len);

2 years, 8 months

git:5.5:dadac04b: textops: check session sendrecv_mode in is_audio_on_hold

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: dadac04b0153a29ed7c1ebb48e887c06989fa49c URL: https://github.com/kamailio/kamailio/commit/dadac04b0153a29ed7c1ebb48e887c0… Author: Luis Azedo <luis.azedo(a)factorlusitano.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:33:08+02:00 textops: check session sendrecv_mode in is_audio_on_hold - if sendrecv_mode is not set in media, check if its set in session (cherry picked from commit cbcc27ef8b1674448bd8b1c45f03388e36f65f51) --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/dadac04b0153a29ed7c1ebb48e887c0… Patch: https://github.com/kamailio/kamailio/commit/dadac04b0153a29ed7c1ebb48e887c0… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 2998906051..4b3216d4d2 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -4367,8 +4367,15 @@ static int ki_is_audio_on_hold(sip_msg_t *msg) if(!sdp_stream) break; if(sdp_stream->media.len==AUDIO_STR_LEN && strncmp(sdp_stream->media.s,AUDIO_STR,AUDIO_STR_LEN)==0 && + sdp_stream->sendrecv_mode.len && sdp_stream->is_on_hold) return sdp_stream->is_on_hold; + if(sdp_stream->media.len==AUDIO_STR_LEN && + strncmp(sdp_stream->media.s,AUDIO_STR,AUDIO_STR_LEN)==0 && + !sdp_stream->sendrecv_mode.len && + sdp_session->sendrecv_mode.len && + sdp_session->is_on_hold) + return sdp_session->is_on_hold; sdp_stream_num++; } sdp_session_num++;

2 years, 8 months

← Newer
1
...
16
17
18
19
20
21
22
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2021