sr-dev

sr-dev@lists.kamailio.org

17 participants
45431 discussions

git:master:e0f10477: core: explicit unsigned long long for internal flag constants
by Daniel-Constantin Mierla 20 Aug '24

20 Aug '24

Module: kamailio Branch: master Commit: e0f10477728922cefbbff9d23d846cd5912eb148 URL: https://github.com/kamailio/kamailio/commit/e0f10477728922cefbbff9d23d846cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-20T13:05:42+02:00 core: explicit unsigned long long for internal flag constants --- Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/e0f10477728922cefbbff9d23d846cd… Patch: https://github.com/kamailio/kamailio/commit/e0f10477728922cefbbff9d23d846cd…

1 0

git:master:9ff1080c: core: new internal flags to skip adding received/rport in incoming via
by Daniel-Constantin Mierla 20 Aug '24

20 Aug '24

Module: kamailio Branch: master Commit: 9ff1080cc6452343e6bc2de00350b2f7bcecf6d2 URL: https://github.com/kamailio/kamailio/commit/9ff1080cc6452343e6bc2de00350b2f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-20T12:26:10+02:00 core: new internal flags to skip adding received/rport in incoming via --- Modified: src/core/msg_translator.c Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/9ff1080cc6452343e6bc2de00350b2f… Patch: https://github.com/kamailio/kamailio/commit/9ff1080cc6452343e6bc2de00350b2f… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index f26abd2e79d..5028accb1fb 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -212,6 +212,24 @@ static int check_via_address( return -1; } +/* check if rport has to be added or updated in Via + * - return 1 on true; 0 on false */ +int rport_test(struct sip_msg *msg) +{ + if(msg->msg_flags & FL_VIA_NORECEIVED) { + return 0; + } + /* check if rport needs to be updated: + * - if FL_FORCE_RPORT is set add it (and del. any previous version) + * - if via already contains an rport add it and overwrite the previous + * rport value if present (if you don't want to overwrite the previous + * version remove the comments) */ + if(((msg->msg_flags | global_req_flags) & FL_FORCE_RPORT) + || (msg->via1->rport /*&& msg->via1->rport->value.s==0*/)) { + return 1; + } + return 0; +} /* check if IP address in Via != source IP address of signaling, * or the sender requires adding rport or received values */ @@ -219,6 +237,9 @@ int received_test(struct sip_msg *msg) { int rcvd; + if(msg->msg_flags & FL_VIA_NORECEIVED) { + return 0; + } rcvd = msg->via1->received || msg->via1->rport || check_via_address(&msg->rcv.src_ip, &msg->via1->host, msg->via1->port, received_dns); @@ -230,6 +251,9 @@ int received_via_test(struct sip_msg *msg) { int rcvd; + if(msg->msg_flags & FL_VIA_NORECEIVED) { + return 0; + } rcvd = (check_via_address(&msg->rcv.src_ip, &msg->via1->host, msg->via1->port, received_dns) != 0); @@ -2039,7 +2063,7 @@ char *build_req_buf_from_sip_req(struct sip_msg *msg, struct lump *path_anchor; struct lump *path_lump; str branch; - unsigned int flags; + msg_flags_t flags; unsigned int udp_mtu; struct dest_info di; int ret; @@ -2108,13 +2132,8 @@ char *build_req_buf_from_sip_req(struct sip_msg *msg, } } - /* check if rport needs to be updated: - * - if FL_FORCE_RPORT is set add it (and del. any previous version) - * - if via already contains an rport add it and overwrite the previous - * rport value if present (if you don't want to overwrite the previous - * version remove the comments) */ - if((flags & FL_FORCE_RPORT) - || (msg->via1->rport /*&& msg->via1->rport->value.s==0*/)) { + /* check if rport needs to be updated */ + if(rport_test(msg)) { if((rport_buf = rport_builder(msg, &rport_len)) == 0) { LM_ERR("rport_builder failed\n"); goto error00; /* free everything */ @@ -2518,8 +2537,7 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, } } /* check if rport needs to be updated */ - if(((msg->msg_flags | global_req_flags) & FL_FORCE_RPORT) - || (msg->via1->rport /*&& msg->via1->rport->value.s==0*/)) { + if(rport_test(msg)) { if((rport_buf = rport_builder(msg, &rport_len)) == 0) { LM_ERR("rport_builder failed\n"); goto error01; /* free everything */ diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 45e7eb1a714..0627754446a 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -133,8 +133,9 @@ typedef enum request_method /* WARNING: Value (1 << 31) is reserved for use in kamailio * nat_traversal module (flag FL_DO_KEEPALIVE)! */ -#define FL_FINAL_REPLY (1ULL << 32) /* local final reply sent */ -#define FL_DELAYED_REPLY (1ULL << 33) /* local reply sending delayed */ +#define FL_FINAL_REPLY (1ULL << 32) /* local final reply sent */ +#define FL_DELAYED_REPLY (1ULL << 33) /* local reply sending delayed */ +#define FL_VIA_NORECEIVED (1ULL << 34) /* no received test for incoming Via */ #define FL_MTU_FB_MASK (FL_MTU_TCP_FB | FL_MTU_TLS_FB | FL_MTU_SCTP_FB)

1 0

Re: [kamailio/kamailio] rtpengine: export API for other modules (GH #3949) (3d002d5)
by Henning Westerholt 19 Aug '24

19 Aug '24

Yes, I commented it in the other issue. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/3d002d561e82b8bb71b225da708bdfd… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/3d002d561e82b8bb71b225da708bdfd9ce504335/145517761(a)github.com>

1 0

Re: [kamailio/kamailio] rtpengine: export API for other modules (GH #3949) (3d002d5)
by Farzaneh Soltanzadeh 19 Aug '24

19 Aug '24

Thanks for merging the PR. It seems that the referenced PR is wrong. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/3d002d561e82b8bb71b225da708bdfd… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/3d002d561e82b8bb71b225da708bdfd9ce504335/145516854(a)github.com>

1 0

git:master:3d002d56: rtpengine: export API for other modules (GH #3949)
by Henning Westerholt 19 Aug '24

19 Aug '24

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 0

[kamailio/kamailio] secfilter: all functions are exported in KEMI (PR #3940)
by bazrafshan.m.h 19 Aug '24

19 Aug '24

- 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>

2 5

[kamailio/kamailio] cdp: export all functions in KEMI module (PR #3943)
by bazrafshan.m.h 19 Aug '24

19 Aug '24

- 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>

2 3

git:master:b712ddc4: msilo: removed duplicatred exported function
by Daniel-Constantin Mierla 17 Aug '24

17 Aug '24

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 0

git:master:b6dea98a: msilo: added fixup free functions to exports structure
by Daniel-Constantin Mierla 17 Aug '24

17 Aug '24

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 0

git:master:f5f7c913: uac: added fixup free functions to exports structure
by Daniel-Constantin Mierla 16 Aug '24

16 Aug '24

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 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev