sr-dev October 2020

sr-dev@lists.kamailio.org

19 participants
527 discussions

git:master:a9ede56b: sanity: extended check 4 (required headers) for uniqueness

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a9ede56b35990fcc9164af0775f503e49e33377e URL: https://github.com/kamailio/kamailio/commit/a9ede56b35990fcc9164af0775f503e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-09T21:55:45+02:00 sanity: extended check 4 (required headers) for uniqueness - Call-ID, CSeq, From and To have to be only once --- Modified: src/modules/sanity/sanity.c --- Diff: https://github.com/kamailio/kamailio/commit/a9ede56b35990fcc9164af0775f503e… Patch: https://github.com/kamailio/kamailio/commit/a9ede56b35990fcc9164af0775f503e… --- diff --git a/src/modules/sanity/sanity.c b/src/modules/sanity/sanity.c index 04ad2b86d6..842d394194 100644 --- a/src/modules/sanity/sanity.c +++ b/src/modules/sanity/sanity.c @@ -299,8 +299,21 @@ int check_ruri_scheme(sip_msg_t* msg) { return SANITY_CHECK_PASSED; } +#define SANITY_HDR_DUPCHECK(_hf, _hdr_flags, _hdr_type, _hdr_flag, _hdr_name) \ + do { \ + if((_hf)->type == _hdr_type) { \ + if(_hdr_flags & _hdr_flag) { \ + LM_DBG("duplicated %s header\n", _hdr_name); \ + return SANITY_CHECK_FAILED; \ + } \ + _hdr_flags |= _hdr_flag; \ + } \ + } while(0) + /* check for the presence of the minimal required headers */ int check_required_headers(sip_msg_t* msg) { + hdr_field_t* hf; + hdr_flags_t hdr_flags = 0; LM_DBG("check_required_headers entered\n"); @@ -309,6 +322,20 @@ int check_required_headers(sip_msg_t* msg) { LM_DBG("check_required_headers failed\n"); return SANITY_CHECK_FAILED; } + if (parse_headers(msg, HDR_EOH_F, 0) != 0) { + LM_ERR("failed to parse headers\n"); + if (sanity_reply(msg, 400, "Bad Headers") < 0) { + LM_WARN("failed to send 400 reply\n"); + } + return SANITY_CHECK_FAILED; + } + for (hf=msg->headers; hf; hf=hf->next) { + SANITY_HDR_DUPCHECK(hf, hdr_flags, HDR_FROM_T, HDR_FROM_F, "From"); + SANITY_HDR_DUPCHECK(hf, hdr_flags, HDR_TO_T, HDR_TO_F, "To"); + SANITY_HDR_DUPCHECK(hf, hdr_flags, HDR_CALLID_T, HDR_CALLID_F, "Call-Id"); + SANITY_HDR_DUPCHECK(hf, hdr_flags, HDR_CSEQ_T, HDR_CSEQ_F, "CSeq"); + } + /* TODO: check for other required headers according to request type */ LM_DBG("check_required_headers passed\n");

3 years, 9 months

git:5.4:73476522: dialog: do unlock after saving updated dialog details

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 73476522301b6de65b8873e4ab04041315e93a82 URL: https://github.com/kamailio/kamailio/commit/73476522301b6de65b8873e4ab04041… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-09T19:39:05+02:00 dialog: do unlock after saving updated dialog details - lock()/unlock() for dialog slots are reentrant (cherry picked from commit e4cf6739e62c2ac1e5364315aaed1a7b73919253) --- Modified: src/modules/dialog/dlg_var.c --- Diff: https://github.com/kamailio/kamailio/commit/73476522301b6de65b8873e4ab04041… Patch: https://github.com/kamailio/kamailio/commit/73476522301b6de65b8873e4ab04041… --- diff --git a/src/modules/dialog/dlg_var.c b/src/modules/dialog/dlg_var.c index fa9eae9d1f..b2a373a501 100644 --- a/src/modules/dialog/dlg_var.c +++ b/src/modules/dialog/dlg_var.c @@ -434,10 +434,11 @@ int pv_set_dlg_variable(struct sip_msg* msg, pv_param_t *param, int op, pv_value /* unlock dialog */ if (dlg) { dlg->dflags |= DLG_FLAG_CHANGED_VARS; - dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); - if ( dlg_db_mode==DB_MODE_REALTIME ) + if ( dlg_db_mode==DB_MODE_REALTIME ) { + /* dlg_lock() / dlg_unlock() are reentrant */ update_dialog_dbinfo(dlg); - + } + dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); } print_lists(dlg);

