sr-dev August 2024

sr-dev@lists.kamailio.org

10 participants
157 discussions

git:master:3d002d56: rtpengine: export API for other modules (GH #3949)

by Henning Westerholt

Module: kamailio Branch: master Commit: 3d002d561e82b8bb71b225da708bdfd9ce504335 URL: https://github.com/kamailio/kamailio/commit/3d002d561e82b8bb71b225da708bdfd… Author: Farzaneh Soltanzadeh <fr.soltanzadeh(a)resaa.net> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-08-19T12:30:29Z rtpengine: export API for other modules (GH #3949) --- Added: src/modules/rtpengine/api.h Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/3d002d561e82b8bb71b225da708bdfd… Patch: https://github.com/kamailio/kamailio/commit/3d002d561e82b8bb71b225da708bdfd… --- diff --git a/src/modules/rtpengine/api.h b/src/modules/rtpengine/api.h new file mode 100644 index 00000000000..fa499916238 --- /dev/null +++ b/src/modules/rtpengine/api.h @@ -0,0 +1,66 @@ +/* + * Rtpengine Module + * + * Copyright (C) 2003-2008 Sippy Software, Inc., http://www.sippysoft.com + * Copyright (C) 2014-2015 Sipwise GmbH, http://www.sipwise.com + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef _RTPENGINE_API_H_ +#define _RTPENGINE_API_H_ + +#include "../../core/parser/msg_parser.h" + +typedef int (*rtpengine_start_recording_f)( + struct sip_msg *msg, char *str1, char *str2); +typedef int (*rtpengine_answer_f)(struct sip_msg *msg, char *str1, char *str2); +typedef int (*rtpengine_offer_f)(struct sip_msg *msg, char *str1, char *str2); +typedef int (*rtpengine_delete_f)(struct sip_msg *msg, char *str1, char *str2); + +typedef struct rtpengine_api +{ + rtpengine_start_recording_f start_recording; + rtpengine_answer_f answer; + rtpengine_offer_f offer; + rtpengine_delete_f delete; +} rtpengine_api_t; + +typedef int (*bind_rtpengine_f)(rtpengine_api_t *api); + +/** + * @brief Load the RTPENGINE API + */ +static inline int rtpengine_load_api(rtpengine_api_t *api) +{ + bind_rtpengine_f bindrtpengine; + + bindrtpengine = (bind_rtpengine_f)find_export("bind_rtpengine", 0, 0); + if(bindrtpengine == 0) { + LM_ERR("cannot find bind_rtpengine\n"); + return -1; + } + if(bindrtpengine(api) < 0) { + LM_ERR("cannot bind rtpengine api\n"); + return -1; + } + + return 0; +} + + +#endif /* _RTPENGINE_API_H_ */ diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index aefdc7c7d6e..84bf5951752 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -89,6 +89,7 @@ #include "rtpengine_hash.h" #include "bencode.h" #include "config.h" +#include "api.h" MODULE_VERSION @@ -241,6 +242,8 @@ static int parse_viabranch(struct ng_flags_parse *ng_flags, struct sip_msg *msg, static int parse_from_to_tags(struct ng_flags_parse *ng_flags, enum rtpe_operation op, struct sip_msg *msg); +static int bind_rtpengine(rtpengine_api_t *api); + static int rtpengine_offer_answer( struct sip_msg *msg, void *d, enum rtpe_operation op, int more); static int fixup_set_id(void **param, int param_no); @@ -468,6 +471,7 @@ static cmd_export_t cmds[] = { {"rtpengine_query_v", (cmd_function)w_rtpengine_query_v, 2, fixup_rtpengine_query_v, fixup_free_rtpengine_query_v, ANY_ROUTE}, + {"bind_rtpengine", (cmd_function)bind_rtpengine, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} }; @@ -5779,3 +5783,21 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) sr_kemi_modules_add(sr_kemi_rtpengine_exports); return 0; } + + +/** + * load rtpengine module API + */ +static int bind_rtpengine(rtpengine_api_t *api) +{ + if(!api) { + LM_ERR("Invalid parameter value\n"); + return -1; + } + api->start_recording = start_recording_f; + api->answer = rtpengine_answer1_f; + api->offer = rtpengine_offer1_f; + api->delete = rtpengine_delete1_f; + + return 0; +} \ No newline at end of file

1 month

[kamailio/kamailio] [Websocket] websocket:closed sometimes is not fired (Issue #3950)

by Gustavo Almeida

### Description After carrying out some load tests using the `Websocket` module, I noticed that sometimes the `websocket:closed` event is not triggered. This problem seems to be particularly noticeable when the load is high and simultaneous. Example: 1000 records simultaneously. In the tests carried out, I realized that the number of times the event is not triggered is small, in the order of [1-10]/1000. I check that when I do a `ws.dump` I don't have any active connections, and I confirm that they are all effectively cleaned (`netstat -ano | grep 8061`). However, the event is not triggered for some connections. I can see this in the logs, and also when i display the content of an hash table, i'm dropping key inside `websocket:closed` event. ### Troubleshooting The troubleshooting was simplistic, i.e. I ran the same test n times, and validated that the event was triggered for all connections, the number of `ws` connections listed by `Kamailio`, and the open connections. #### Reproduction To reproduce, we can use any mechanism that emulates the use of the `Websocket` module. For example, I used the `sipexer` tool to create a `wss` connection with `Kamailio`, forcing simultaneous registrations. Example command: `sipexer -cb -mt register -ex 60 -au <user> -ap <pass> -fuser example -fd mydomain -wso https://10.0.0.12:10000 -ruri sip:kamailio -su wss://kamailio:8061` Kamailio TLS listener: `listen=tls:10.0.0.12:8061 advertise PUBLIC_IP` Websocket module: ``` loadmodule "websocket.so" tcp_accept_no_cl=yes ``` ``` event_route[websocket:closed] { xlog("L_NOTICE", "WebSocket connection closed $proto:$si:$sp\n"); <I also delete where a htable key> } ``` #### Debugging Data ``` [root@ ~]$ prcmd ws.dump { connections: { } info: { wscounter: 0 truncated: no } } [root@ ~]$ netstat -ano | grep 8061 tcp 0 0 10.0.0.12:8061 0.0.0.0:* LISTEN off (0.00/0/0) [root ~]$ prcmd htable.dump wsauth | grep "name" | wc -l 3 [root ~]$ cat /var/log/kamailio.log | grep "WebSocket connection closed" | wc -l 997 [root ~]$ cat /var/log/proxy-registrar/proxy-registrar.log | grep "ERR" | grep "WAR" | wc -l 0 ``` #### Log Messages Nothing relevant. #### SIP Traffic Nothing relevant here, the SIP Flow is OK. ### Additional Information ``` version: kamailio 5.6.4 (x86_64/linux) a004cf-dirty flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, 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_BLOCKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: a004cf -dirty compiled on 23:17:27 Jun 7 2024 with gcc 4.8.5 ``` * **Operating System**: ``` CentOS Linux release 7.9.2009 (Core) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3950 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3950(a)github.com>

1 month

[kamailio/kamailio] secfilter: all functions are exported in KEMI (PR #3940)

by bazrafshan.m.h

- All `secfilter` functions are now accessible in KEMI. For example, you can use KSR.secf_check_ip() directly by importing the KSR module in Python.   #### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  * Exporting all secfilter functions to KEMI. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3940 -- Commit Summary -- * secfilter is fully KEMIized -- File Changes -- M src/modules/secfilter/secfilter.c (99) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3940.patch https://github.com/kamailio/kamailio/pull/3940.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3940 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3940(a)github.com>

1 month

[kamailio/kamailio] cdp: export all functions in KEMI module (PR #3943)

by bazrafshan.m.h

- Added `cdp_has_app` function: - Accepts a single parameter: - `application`: The Application ID. - Added `cdp_has_app2` function: - Accepts two parameters: - `vendorid`: The Vendor ID associated with the application. - `application`: The Application ID. - Added cdp_check_peer function: - Accepts one parameter: - `fqdn`: the Fully qualified domain name of the peer, that should be checked. The parameter may contain pseudovariables. NOTE: All parameters are passed as standard strings.   #### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  * Exporting all cdp functions to KEMI You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3943 -- Commit Summary -- * cdp: export all functions in KEMI module -- File Changes -- M src/modules/cdp/cdp_mod.c (34) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3943.patch https://github.com/kamailio/kamailio/pull/3943.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3943 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3943(a)github.com>

1 month

git:master:b712ddc4: msilo: removed duplicatred exported function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b712ddc4db9a9c1bb30b236a0a86082108b23f07 URL: https://github.com/kamailio/kamailio/commit/b712ddc4db9a9c1bb30b236a0a86082… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-17T17:08:31+02:00 msilo: removed duplicatred exported function --- Modified: src/modules/msilo/msilo.c --- Diff: https://github.com/kamailio/kamailio/commit/b712ddc4db9a9c1bb30b236a0a86082… Patch: https://github.com/kamailio/kamailio/commit/b712ddc4db9a9c1bb30b236a0a86082… --- diff --git a/src/modules/msilo/msilo.c b/src/modules/msilo/msilo.c index 9baa1e4c185..fe2bd8cb53a 100644 --- a/src/modules/msilo/msilo.c +++ b/src/modules/msilo/msilo.c @@ -185,7 +185,6 @@ static cmd_export_t cmds[] = { {"m_store_addrs", (cmd_function)m_store3, 3, fixup_spve_all, fixup_free_spve_all, REQUEST_ROUTE | FAILURE_ROUTE}, {"m_dump", (cmd_function)m_dump_2, 0, 0, 0, REQUEST_ROUTE}, - {"m_dump", (cmd_function)m_dump_2, 0, 0, 0, REQUEST_ROUTE}, {"m_dump", (cmd_function)m_dump_2, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE}, {"bind_msilo", (cmd_function)bind_msilo, 1, 0, 0, ANY_ROUTE},

1 month

git:master:b6dea98a: msilo: added fixup free functions to exports structure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b6dea98ada293a3bbad004aa1b194d4bf44a60ab URL: https://github.com/kamailio/kamailio/commit/b6dea98ada293a3bbad004aa1b194d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-17T16:30:21+02:00 msilo: added fixup free functions to exports structure --- Modified: src/modules/msilo/msilo.c --- Diff: https://github.com/kamailio/kamailio/commit/b6dea98ada293a3bbad004aa1b194d4… Patch: https://github.com/kamailio/kamailio/commit/b6dea98ada293a3bbad004aa1b194d4… --- diff --git a/src/modules/msilo/msilo.c b/src/modules/msilo/msilo.c index 91b6a8892a9..9baa1e4c185 100644 --- a/src/modules/msilo/msilo.c +++ b/src/modules/msilo/msilo.c @@ -181,13 +181,13 @@ static cmd_export_t cmds[] = { {"m_store", (cmd_function)m_store1, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE}, {"m_store", (cmd_function)m_store1, 1, fixup_spve_null, - 0, REQUEST_ROUTE | FAILURE_ROUTE}, + fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE}, {"m_store_addrs", (cmd_function)m_store3, 3, fixup_spve_all, fixup_free_spve_all, REQUEST_ROUTE | FAILURE_ROUTE}, {"m_dump", (cmd_function)m_dump_2, 0, 0, 0, REQUEST_ROUTE}, {"m_dump", (cmd_function)m_dump_2, 0, 0, 0, REQUEST_ROUTE}, {"m_dump", (cmd_function)m_dump_2, 1, fixup_spve_null, - 0, REQUEST_ROUTE}, + fixup_free_spve_null, REQUEST_ROUTE}, {"bind_msilo", (cmd_function)bind_msilo, 1, 0, 0, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} };

1 month

git:master:f5f7c913: uac: added fixup free functions to exports structure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f5f7c913d4f008b9937677ae2c2d66baa01dcf0e URL: https://github.com/kamailio/kamailio/commit/f5f7c913d4f008b9937677ae2c2d66b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-16T18:03:46+02:00 uac: added fixup free functions to exports structure --- Modified: src/modules/uac/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/f5f7c913d4f008b9937677ae2c2d66b… Patch: https://github.com/kamailio/kamailio/commit/f5f7c913d4f008b9937677ae2c2d66b… --- diff --git a/src/modules/uac/uac.c b/src/modules/uac/uac.c index 90d434ac64d..aabd6c753ed 100644 --- a/src/modules/uac/uac.c +++ b/src/modules/uac/uac.c @@ -128,15 +128,15 @@ static pv_export_t mod_pvs[] = { /* Exported functions */ static cmd_export_t cmds[] = { {"uac_replace_from", (cmd_function)w_replace_from, 2, fixup_spve_spve, - 0, REQUEST_ROUTE | BRANCH_ROUTE}, + fixup_free_spve_spve, REQUEST_ROUTE | BRANCH_ROUTE}, {"uac_replace_from", (cmd_function)w_replace_from, 1, fixup_spve_spve, - 0, REQUEST_ROUTE | BRANCH_ROUTE}, + fixup_free_spve_spve, REQUEST_ROUTE | BRANCH_ROUTE}, {"uac_restore_from", (cmd_function)w_restore_from, 0, 0, 0, REQUEST_ROUTE}, - {"uac_replace_to", (cmd_function)w_replace_to, 2, fixup_spve_spve, 0, - REQUEST_ROUTE | BRANCH_ROUTE}, - {"uac_replace_to", (cmd_function)w_replace_to, 1, fixup_spve_spve, 0, - REQUEST_ROUTE | BRANCH_ROUTE}, + {"uac_replace_to", (cmd_function)w_replace_to, 2, fixup_spve_spve, + fixup_free_spve_spve, REQUEST_ROUTE | BRANCH_ROUTE}, + {"uac_replace_to", (cmd_function)w_replace_to, 1, fixup_spve_spve, + fixup_free_spve_spve, REQUEST_ROUTE | BRANCH_ROUTE}, {"uac_restore_to", (cmd_function)w_restore_to, 0, 0, 0, REQUEST_ROUTE}, {"uac_auth", (cmd_function)w_uac_auth, 0, 0, 0, FAILURE_ROUTE | BRANCH_FAILURE_ROUTE | EVENT_ROUTE}, @@ -152,7 +152,7 @@ static cmd_export_t cmds[] = { {"uac_reg_lookup_uri", (cmd_function)w_uac_reg_lookup_uri, 2, fixup_spve_pvar, fixup_free_spve_pvar, ANY_ROUTE}, {"uac_reg_status", (cmd_function)w_uac_reg_status, 1, fixup_spve_null, - 0, ANY_ROUTE}, + fixup_free_spve_null, ANY_ROUTE}, {"uac_reg_request_to", (cmd_function)w_uac_reg_request_to, 2, fixup_spve_igp, fixup_free_spve_igp, REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE},

1 month

git:master:36ae41d5: uac: added field for cseq number for $uac_req(...)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 36ae41d5d3efce9c336cf2f675a0cb4fe01933a1 URL: https://github.com/kamailio/kamailio/commit/36ae41d5d3efce9c336cf2f675a0cb4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-15T14:46:39+02:00 uac: added field for cseq number for $uac_req(...) --- Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/36ae41d5d3efce9c336cf2f675a0cb4… Patch: https://github.com/kamailio/kamailio/commit/36ae41d5d3efce9c336cf2f675a0cb4… --- diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index f91a0c75b4f..8fc88b3858d 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -79,6 +79,7 @@ typedef struct _uac_send_info str s_apasswd; char b_evparam[MAX_UACD_SIZE]; str s_evparam; + unsigned int cseqno; unsigned int evroute; unsigned int evcode; unsigned int evtype; @@ -180,6 +181,10 @@ int pv_get_uac_req(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) return pv_get_uintval(msg, param, res, _uac_req.evcode); case 16: return pv_get_uintval(msg, param, res, _uac_req.evtype); + case 17: + return pv_get_uintval(msg, param, res, _uac_req.flags); + case 18: + return pv_get_uintval(msg, param, res, _uac_req.cseqno); default: return pv_get_uintval(msg, param, res, _uac_req.flags); } @@ -214,6 +219,7 @@ int pv_set_uac_req( _uac_req.evroute = 0; _uac_req.evtype = 0; _uac_req.evcode = 0; + _uac_req.cseqno = 0; _uac_req.s_evparam.len = 0; } break; @@ -465,6 +471,17 @@ int pv_set_uac_req( } _uac_req.flags = tval->ri; break; + case 18: + if(tval == NULL) { + _uac_req.cseqno = 0; + return 0; + } + if(!(tval->flags & PV_VAL_INT)) { + LM_ERR("Invalid value type\n"); + return -1; + } + _uac_req.cseqno = tval->ri; + break; } return 0; } @@ -516,6 +533,8 @@ int pv_parse_uac_req_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 15; else if(strncmp(in->s, "evtype", 6) == 0) sp->pvp.pvn.u.isname.name.n = 16; + else if(strncmp(in->s, "cseqno", 6) == 0) + sp->pvp.pvn.u.isname.name.n = 18; else goto error; break; @@ -861,6 +880,7 @@ int uac_req_send(void) uac_r.cbp = (void *)tp; } uac_r.callid = (_uac_req.s_callid.len <= 0) ? NULL : &_uac_req.s_callid; + uac_r.cseqno = _uac_req.cseqno; ret = _uac_send_tmb.t_request(&uac_r, /* UAC Req */ &_uac_req.s_ruri, /* Request-URI */ (_uac_req.s_turi.len <= 0) ? &_uac_req.s_ruri

1 month

git:master:4a468936: tm: added cseq number field to uac_req structure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4a4689366aee9517ed90cf2df1a4e90018b9948d URL: https://github.com/kamailio/kamailio/commit/4a4689366aee9517ed90cf2df1a4e90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-15T14:41:12+02:00 tm: added cseq number field to uac_req structure --- Modified: src/modules/tm/uac.c Modified: src/modules/tm/uac.h --- Diff: https://github.com/kamailio/kamailio/commit/4a4689366aee9517ed90cf2df1a4e90… Patch: https://github.com/kamailio/kamailio/commit/4a4689366aee9517ed90cf2df1a4e90… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 5384d826dd8..b40a1e74d09 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -1086,6 +1086,7 @@ int request(uac_req_t *uac_r, str *ruri, str *to, str *from, str *next_hop) str callid, fromtag; dlg_t *dialog; int res; + unsigned int cseqno; if(check_params(uac_r, to, from) < 0) goto err; @@ -1094,9 +1095,10 @@ int request(uac_req_t *uac_r, str *ruri, str *to, str *from, str *next_hop) generate_callid(&callid); else callid = *uac_r->callid; + cseqno = (uac_r->cseqno > 0) ? uac_r->cseqno : DEFAULT_CSEQ; generate_fromtag(&fromtag, &callid, ruri); - if(new_dlg_uac(&callid, &fromtag, DEFAULT_CSEQ, from, to, &dialog) < 0) { + if(new_dlg_uac(&callid, &fromtag, cseqno, from, to, &dialog) < 0) { LM_ERR("Error while creating temporary dialog\n"); goto err; } diff --git a/src/modules/tm/uac.h b/src/modules/tm/uac.h index 6fad3380cd8..05a8614d8f8 100644 --- a/src/modules/tm/uac.h +++ b/src/modules/tm/uac.h @@ -51,6 +51,7 @@ typedef struct uac_req transaction_cb *cb; void *cbp; str *callid; + unsigned int cseqno; } uac_req_t; /* macro for setting the values of uac_req_t struct */

1 month

git:master:7d2fd091: phonenum: add fixup free functions to exports structure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7d2fd09103680454aaaba30f5e46f83b362513eb URL: https://github.com/kamailio/kamailio/commit/7d2fd09103680454aaaba30f5e46f83… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-14T18:37:06+02:00 phonenum: add fixup free functions to exports structure --- Modified: src/modules/phonenum/phonenum_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7d2fd09103680454aaaba30f5e46f83… Patch: https://github.com/kamailio/kamailio/commit/7d2fd09103680454aaaba30f5e46f83… --- diff --git a/src/modules/phonenum/phonenum_mod.c b/src/modules/phonenum/phonenum_mod.c index 665fa9b2772..c5eda4bdc35 100644 --- a/src/modules/phonenum/phonenum_mod.c +++ b/src/modules/phonenum/phonenum_mod.c @@ -58,9 +58,9 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[]={ {"phonenum_match", (cmd_function)w_phonenum_match, 2, fixup_spve_spve, - 0, ANY_ROUTE}, + fixup_free_spve_spve, ANY_ROUTE}, {"phonenum_match_cn", (cmd_function)w_phonenum_match_cn, 3, fixup_spve_all, - 0, ANY_ROUTE}, + fixup_free_spve_all, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} };

1 month

← Newer
1
...
9
10
11
12
13
14
15
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2024