sr-dev December 2022

sr-dev@lists.kamailio.org

11 participants
268 discussions

[kamailio/kamailio] tm: cleanup parsed body at the end t_continue_helper (PR #3294)
by Rick Barenthin 07 Dec '22

07 Dec '22

- if t_suspend and t_continue are used for replies and in the called route in t_continue the body of the sip message is parsed the pkg memory of the parsed body is leaked   #### 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 - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3294 -- Commit Summary -- * tm: cleanup parsed body at the end t_continue_helper -- File Changes -- M src/modules/tm/t_suspend.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3294.patch https://github.com/kamailio/kamailio/pull/3294.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3294 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3294(a)github.com>

2 2

git:master:f409a8c9: tm: cleanup parsed body at the end t_continue_helper
by Daniel-Constantin Mierla 07 Dec '22

07 Dec '22

Module: kamailio Branch: master Commit: f409a8c9f6fde33eaf8b428887e219b56740b0a5 URL: https://github.com/kamailio/kamailio/commit/f409a8c9f6fde33eaf8b428887e219b… Author: Rick Barenthin <rick(a)ng-voice.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-07T14:14:42+01:00 tm: cleanup parsed body at the end t_continue_helper - if t_suspend and t_continue are used for replies and in the called route in t_continue the body of the sip message is parsed the pkg memory of the parsed body is leaked --- Modified: src/modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/f409a8c9f6fde33eaf8b428887e219b… Patch: https://github.com/kamailio/kamailio/commit/f409a8c9f6fde33eaf8b428887e219b… --- diff --git a/src/modules/tm/t_suspend.c b/src/modules/tm/t_suspend.c index f0255d6647..4e25c3c89b 100644 --- a/src/modules/tm/t_suspend.c +++ b/src/modules/tm/t_suspend.c @@ -554,6 +554,11 @@ static int t_continue_helper(unsigned int hash_index, unsigned int label, hdr = hdr->next; } } + + /* trigger free of body */ + if(brpl->body && brpl->body->free) { + brpl->body->free(&brpl->body); + } sip_msg_free(brpl); } }

1 0

git:master:7f9547ae: misc/examples/kemi: native config upated
by Daniel-Constantin Mierla 07 Dec '22

07 Dec '22

Module: kamailio Branch: master Commit: 7f9547ae2b5a5848f693544124f199f4082be22c URL: https://github.com/kamailio/kamailio/commit/7f9547ae2b5a5848f693544124f199f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-07T11:44:56+01:00 misc/examples/kemi: native config upated --- Modified: misc/examples/kemi/kamailio-basic-kemi-native.cfg --- Diff: https://github.com/kamailio/kamailio/commit/7f9547ae2b5a5848f693544124f199f… Patch: https://github.com/kamailio/kamailio/commit/7f9547ae2b5a5848f693544124f199f… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-native.cfg b/misc/examples/kemi/kamailio-basic-kemi-native.cfg index c95517cc9e..984c45b877 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-native.cfg +++ b/misc/examples/kemi/kamailio-basic-kemi-native.cfg @@ -20,18 +20,20 @@ request_route { exit; } + # handle retransmissions + if (!is_method("ACK")) { + if(t_precheck_trans()) { + t_check_trans(); + exit; + } + t_check_trans(); + } + # handle requests within SIP dialogs route(WITHINDLG); ### only initial requests (no To tag) - # handle retransmissions - if(t_precheck_trans()) { - t_check_trans(); - exit; - } - t_check_trans(); - # authentication route(AUTH); @@ -86,8 +88,14 @@ route[RELAY] { # Per SIP request initial checks route[REQINIT] { + # no connect for sending replies + set_reply_no_connect(); + # enforce symmetric signaling + # - send back replies to the source address of request + force_rport(); + #!ifdef WITH_ANTIFLOOD - # flood dection from same IP and traffic ban for a while + # flood detection from same IP and traffic ban for a while # be sure you exclude checking trusted peers, such as pstn gateways # - local host excluded (e.g., loop to self) if(src_ip!=myself) { @@ -102,11 +110,12 @@ route[REQINIT] { exit; } } - if($ua =~ "friendly-scanner") { - sl_send_reply("200", "OK"); +#!endif + if($ua =~ "friendly|scanner|sipcli|sipvicious|VaxSIPUserAgent|pplsip") { + # silent drop for scanners - uncomment next line if want to reply + # sl_send_reply("200", "OK"); exit; } -#!endif if (!mf_process_maxfwd_header("10")) { sl_send_reply("483","Too Many Hops"); @@ -118,8 +127,8 @@ route[REQINIT] { exit; } - if(!sanity_check("1511", "7")) { - xlog("Malformed SIP message from $si:$sp\n"); + if(!sanity_check("17895", "7")) { + xlog("Malformed SIP request from $si:$sp\n"); exit; } }

1 0

Fosdem 2023 - CfP
by Daniel-Constantin Mierla 07 Dec '22

07 Dec '22

Hello, should anyone be interested to present or just go to FOSDEM 2023, note that it is going to take place in Brussels during February 4-5, 2023. With a increasing demand on topics to be covered, many more devrooms were accepted and Real Time Communication devroom has half a day available on the afternoon of February 5, 2023. The RTC Devroom call for presentations is open, more details at; - https://lists.fosdem.org/pipermail/fosdem/2022q4/003479.html Check also the other accepted devrooms, maybe one suits better for your work with open source nowadays and you can submit proposals to them: - https://fosdem.org/2023/news/2022-11-07-accepted-developer-rooms/ Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

git:master:0f3f0235: misc/examples/kemi: updated kamailio-basic-kemi-ruby.rb in sync with kemi samples
by Daniel-Constantin Mierla 07 Dec '22

07 Dec '22

Module: kamailio Branch: master Commit: 0f3f02353535034beaf84ea833cdd5bf30cd46a2 URL: https://github.com/kamailio/kamailio/commit/0f3f02353535034beaf84ea833cdd5b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-07T10:11:12+01:00 misc/examples/kemi: updated kamailio-basic-kemi-ruby.rb in sync with kemi samples --- Modified: misc/examples/kemi/kamailio-basic-kemi-ruby.rb --- Diff: https://github.com/kamailio/kamailio/commit/0f3f02353535034beaf84ea833cdd5b… Patch: https://github.com/kamailio/kamailio/commit/0f3f02353535034beaf84ea833cdd5b… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-ruby.rb b/misc/examples/kemi/kamailio-basic-kemi-ruby.rb index 37c6dddc34..30bb742332 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-ruby.rb +++ b/misc/examples/kemi/kamailio-basic-kemi-ruby.rb @@ -28,8 +28,6 @@ def ksr_request_route() return end - ksr_route_withindlg() - # Retransmissions if !KSR.is_ACK() then if KSR::TMX.t_precheck_trans() > 0 then @@ -39,7 +37,12 @@ def ksr_request_route() return if KSR::TM.t_check_trans() == 0 end - # Auth + # Handle requests within SIP dialogs + ksr_route_withindlg() + + # -- only initial requests (no To tag) + + # Authentication ksr_route_auth() # Record routing for dialog forming requests (in case they are routed) @@ -56,35 +59,16 @@ def ksr_request_route() # Registrations ksr_route_registrar() - # USRLOC - ksr_route_location() - - return -end - -def ksr_route_reqinit() - if KSR::COREX.has_user_agent() > 0 then - ua = KSR::PV.gete("$ua"); - if ua.include? 'friendly' or ua.include? 'scanner' or ua.include? 'sipcli' or ua.include? 'sipvicious' then - KSR::SL.sl_send_reply(200, "OK"); - exit - end + if KSR::COREX.has_ruri_user() < 0 then + # request with no Username in RURI + KSR::SL.sl_send_reply(484,"Address Incomplete"); + return; end - if KSR::MAXFWD.process_maxfwd(10) < 0 then - KSR::SL.sl_send_reply(483,"Too Many Hops"); - exit - end - - if KSR.is_OPTIONS() and KSR.is_myself_ruri() and KSR::COREX.has_ruri_user() < 0 then - KSR::SL.sl_send_reply(200, "Keepalive"); - exit - end + # User location service + ksr_route_location() - if KSR::SANITY.sanity_check(1511, 7) < 0 then - KSR.err("Malformed SIP message from #{KSR::PV.get('$si')}:#{KSR::PV.get('$sp')}\n"); - exit - end + return end def ksr_route_relay() @@ -111,6 +95,56 @@ def ksr_route_relay() exit end +def ksr_route_reqinit() + # no connect for sending replies + KSR.set_reply_no_connect(); + # enforce symmetric signaling + # send back replies to the source address of request + KSR.force_rport(); + + if !KSR.is_myself_srcip() then + srcip = KSR::KX.get_srcip(); + if KSR::HTABLE.sht_match_name("ipban", "eq", srcip) > 0 then + # ip is already blocked + KSR.dbg("request from blocked IP - " + KSR::KX.get_method() + + " from " + KSR::KX.get_furi() + " (IP:" + + srcip + ":" + KSR::KX.get_srcport() + ")\n"); + exit; + end + if KSR::PIKE.pike_check_req() < 0 then + KSR.err("ALERT: pike blocking " + KSR.kx.get_method() + + " from " + KSR::KX.get_furi() + " (IP:" + + srcip + ":" + KSR.kx.get_srcport() + ")\n"); + KSR::HTABLE.sht_seti("ipban", srcip, 1); + exit; + end + end + + if KSR::COREX.has_user_agent() > 0 then + ua = KSR::PV.gete("$ua"); + if ua.include? 'friendly' or ua.include? 'scanner' or + ua.include? 'sipcli' or ua.include? 'sipvicious' then + KSR::SL.sl_send_reply(200, "OK"); + exit + end + end + + if KSR::MAXFWD.process_maxfwd(10) < 0 then + KSR::SL.sl_send_reply(483,"Too Many Hops"); + exit + end + + if KSR.is_OPTIONS() and KSR.is_myself_ruri() and KSR::COREX.has_ruri_user() < 0 then + KSR::SL.sl_send_reply(200, "Keepalive"); + exit + end + + if KSR::SANITY.sanity_check(17895, 7) < 0 then + KSR.err("Malformed SIP message from #{KSR::PV.get('$si')}:#{KSR::PV.get('$sp')}\n"); + exit + end +end + def ksr_route_withindlg() return if KSR::SIPUTILS.has_totag() < 0

1 0

git:master:29c9d3af: misc/examples/kemi: fixed line break in kamailio-basic-kemi-ruby.rb
by Daniel-Constantin Mierla 07 Dec '22

07 Dec '22

Module: kamailio Branch: master Commit: 29c9d3af78656f4dba8e9517ab07d2f403327b08 URL: https://github.com/kamailio/kamailio/commit/29c9d3af78656f4dba8e9517ab07d2f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-07T09:12:23+01:00 misc/examples/kemi: fixed line break in kamailio-basic-kemi-ruby.rb --- Modified: misc/examples/kemi/kamailio-basic-kemi-ruby.rb --- Diff: https://github.com/kamailio/kamailio/commit/29c9d3af78656f4dba8e9517ab07d2f… Patch: https://github.com/kamailio/kamailio/commit/29c9d3af78656f4dba8e9517ab07d2f… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-ruby.rb b/misc/examples/kemi/kamailio-basic-kemi-ruby.rb index 2a3a9eca41..37c6dddc34 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-ruby.rb +++ b/misc/examples/kemi/kamailio-basic-kemi-ruby.rb @@ -65,8 +65,7 @@ def ksr_request_route() def ksr_route_reqinit() if KSR::COREX.has_user_agent() > 0 then ua = KSR::PV.gete("$ua"); - if ua.include? 'friendly' or ua.include? 'scanner' - or ua.include? 'sipcli' or ua.include? 'sipvicious' then + if ua.include? 'friendly' or ua.include? 'scanner' or ua.include? 'sipcli' or ua.include? 'sipvicious' then KSR::SL.sl_send_reply(200, "OK"); exit end

1 0

git:master:b1f9045f: app_python3: fetch tupple item to get parameters
by Daniel-Constantin Mierla 06 Dec '22

06 Dec '22

Module: kamailio Branch: master Commit: b1f9045fc4fa23ecd81689715ee469034755def8 URL: https://github.com/kamailio/kamailio/commit/b1f9045fc4fa23ecd81689715ee4690… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-06T13:16:51+01:00 app_python3: fetch tupple item to get parameters --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/b1f9045fc4fa23ecd81689715ee4690… Patch: https://github.com/kamailio/kamailio/commit/b1f9045fc4fa23ecd81689715ee4690… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index def52db092..71bc849e11 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -278,7 +278,7 @@ PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, PyObject *arg LM_ERR("invalid number of parameters - idx: %d argc: %d\n", i, (int)alen); return sr_kemi_apy_return_false(); } - pobj = PyList_GetItem(args, i); + pobj = PyTuple_GetItem(args, i); if(pobj==NULL) { LM_ERR("null parameter - func: %.*s idx: %d argc: %d\n", fname.len, fname.s, i, (int)alen);

1 0

git:5.5:6816f807: pv_headers: fix t_resume scenario
by Victor Seva 06 Dec '22

06 Dec '22

Module: kamailio Branch: 5.5 Commit: 6816f8070c931adba83e93616e29fb7fb70d84f0 URL: https://github.com/kamailio/kamailio/commit/6816f8070c931adba83e93616e29fb7… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-12-06T12:07:22+01:00 pv_headers: fix t_resume scenario (cherry picked from commit af1d9c156e0a69c9e3f39a063f7dd97d1c0a7bf1) (cherry picked from commit 0b52ac67fe12fab9127f30711313470257d32eaa) --- Modified: src/modules/pv_headers/pv_headers.c --- Diff: https://github.com/kamailio/kamailio/commit/6816f8070c931adba83e93616e29fb7… Patch: https://github.com/kamailio/kamailio/commit/6816f8070c931adba83e93616e29fb7… --- diff --git a/src/modules/pv_headers/pv_headers.c b/src/modules/pv_headers/pv_headers.c index 6dfac3d18be..daf223c15c2 100644 --- a/src/modules/pv_headers/pv_headers.c +++ b/src/modules/pv_headers/pv_headers.c @@ -65,6 +65,7 @@ static void mod_destroy(void); static int mod_init(void); static void handle_tm_t(tm_cell_t *t, int type, struct tmcb_params *params); +static int handle_msg_failed_cb(struct sip_msg *msg, unsigned int flags, void *cb); static int handle_msg_cb(struct sip_msg *msg, unsigned int flags, void *cb); static int handle_msg_branch_cb( struct sip_msg *msg, unsigned int flags, void *cb); @@ -315,6 +316,12 @@ int mod_init(void) LM_ERR("cannot register PRE_SCRIPT_CB ONREPLY_CB callbacks\n"); return -1; } + if(register_script_cb( + handle_msg_failed_cb, PRE_SCRIPT_CB | FAILURE_CB, 0) + < 0) { + LM_ERR("cannot register PRE_SCRIPT_CB FAILURE_CB callbacks\n"); + return -1; + } } pvh_str_hash_init(&skip_headers, &skip_headers_param, "skip_headers"); @@ -392,6 +399,29 @@ static inline char *tm_type_to_string(int type) return "UNKNOWN"; } +static inline void print_cb_flags(unsigned int flags) +{ + LM_DBG("flags:"); + if(flags & REQUEST_CB) + LM_DBG("REQUEST_CB"); + if(flags & FAILURE_CB) + LM_DBG("FAILURE_CB"); + if(flags & ONREPLY_CB) + LM_DBG("ONREPLY_CB"); + if(flags & BRANCH_CB) + LM_DBG("BRANCH_CB"); + if(flags & ONSEND_CB) + LM_DBG("ONSEND_CB"); + if(flags & ERROR_CB) + LM_DBG("ERROR_CB"); + if(flags & LOCAL_CB) + LM_DBG("LOCAL_CB"); + if(flags & EVENT_CB) + LM_DBG("EVENT_CB"); + if(flags & BRANCH_FAILURE_CB) + LM_DBG("BRANCH_FAILURE_CB"); +} + void handle_tm_t(tm_cell_t *t, int type, struct tmcb_params *params) { struct sip_msg *msg = NULL; @@ -421,11 +451,25 @@ void handle_tm_t(tm_cell_t *t, int type, struct tmcb_params *params) return; } +int handle_msg_failed_cb(struct sip_msg *msg, unsigned int flags, void *cb) +{ + print_cb_flags(flags); + + if(pvh_parse_msg(msg) != 0) + return 1; + + _branch = 0; + LM_DBG("msg:%p set branch:%d\n", msg, _branch); + return 1; +} + static int msg_cbs = TMCB_REQUEST_FWDED | TMCB_RESPONSE_FWDED | TMCB_ON_BRANCH_FAILURE; int handle_msg_cb(struct sip_msg *msg, unsigned int flags, void *cb) { + print_cb_flags(flags); + if(pvh_parse_msg(msg) != 0) return 1; @@ -444,6 +488,7 @@ int handle_msg_branch_cb(struct sip_msg *msg, unsigned int flags, void *cb) { LM_DBG("msg:%p previous branch:%d\n", msg, _branch); + print_cb_flags(flags); if(flags & PRE_SCRIPT_CB) { pvh_get_branch_index(msg, &_branch); @@ -462,7 +507,11 @@ int handle_msg_reply_cb(struct sip_msg *msg, unsigned int flags, void *cb) if(pvh_parse_msg(msg) != 0) return 1; + if(msg == FAKED_REPLY) { + LM_DBG("FAKED_REPLY\n"); + } LM_DBG("msg:%p previous branch:%d\n", msg, _branch); + print_cb_flags(flags); if(tmb.t_check(msg, &_branch) == -1) { LM_ERR("failed find UAC branch\n");

1 0

git:5.6:0b52ac67: pv_headers: fix t_resume scenario
by Victor Seva 06 Dec '22

06 Dec '22

Module: kamailio Branch: 5.6 Commit: 0b52ac67fe12fab9127f30711313470257d32eaa URL: https://github.com/kamailio/kamailio/commit/0b52ac67fe12fab9127f30711313470… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-12-06T12:06:28+01:00 pv_headers: fix t_resume scenario (cherry picked from commit af1d9c156e0a69c9e3f39a063f7dd97d1c0a7bf1) --- Modified: src/modules/pv_headers/pv_headers.c --- Diff: https://github.com/kamailio/kamailio/commit/0b52ac67fe12fab9127f30711313470… Patch: https://github.com/kamailio/kamailio/commit/0b52ac67fe12fab9127f30711313470… --- diff --git a/src/modules/pv_headers/pv_headers.c b/src/modules/pv_headers/pv_headers.c index e555e0265bb..3648335b9ef 100644 --- a/src/modules/pv_headers/pv_headers.c +++ b/src/modules/pv_headers/pv_headers.c @@ -65,6 +65,7 @@ static void mod_destroy(void); static int mod_init(void); static void handle_tm_t(tm_cell_t *t, int type, struct tmcb_params *params); +static int handle_msg_failed_cb(struct sip_msg *msg, unsigned int flags, void *cb); static int handle_msg_cb(struct sip_msg *msg, unsigned int flags, void *cb); static int handle_msg_branch_cb( struct sip_msg *msg, unsigned int flags, void *cb); @@ -385,6 +386,12 @@ int mod_init(void) LM_ERR("cannot register PRE_SCRIPT_CB ONREPLY_CB callbacks\n"); return -1; } + if(register_script_cb( + handle_msg_failed_cb, PRE_SCRIPT_CB | FAILURE_CB, 0) + < 0) { + LM_ERR("cannot register PRE_SCRIPT_CB FAILURE_CB callbacks\n"); + return -1; + } } pvh_str_hash_init(&skip_headers, &skip_headers_param, "skip_headers"); @@ -462,6 +469,29 @@ static inline char *tm_type_to_string(int type) return "UNKNOWN"; } +static inline void print_cb_flags(unsigned int flags) +{ + LM_DBG("flags:"); + if(flags & REQUEST_CB) + LM_DBG("REQUEST_CB"); + if(flags & FAILURE_CB) + LM_DBG("FAILURE_CB"); + if(flags & ONREPLY_CB) + LM_DBG("ONREPLY_CB"); + if(flags & BRANCH_CB) + LM_DBG("BRANCH_CB"); + if(flags & ONSEND_CB) + LM_DBG("ONSEND_CB"); + if(flags & ERROR_CB) + LM_DBG("ERROR_CB"); + if(flags & LOCAL_CB) + LM_DBG("LOCAL_CB"); + if(flags & EVENT_CB) + LM_DBG("EVENT_CB"); + if(flags & BRANCH_FAILURE_CB) + LM_DBG("BRANCH_FAILURE_CB"); +} + void handle_tm_t(tm_cell_t *t, int type, struct tmcb_params *params) { struct sip_msg *msg = NULL; @@ -491,11 +521,25 @@ void handle_tm_t(tm_cell_t *t, int type, struct tmcb_params *params) return; } +int handle_msg_failed_cb(struct sip_msg *msg, unsigned int flags, void *cb) +{ + print_cb_flags(flags); + + if(pvh_parse_msg(msg) != 0) + return 1; + + _branch = 0; + LM_DBG("msg:%p set branch:%d\n", msg, _branch); + return 1; +} + static int msg_cbs = TMCB_REQUEST_FWDED | TMCB_RESPONSE_FWDED | TMCB_ON_BRANCH_FAILURE; int handle_msg_cb(struct sip_msg *msg, unsigned int flags, void *cb) { + print_cb_flags(flags); + if(pvh_parse_msg(msg) != 0) return 1; @@ -514,6 +558,7 @@ int handle_msg_branch_cb(struct sip_msg *msg, unsigned int flags, void *cb) { LM_DBG("msg:%p previous branch:%d\n", msg, _branch); + print_cb_flags(flags); if(flags & PRE_SCRIPT_CB) { pvh_get_branch_index(msg, &_branch); @@ -532,7 +577,11 @@ int handle_msg_reply_cb(struct sip_msg *msg, unsigned int flags, void *cb) if(pvh_parse_msg(msg) != 0) return 1; + if(msg == FAKED_REPLY) { + LM_DBG("FAKED_REPLY\n"); + } LM_DBG("msg:%p previous branch:%d\n", msg, _branch); + print_cb_flags(flags); if(tmb.t_check(msg, &_branch) == -1) { LM_ERR("failed find UAC branch\n");

1 0

git:master:af1d9c15: pv_headers: fix t_resume scenario
by Victor Seva 06 Dec '22

06 Dec '22

Module: kamailio Branch: master Commit: af1d9c156e0a69c9e3f39a063f7dd97d1c0a7bf1 URL: https://github.com/kamailio/kamailio/commit/af1d9c156e0a69c9e3f39a063f7dd97… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-12-06T12:02:13+01:00 pv_headers: fix t_resume scenario --- Modified: src/modules/pv_headers/pv_headers.c --- Diff: https://github.com/kamailio/kamailio/commit/af1d9c156e0a69c9e3f39a063f7dd97… Patch: https://github.com/kamailio/kamailio/commit/af1d9c156e0a69c9e3f39a063f7dd97… --- diff --git a/src/modules/pv_headers/pv_headers.c b/src/modules/pv_headers/pv_headers.c index b900ae5be6..246339f8ef 100644 --- a/src/modules/pv_headers/pv_headers.c +++ b/src/modules/pv_headers/pv_headers.c @@ -65,6 +65,7 @@ static void mod_destroy(void); static int mod_init(void); static void handle_tm_t(tm_cell_t *t, int type, struct tmcb_params *params); +static int handle_msg_failed_cb(struct sip_msg *msg, unsigned int flags, void *cb); static int handle_msg_cb(struct sip_msg *msg, unsigned int flags, void *cb); static int handle_msg_branch_cb( struct sip_msg *msg, unsigned int flags, void *cb); @@ -385,6 +386,12 @@ int mod_init(void) LM_ERR("cannot register PRE_SCRIPT_CB ONREPLY_CB callbacks\n"); return -1; } + if(register_script_cb( + handle_msg_failed_cb, PRE_SCRIPT_CB | FAILURE_CB, 0) + < 0) { + LM_ERR("cannot register PRE_SCRIPT_CB FAILURE_CB callbacks\n"); + return -1; + } } pvh_str_hash_init(&skip_headers, &skip_headers_param, "skip_headers"); @@ -462,6 +469,29 @@ static inline char *tm_type_to_string(int type) return "UNKNOWN"; } +static inline void print_cb_flags(unsigned int flags) +{ + LM_DBG("flags:"); + if(flags & REQUEST_CB) + LM_DBG("REQUEST_CB"); + if(flags & FAILURE_CB) + LM_DBG("FAILURE_CB"); + if(flags & ONREPLY_CB) + LM_DBG("ONREPLY_CB"); + if(flags & BRANCH_CB) + LM_DBG("BRANCH_CB"); + if(flags & ONSEND_CB) + LM_DBG("ONSEND_CB"); + if(flags & ERROR_CB) + LM_DBG("ERROR_CB"); + if(flags & LOCAL_CB) + LM_DBG("LOCAL_CB"); + if(flags & EVENT_CB) + LM_DBG("EVENT_CB"); + if(flags & BRANCH_FAILURE_CB) + LM_DBG("BRANCH_FAILURE_CB"); +} + void handle_tm_t(tm_cell_t *t, int type, struct tmcb_params *params) { struct sip_msg *msg = NULL; @@ -491,11 +521,25 @@ void handle_tm_t(tm_cell_t *t, int type, struct tmcb_params *params) return; } +int handle_msg_failed_cb(struct sip_msg *msg, unsigned int flags, void *cb) +{ + print_cb_flags(flags); + + if(pvh_parse_msg(msg) != 0) + return 1; + + _branch = 0; + LM_DBG("msg:%p set branch:%d\n", msg, _branch); + return 1; +} + static int msg_cbs = TMCB_REQUEST_FWDED | TMCB_RESPONSE_FWDED | TMCB_ON_BRANCH_FAILURE; int handle_msg_cb(struct sip_msg *msg, unsigned int flags, void *cb) { + print_cb_flags(flags); + if(pvh_parse_msg(msg) != 0) return 1; @@ -514,6 +558,7 @@ int handle_msg_branch_cb(struct sip_msg *msg, unsigned int flags, void *cb) { LM_DBG("msg:%p previous branch:%d\n", msg, _branch); + print_cb_flags(flags); if(flags & PRE_SCRIPT_CB) { pvh_get_branch_index(msg, &_branch); @@ -533,7 +578,11 @@ int handle_msg_reply_cb(struct sip_msg *msg, unsigned int flags, void *cb) if(pvh_parse_msg(msg) != 0) return 1; + if(msg == FAKED_REPLY) { + LM_DBG("FAKED_REPLY\n"); + } LM_DBG("msg:%p previous branch:%d\n", msg, _branch); + print_cb_flags(flags); t = tmb.t_find(msg, &_branch, &vref); if(t != NULL && t != T_UNDEFINED) {

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