sr-dev December 2022

sr-dev@lists.kamailio.org

11 participants
264 discussions

git:master:0f3f0235: misc/examples/kemi: updated kamailio-basic-kemi-ruby.rb in sync with kemi samples

by Daniel-Constantin Mierla

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 year, 5 months

git:master:29c9d3af: misc/examples/kemi: fixed line break in kamailio-basic-kemi-ruby.rb

by Daniel-Constantin Mierla

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 year, 5 months

git:master:b1f9045f: app_python3: fetch tupple item to get parameters

by Daniel-Constantin Mierla

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 year, 5 months

git:5.5:6816f807: pv_headers: fix t_resume scenario

by Victor Seva

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 year, 5 months

git:5.6:0b52ac67: pv_headers: fix t_resume scenario

by Victor Seva

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 year, 5 months

git:master:af1d9c15: pv_headers: fix t_resume scenario

by Victor Seva

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 year, 5 months

git:master:3b9eee82: modules: readme files regenerated - app_python3s ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 3b9eee82d604c14b60d5153e2a8bf356ddf99e0d URL: https://github.com/kamailio/kamailio/commit/3b9eee82d604c14b60d5153e2a8bf35… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-12-06T11:01:19+01:00 modules: readme files regenerated - app_python3s ... [skip ci] --- Modified: src/modules/app_python3s/README --- Diff: https://github.com/kamailio/kamailio/commit/3b9eee82d604c14b60d5153e2a8bf35… Patch: https://github.com/kamailio/kamailio/commit/3b9eee82d604c14b60d5153e2a8bf35… --- diff --git a/src/modules/app_python3s/README b/src/modules/app_python3s/README index bc012053a6..5b8d663797 100644 --- a/src/modules/app_python3s/README +++ b/src/modules/app_python3s/README @@ -27,6 +27,7 @@ Daniel-Constantin Mierla 3.1. load (string) 3.2. script_init (string) + 3.3. script_child_init (string) 4. Functions @@ -43,7 +44,8 @@ Daniel-Constantin Mierla 1.1. Set load parameter 1.2. Set script_init parameter - 1.3. app_python3s_exec usage + 1.3. Set script_child_init parameter + 1.4. app_python3s_exec usage Chapter 1. Admin Guide @@ -59,6 +61,7 @@ Chapter 1. Admin Guide 3.1. load (string) 3.2. script_init (string) + 3.3. script_child_init (string) 4. Functions @@ -114,6 +117,7 @@ Chapter 1. Admin Guide 3.1. load (string) 3.2. script_init (string) + 3.3. script_child_init (string) 3.1. load (string) @@ -143,6 +147,22 @@ def ksr_script_init(): return 1 ... +3.3. script_child_init (string) + + The name of the Python function to be executed when Kamailio forks + child processes at startup and when the script is reloaded. + + Default value is “” (not set). + + Example 1.3. Set script_child_init parameter +... +modparam("app_python3s", "script_child_init", "ksr_script_child_init") +... +def ksr_script_child_init(): + KSR.info("child init python script\n") + return 1 +... + 4. Functions 4.1. app_python3s_exec(method [, param]) @@ -155,7 +175,7 @@ def ksr_script_init(): Both parameters can contain pseudo-variables. - Example 1.3. app_python3s_exec usage + Example 1.4. app_python3s_exec usage ... app_python3s_exec("my_python_function"); app_python3s_exec("my_python_function", "my_params");

1 year, 5 months

git:master:d79e0089: app_python3s: docs for script_child_init parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d79e00892760f296c851740b33f8df3b5a6324ad URL: https://github.com/kamailio/kamailio/commit/d79e00892760f296c851740b33f8df3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-06T10:55:20+01:00 app_python3s: docs for script_child_init parameter --- Modified: src/modules/app_python3s/doc/app_python3s_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d79e00892760f296c851740b33f8df3… Patch: https://github.com/kamailio/kamailio/commit/d79e00892760f296c851740b33f8df3… --- diff --git a/src/modules/app_python3s/doc/app_python3s_admin.xml b/src/modules/app_python3s/doc/app_python3s_admin.xml index 6d7af04a60..bba47655e2 100644 --- a/src/modules/app_python3s/doc/app_python3s_admin.xml +++ b/src/modules/app_python3s/doc/app_python3s_admin.xml @@ -104,7 +104,7 @@ modparam("app_python3s", "load", "/usr/local/etc/kamailio/myscript.py") </programlisting> </example> </section> - <section id="app_python3s.p.load"> + <section id="app_python3s.p.script_init"> <title><varname>script_init</varname> (string)</title> <para> The name of the Python function to be executed when the script is @@ -125,6 +125,30 @@ def ksr_script_init(): KSR.info("init python script\n") return 1 ... +</programlisting> + </example> + </section> + <section id="app_python3s.p.script_child_init"> + <title><varname>script_child_init</varname> (string)</title> + <para> + The name of the Python function to be executed when &kamailio; forks + child processes at startup and when the script is reloaded. + </para> + <para> + <emphasis> + Default value is <quote></quote> (not set). + </emphasis> + </para> + <example> + <title>Set <varname>script_child_init</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("app_python3s", "script_child_init", "ksr_script_child_init") +... +def ksr_script_child_init(): + KSR.info("child init python script\n") + return 1 +... </programlisting> </example> </section>

1 year, 5 months

git:master:b7bae49f: app_python3s: new parameter script_child_init

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b7bae49f9b522f223932375e8e3087a7d2a893f5 URL: https://github.com/kamailio/kamailio/commit/b7bae49f9b522f223932375e8e3087a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-06T10:55:20+01:00 app_python3s: new parameter script_child_init - specify the name of the function to be executed on child fork and reload of script --- Modified: src/modules/app_python3s/app_python3s_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b7bae49f9b522f223932375e8e3087a… Patch: https://github.com/kamailio/kamailio/commit/b7bae49f9b522f223932375e8e3087a… --- diff --git a/src/modules/app_python3s/app_python3s_mod.c b/src/modules/app_python3s/app_python3s_mod.c index aa2f1b1460..ba68d019e2 100644 --- a/src/modules/app_python3s/app_python3s_mod.c +++ b/src/modules/app_python3s/app_python3s_mod.c @@ -39,6 +39,7 @@ MODULE_VERSION str _sr_python_load_file = str_init("/usr/local/etc/" NAME "/" NAME ".py"); str _sr_apy3s_script_init = str_init(""); +str _sr_apy3s_script_child_init = str_init(""); static int mod_init(void); static int child_init(int rank); @@ -57,10 +58,13 @@ int _apy3s_process_rank = 0; PyThreadState *myThreadState = NULL; +int apy3s_script_init_exec(PyObject* pModule, str *fname, int *vparam); + /** module parameters */ static param_export_t params[]={ {"load", PARAM_STR, &_sr_python_load_file }, {"script_init", PARAM_STR, &_sr_apy3s_script_init }, + {"script_child_init", PARAM_STR, &_sr_apy3s_script_child_init }, {0,0,0} }; @@ -210,7 +214,8 @@ static int child_init(int rank) if (cfg_child_init()) { return -1; } - return 0; + return apy3s_script_init_exec(_sr_apy3s_handler_script, + &_sr_apy3s_script_child_init, &rank); } /** @@ -256,9 +261,12 @@ int w_app_python3s_exec2(sip_msg_t *_msg, char *pmethod, char *pparam) return apy3s_exec_func(_msg, method.s, param.s, 1); } -int apy3s_script_init_exec(PyObject* pModule, str *fname, int *rank) +/** + * + */ +int apy3s_script_init_exec(PyObject* pModule, str *fname, int *vparam) { - PyObject *pFunc, *pArgs, *pHandler; + PyObject *pFunc, *pArgs, *pHandler, *pValue; PyGILState_STATE gstate; int rval = -1; @@ -281,11 +289,30 @@ int apy3s_script_init_exec(PyObject* pModule, str *fname, int *rank) goto error; } - pArgs = PyTuple_New(0); - if (pArgs == NULL) { - apy3s_handle_exception("script_init"); - Py_DECREF(pFunc); - goto error; + if(vparam==NULL) { + pArgs = PyTuple_New(0); + if (pArgs == NULL) { + apy3s_handle_exception("script_init"); + Py_DECREF(pFunc); + goto error; + } + } else { + pArgs = PyTuple_New(1); + if (pArgs == NULL) { + apy3s_handle_exception("script_init"); + Py_DECREF(pFunc); + goto error; + } + + pValue = PyLong_FromLong((long)(*vparam)); + if (pValue == NULL) { + apy3s_handle_exception("script_init"); + Py_DECREF(pArgs); + Py_DECREF(pFunc); + goto error; + } + /* pValue moved to pArgs - no direct dec ref */ + PyTuple_SetItem(pArgs, 0, pValue); } pHandler = PyObject_CallObject(pFunc, pArgs); @@ -318,6 +345,9 @@ int apy3s_script_init_exec(PyObject* pModule, str *fname, int *rank) return rval; } +/** + * + */ int apy_reload_script(void) { PyGILState_STATE gstate; @@ -330,24 +360,33 @@ int apy_reload_script(void) PyErr_Format(PyExc_ImportError, "Reload module '%s'", _sr_apy3s_bname); apy3s_handle_exception("reload_script"); Py_DECREF(_sr_apy3s_format_exc_obj); - goto err; + goto error; } if (apy3s_script_init_exec(pModule, &_sr_apy3s_script_init, NULL)) { LM_ERR("Error calling mod_init on reload\n"); Py_DECREF(pModule); - goto err; + goto error; } Py_DECREF(_sr_apy3s_handler_script); _sr_apy3s_handler_script = pModule; + if(apy3s_script_init_exec(pModule, &_sr_apy3s_script_child_init, + &_apy3s_process_rank)<0) { + LM_ERR("Failed to run child init callback\n"); + goto error; + } rval = 0; -err: + +error: PyGILState_Release(gstate); return rval; } #define INTERNAL_VERSION "1008\n" +/** + * + */ int apy_load_script(void) { PyObject *sys_path, *pDir, *pModule;