3 years, 9 months

[kamailio/kamailio] Usrloc - KA Function not working for WS Transport (#2502)

by iliesh

### Description Monitoring extensions by using KA function from the usrloc module it's not working for ws contacts #### Log Messages ``` Oct 8 16:51:20 devsrv devsrv[31562]: ERROR: usrloc [ul_keepalive.c:277]: ul_ka_send(): unknown proto [5] for sending keepalive Oct 8 16:51:50 devsrv devsrv[31562]: DEBUG: usrloc [ul_keepalive.c:112]: ul_ka_urecord(): keepalive for aor: 101 Oct 8 16:51:50 devsrv devsrv[31562]: DEBUG: usrloc [ul_keepalive.c:236]: ul_ka_urecord(): keepalive request (len: 323) [[#012OPTIONS sip:gehtfehm@eg4avcve63ua.invalid;transport=ws SIP/2.0#015#012Via: SIP/2.0/WS 192.168.0.11:443;branch=z9hG4bKx.4.1.0#015#012From: <sip:options@webrtc-gw.company.net>;tag=uloc-c-5f7f3503-7b52-1-9abde102-5f7f3596-44823-4.1#015#012To: <sip:101@webrtc-gw.company.net>#015#012Call-ID: ksrulka-4.1#015#012CSeq: 80 OPTIONS#015#012Content-Length: 0#015#012#015#012]] Oct 8 16:51:50 devsrv devsrv[31562]: ERROR: usrloc [ul_keepalive.c:277]: ul_ka_send(): unknown proto [5] for sending keepalive ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.1 (x86_64/linux) a6cb74 ``` -- 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/2502

3 years, 9 months

git:master:5dda7f33: usrloc: send keepalive over ws and wss connections

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5dda7f336121b6068fd306340cb90a7d7e76c708 URL: https://github.com/kamailio/kamailio/commit/5dda7f336121b6068fd306340cb90a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-09T09:25:41+02:00 usrloc: send keepalive over ws and wss connections --- Modified: src/modules/usrloc/ul_keepalive.c --- Diff: https://github.com/kamailio/kamailio/commit/5dda7f336121b6068fd306340cb90a7… Patch: https://github.com/kamailio/kamailio/commit/5dda7f336121b6068fd306340cb90a7… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index a1070f3f74..a69a76d8b9 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -253,6 +253,11 @@ static int ul_ka_send(str *kamsg, dest_info_t *kadst) } #ifdef USE_TCP + else if(kadst->proto == PROTO_WS || kadst->proto == PROTO_WSS) { + /*ws-wss*/ + kadst->id=0; + return wss_send(kadst, kamsg->s, kamsg->len); + } else if(kadst->proto == PROTO_TCP) { /*tcp*/ kadst->id=0;

3 years, 9 months

git:master:5e107824: core: tcp - helper function to send data over ws/wss connection

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5e107824d684cdf30514b033e7f600862123ece5 URL: https://github.com/kamailio/kamailio/commit/5e107824d684cdf30514b033e7f6008… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-09T07:52:29+02:00 core: tcp - helper function to send data over ws/wss connection --- Modified: src/core/tcp_main.c Modified: src/core/tcp_server.h --- Diff: https://github.com/kamailio/kamailio/commit/5e107824d684cdf30514b033e7f6008… Patch: https://github.com/kamailio/kamailio/commit/5e107824d684cdf30514b033e7f6008… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index f19f75a588..84fec376a3 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -95,6 +95,7 @@ #include "tcp_info.h" #include "tcp_options.h" #include "ut.h" +#include "events.h" #include "cfg/cfg_struct.h" #include <fcntl.h> /* must be included after io_wait.h if SIGIO_RT is used */ @@ -5135,4 +5136,88 @@ void tcp_get_info(struct tcp_gen_info *ti) #endif /* TCP_ASYNC */ } + +/* finds an ws/wss tcpconn & sends on it + * uses the dst members to, proto (ws/wss) and id and tries to send + * returns: number of bytes written (>=0) on success + * <0 on error */ +int wss_send(dest_info_t* dst, const char* buf, unsigned len) +{ + int port; + struct ip_addr ip; + union sockaddr_union* from = NULL; + union sockaddr_union local_addr; + struct tcp_connection *con = NULL; + struct ws_event_info wsev; + sr_event_param_t evp = {0}; + int ret; + + if (unlikely((dst->proto == PROTO_WS +#ifdef USE_TLS + || dst->proto == PROTO_WSS #endif + ) && sr_event_enabled(SREV_TCP_WS_FRAME_OUT))) { + if (unlikely(dst->send_flags.f & SND_F_FORCE_SOCKET + && dst->send_sock)) { + + local_addr = dst->send_sock->su; +#ifdef SO_REUSEPORT + if (cfg_get(tcp, tcp_cfg, reuse_port)) { + LM_DBG("sending to: %s, force_socket=%d, send_sock=%p\n", + su2a(&dst->to,sizeof(struct sockaddr_in)), + (dst->send_flags.f & SND_F_FORCE_SOCKET), + dst->send_sock); + + su_setport(&local_addr, dst->send_sock->port_no); + } + else + su_setport(&local_addr, 0); /* any local port will do */ +#else + su_setport(&local_addr, 0); /* any local port will do */ +#endif + from = &local_addr; + } + + port = su_getport(&dst->to); + if (likely(port)) { + su2ip_addr(&ip, &dst->to); + if(tcp_connection_match==TCPCONN_MATCH_STRICT) { + con = tcpconn_lookup(dst->id, &ip, port, from, + (dst->send_sock)?dst->send_sock->port_no:0, 0); + } else { + con = tcpconn_get(dst->id, &ip, port, from, 0); + } + } + else if (likely(dst->id)) + con = tcpconn_get(dst->id, 0, 0, 0, 0); + else { + LM_CRIT("null_id & to\n"); + goto error; + } + + if (con == NULL) { + LM_WARN("TCP/TLS connection for WebSocket could not be found\n"); + goto error; + } + + memset(&wsev, 0, sizeof(ws_event_info_t)); + wsev.type = SREV_TCP_WS_FRAME_OUT; + wsev.buf = (char*)buf; + wsev.len = len; + wsev.id = con->id; + evp.data = (void *)&wsev; + ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, &evp); + tcpconn_put(con); + goto done; + } else { + LM_CRIT("used with invalid proto %d\n", dst->proto); + goto error; + } + +done: + return ret; +error: + return -1; +} + +#endif /* USE_TCP */ diff --git a/src/core/tcp_server.h b/src/core/tcp_server.h index 0566c500dc..dac25bb152 100644 --- a/src/core/tcp_server.h +++ b/src/core/tcp_server.h @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -33,7 +33,7 @@ int tcp_send(struct dest_info* dst, union sockaddr_union* from, int tcpconn_add_alias(int id, int port, int proto); - +int wss_send(dest_info_t* dst, const char* buf, unsigned len); #endif

3 years, 9 months

[kamailio/kamailio] dispatcher: ds_manage_routes refactoring (#2499)

by Julien Chavanton

break large function   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Each component has a single commit (if not, squash them into one commit) #### Type Of Change - [x] refactoring (non-breaking change which adds new functionality) #### Description This large function `ds_manage_routes` is quite large and the intent of every code block is becoming hard to read and assess. In order to avoid mixing refactoring with behavioral modifications I thought it was best to make a separate MR. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2499 -- Commit Summary -- * dispatcher: ds_manage_routes refactoring -- File Changes -- M src/modules/dispatcher/dispatch.c (111) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2499.patch https://github.com/kamailio/kamailio/pull/2499.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/2499

3 years, 9 months

git:master:9935dc8d: Merge pull request #2499 from kamailio/jchavanton/ds_manage_routes_small_refactoring

by GitHub

Module: kamailio Branch: master Commit: 9935dc8d28a1310084f597fd718af6a21255a799 URL: https://github.com/kamailio/kamailio/commit/9935dc8d28a1310084f597fd718af6a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-10-08T07:52:00+02:00 Merge pull request #2499 from kamailio/jchavanton/ds_manage_routes_small_refactoring dispatcher: ds_manage_routes refactoring --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/9935dc8d28a1310084f597fd718af6a… Patch: https://github.com/kamailio/kamailio/commit/9935dc8d28a1310084f597fd718af6a…

3 years, 9 months

git:master:12efb982: dispatcher: ds_manage_routes refactoring

by Julien Chavanton

Module: kamailio Branch: master Commit: 12efb9827e9c43d64e95230398a758760d0642d5 URL: https://github.com/kamailio/kamailio/commit/12efb9827e9c43d64e95230398a7587… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2020-10-07T09:39:28-07:00 dispatcher: ds_manage_routes refactoring break large function --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/12efb9827e9c43d64e95230398a7587… Patch: https://github.com/kamailio/kamailio/commit/12efb9827e9c43d64e95230398a7587…

3 years, 9 months

git:master:3f9210fc: CONTRIBUTING.md: more content related to commit message format

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3f9210fc23840560c8fe33ef26b537aa32cbe6df URL: https://github.com/kamailio/kamailio/commit/3f9210fc23840560c8fe33ef26b537a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-08T07:48:28+02:00 CONTRIBUTING.md: more content related to commit message format --- Modified: .github/CONTRIBUTING.md --- Diff: https://github.com/kamailio/kamailio/commit/3f9210fc23840560c8fe33ef26b537a… Patch: https://github.com/kamailio/kamailio/commit/3f9210fc23840560c8fe33ef26b537a… --- diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 9289eec2de..dac53f6d61 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -104,8 +104,15 @@ by the commit, for example: * `modname`: support for foo rfc extension * `usrloc`: support for gruu rfc extension * `lib`: srutils - critical bug fix for abc case + * `etc`: kamailio.cfg - added core reply route block + * `misc`: examples/kemi lua - added debug callback function * `kamctl`: added support for management of module xyz +It is acceptable to use slightly different formats, like `etc/kamailio.cfg: ...` +instead of `etc: kamailio.cfg - ...` or `modules/usrloc: ...` instead of +`usrloc: ...`, the important aspect is to indicate the component where the +changes were done. + At the end of the first line some CI flags can be added. Available at this moment: @@ -164,7 +171,7 @@ dialplan: basic safety for concurrent rpc reload #### Commit Message Examples #### - * change to usrloc module from modules + * changes to usrloc module from modules ``` usrloc: fixed name conflict @@ -173,7 +180,7 @@ usrloc: fixed name conflict with the usr_avp.h version ``` - * change to core + * changes to core ``` core: loadpath can now use a list of directories @@ -183,6 +190,15 @@ core: loadpath can now use a list of directories First match wins (e.g. for loadmodule "textops" if modules/textops.so or modules/textops/textops.so exists, it will be loaded and the search will stop). +``` + + * changes to `etc/kamailio.cfg` file + +``` +etc: kamailio.cfg - set load_backends to 1 for permissions module + +- the config uses only address table + ``` #### See Also ####

3 years, 9 months

git:master:2f360af3: modules: readme files regenerated - sqlops ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 2f360af30183b76d3db8d64e53b9b9eff74e9a38 URL: https://github.com/kamailio/kamailio/commit/2f360af30183b76d3db8d64e53b9b9e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-07T17:46:24+02:00 modules: readme files regenerated - sqlops ... [skip ci] --- Modified: src/modules/sqlops/README --- Diff: https://github.com/kamailio/kamailio/commit/2f360af30183b76d3db8d64e53b9b9e… Patch: https://github.com/kamailio/kamailio/commit/2f360af30183b76d3db8d64e53b9b9e…

3 years, 9 months

← Newer
1
...
35
36
37
38
39
40
41
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2020