1 year, 5 months

git:master:cc96ebfa: app_python3s: more generic form of the function executing script init callback

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cc96ebfa7f4bebf45b368ee69dc4f9612575ee9b URL: https://github.com/kamailio/kamailio/commit/cc96ebfa7f4bebf45b368ee69dc4f96… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-12-06T10:55:20+01:00 app_python3s: more generic form of the function executing script init callback --- Modified: src/modules/app_python3s/app_python3s_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cc96ebfa7f4bebf45b368ee69dc4f96… Patch: https://github.com/kamailio/kamailio/commit/cc96ebfa7f4bebf45b368ee69dc4f96… --- diff --git a/src/modules/app_python3s/app_python3s_mod.c b/src/modules/app_python3s/app_python3s_mod.c index 77c9665b53..aa2f1b1460 100644 --- a/src/modules/app_python3s/app_python3s_mod.c +++ b/src/modules/app_python3s/app_python3s_mod.c @@ -256,27 +256,26 @@ int w_app_python3s_exec2(sip_msg_t *_msg, char *pmethod, char *pparam) return apy3s_exec_func(_msg, method.s, param.s, 1); } -int apy3s_script_init(PyObject* pModule) +int apy3s_script_init_exec(PyObject* pModule, str *fname, int *rank) { PyObject *pFunc, *pArgs, *pHandler; PyGILState_STATE gstate; int rval = -1; - if(_sr_apy3s_script_init.len<=0) { + if(fname==NULL || fname->len<=0) { return 0; } - LM_DBG("script init callback: %.*s()\n", _sr_apy3s_script_init.len, - _sr_apy3s_script_init.s); + LM_DBG("script init callback: %.*s()\n", fname->len, fname->s); gstate = PyGILState_Ensure(); - pFunc = PyObject_GetAttrString(pModule, _sr_apy3s_script_init.s); + pFunc = PyObject_GetAttrString(pModule, fname->s); /* pFunc is a new reference */ if (pFunc == NULL || !PyCallable_Check(pFunc)) { if (!PyErr_Occurred()) PyErr_Format(PyExc_AttributeError, "'module' object '%s' has no attribute '%s'", - _sr_apy3s_bname, _sr_apy3s_script_init.s); + _sr_apy3s_bname, fname->s); apy3s_handle_exception("script_init"); Py_XDECREF(pFunc); goto error; @@ -307,7 +306,7 @@ int apy3s_script_init(PyObject* pModule) PyErr_Format(PyExc_TypeError, "Function '%s' of module '%s' has returned not returned" " object. Should be a class instance.", - _sr_apy3s_script_init.s, _sr_apy3s_bname); + fname->s, _sr_apy3s_bname); apy3s_handle_exception("script_init"); Py_DECREF(pHandler); goto error; @@ -333,7 +332,7 @@ int apy_reload_script(void) Py_DECREF(_sr_apy3s_format_exc_obj); goto err; } - if (apy3s_script_init(pModule)) { + if (apy3s_script_init_exec(pModule, &_sr_apy3s_script_init, NULL)) { LM_ERR("Error calling mod_init on reload\n"); Py_DECREF(pModule); goto err; @@ -422,7 +421,7 @@ int apy_load_script(void) Py_DECREF(_sr_apy3s_format_exc_obj); goto err; } - if (apy3s_script_init(pModule) != 0) { + if (apy3s_script_init_exec(pModule, &_sr_apy3s_script_init, NULL) != 0) { LM_ERR("failed calling script init callback function\n"); Py_DECREF(pModule); goto err;

1 year, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2022