sr-dev

sr-dev@lists.kamailio.org

21 participants
45185 discussions

git:master:a9a8aa21: modules: readme files regenerated - keepalive ... [skip ci]
by Kamailio Dev 24 Aug '20

24 Aug '20

Module: kamailio Branch: master Commit: a9a8aa21e272d758bd96a234c4e5b98179f8b5ba URL: https://github.com/kamailio/kamailio/commit/a9a8aa21e272d758bd96a234c4e5b98… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-08-24T09:46:15+02:00 modules: readme files regenerated - keepalive ... [skip ci] --- Modified: src/modules/keepalive/README --- Diff: https://github.com/kamailio/kamailio/commit/a9a8aa21e272d758bd96a234c4e5b98… Patch: https://github.com/kamailio/kamailio/commit/a9a8aa21e272d758bd96a234c4e5b98…

1 0

[kamailio/kamailio] ka_add_destination, ka_del_destination requires owner param (#2438)
by sagarmalam 24 Aug '20

24 Aug '20

ka_add_destination, ka_del_destination requires owner param.   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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) - [ ] 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/2438 -- Commit Summary -- * ka_add_destination, ka_del_destination requires owner param -- File Changes -- M src/modules/keepalive/README (52) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2438.patch https://github.com/kamailio/kamailio/pull/2438.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2438

2 3

git:master:7284a611: keepalive: docs - documented owner parameter for add/delete functions
by Daniel-Constantin Mierla 24 Aug '20

24 Aug '20

Module: kamailio Branch: master Commit: 7284a61125bb0cacd1adc2289af616061df03258 URL: https://github.com/kamailio/kamailio/commit/7284a61125bb0cacd1adc2289af6160… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-24T09:35:19+02:00 keepalive: docs - documented owner parameter for add/delete functions - related to GH #2438 --- Modified: src/modules/keepalive/doc/keepalive_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7284a61125bb0cacd1adc2289af6160… Patch: https://github.com/kamailio/kamailio/commit/7284a61125bb0cacd1adc2289af6160… --- diff --git a/src/modules/keepalive/doc/keepalive_admin.xml b/src/modules/keepalive/doc/keepalive_admin.xml index 98e55222ea..5b74c6e4cc 100644 --- a/src/modules/keepalive/doc/keepalive_admin.xml +++ b/src/modules/keepalive/doc/keepalive_admin.xml @@ -169,10 +169,22 @@ if(ka_is_alive("192.168.10.20") == 1) { </section> <section id="keepalive.ka_add_destination"> <title> - <function moreinfo="none">ka_add_destination(sip_uri)</function> + <function moreinfo="none">ka_add_destination(sip_uri, owner)</function> </title> <para> - Adds destination sip/sips uri in memory list to keep alive . + Adds SIP URI in the memory destinations list to perform keep alive to it. + </para> + <para> + Meaning of the parameters: + <itemizedlist> + <listitem>sip_uri (string) - address of destination to monitor. + Valid format is [protoschema:]ip[:port], with: 'protoschema' being + one of 'sip' or 'sips' (SIP over TLS) - if omitted, 'sip'is used + by default; 'port' is optional (using default standard port 5060 + for sip and 5061 for sips)</listitem> + <listitem>owner (string) - module name “owning” the destination + (for informational purpose)</listitem> + </itemizedlist> </para> <para> Returned value: @@ -185,25 +197,38 @@ if(ka_is_alive("192.168.10.20") == 1) { This function can be used from REQUEST_ROUTE,BRANCH_ROUTE,ONREPLY_ROUTE. </para> <example> - <title><function>ka_add_destination(sip_uri)</function> usage</title> + <title><function>ka_add_destination(sip_uri, ownder)</function> usage</title> <programlisting format="linespecific"> ... $avp(duri1)="sip:192.168.1.10:5060;transport=tcp"; $avp(duri2)="sip:192.168.1.11:5061"; $avp(duri3)="sip:192.168.1.12" -ka_add_destination("$avp(duri3)"); -ka_add_destination("sip:192.168.1.10:5060;transport=tcp"); +ka_add_destination("$avp(duri3)", "config"); +ka_add_destination("sip:192.168.1.10:5060;transport=tcp", "config"); ... </programlisting> </example> </section> <section id="keepalive.ka_del_destination"> <title> - <function moreinfo="none">ka_del_destination(sip_uri)</function> + <function moreinfo="none">ka_del_destination(sip_uri, owner)</function> </title> <para> - Deletes destination sip/sips uri in memory list . + Deletes the SIP URI from the memory destinations list used for monitoring. </para> + <para> + Meaning of the parameters: + <itemizedlist> + <listitem>sip_uri (string) - address of monitored destination. + Valid format is [protoschema:]ip[:port], with: 'protoschema' being + one of 'sip' or 'sips' (SIP over TLS) - if omitted, 'sip'is used + by default; 'port' is optional (using default standard port 5060 + for sip and 5061 for sips)</listitem> + <listitem>owner (string) - module name “owning” the destination + (for informational purpose)</listitem> + </itemizedlist> + </para> + <para> Returned value: <itemizedlist> @@ -215,14 +240,14 @@ ka_add_destination("sip:192.168.1.10:5060;transport=tcp"); This function can be used from ANY_ROUTE. </para> <example> - <title><function>ka_del_destination(sip_uri)</function> usage</title> + <title><function>ka_del_destination(sip_uri, owner)</function> usage</title> <programlisting format="linespecific"> ... $avp(duri1)="sip:192.168.1.10:5060;transport=tcp"; $avp(duri2)="sip:192.168.1.11:5061"; $avp(duri3)="sip:192.168.1.12" -ka_del_destination("$avp(duri3)"); -ka_del_destination("sip:192.168.1.10:5060;transport=tcp"); +ka_del_destination("$avp(duri3)", "config"); +ka_del_destination("sip:192.168.1.10:5060;transport=tcp", "config"); ... </programlisting> </example>

1 0

[kamailio/kamailio] WIP acc: add to-tag for locally generated replies (#2422)
by Julien Chavanton 24 Aug '20

24 Aug '20

#### 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) - [x] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description When doing t_reply/send_reply stateful, the ACC module will not add the to-tag to the ACC events. This patch will fix this and ensure that we get the to-tag that was locally generated used in the reply. example : ``` modparam("acc", "acc_prepare_always", 1) modparam("acc_json", "acc_missed_flag", 6) failure_route[test] { setflag(6); // MISSED_ACC, the failure will be recorded by ACC t_flush_flags(); // This will set the flags in the newly created transaction t_reply("500", "Service Unavailable"); } ``` This does generate an ACC event, however the to-tag is not populated, my guess this is because the TM callback is done before the to-tag is generated. This patch will populate the to-tag immediately. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2422 -- Commit Summary -- * acc: add to-tag for locally generated replies -- File Changes -- M src/modules/acc/acc.c (7) M src/modules/acc/acc_api.h (1) M src/modules/acc/acc_logic.c (20) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2422.patch https://github.com/kamailio/kamailio/pull/2422.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2422

2 13

git:master:c5f6ff37: acc: use sent reason phrase for locally generated
by Julien Chavanton 24 Aug '20

24 Aug '20

Module: kamailio Branch: master Commit: c5f6ff37f61f99e0ec9322d9dc3c4a48af8f1b59 URL: https://github.com/kamailio/kamailio/commit/c5f6ff37f61f99e0ec9322d9dc3c4a4… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2020-08-12T14:40:42-07:00 acc: use sent reason phrase for locally generated replies --- Modified: src/modules/acc/acc_logic.c --- Diff: https://github.com/kamailio/kamailio/commit/c5f6ff37f61f99e0ec9322d9dc3c4a4… Patch: https://github.com/kamailio/kamailio/commit/c5f6ff37f61f99e0ec9322d9dc3c4a4… --- diff --git a/src/modules/acc/acc_logic.c b/src/modules/acc/acc_logic.c index 818c7aa101..e045b8c95a 100644 --- a/src/modules/acc/acc_logic.c +++ b/src/modules/acc/acc_logic.c @@ -93,6 +93,28 @@ void env_set_totag(struct cell *t, struct sip_msg *reply) tmb.t_get_reply_totag(t->uas.request, &acc_env.to_tag); } +int env_set_reason(struct sip_msg *reply, str *buff) { + int i; + char *p; + if (reply!=FAKED_REPLY || !buff || !buff->s || buff->len < 20) + return 0; + if (strncmp(buff->s, "SIP/2.0 ", 8) != 0) { + LM_ERR("not a SIP reply\n"); + return 0; + } + p = buff->s + 12; + for (i=12;i<buff->len;i++) { + if (*p == '\r' || *p == '\n') { + acc_env.reason.s = buff->s+12; + acc_env.reason.len = i-12; + LM_DBG("reason[%.*s]\n", acc_env.reason.len, acc_env.reason.s); + return 1; + } + p++; + } + return 0; +} + static inline void env_set_to(struct hdr_field *to) { acc_env.to = to; @@ -117,8 +139,10 @@ static inline void env_set_code_status( int code, struct sip_msg *reply) acc_env.code_s.s = int2bstr((unsigned long)code, code_buf, &acc_env.code_s.len); /* reason */ - acc_env.reason.s = error_text(code); - acc_env.reason.len = strlen(acc_env.reason.s); + if (acc_env.reason.len == 0) { /* already extracted in case of locally generated replies */ + acc_env.reason.s = error_text(code); + acc_env.reason.len = strlen(acc_env.reason.s); + } } else { acc_env.code_s = reply->first_line.u.reply.status; hf = NULL; @@ -695,6 +719,7 @@ static void tmcb_func( struct cell* t, int type, struct tmcb_params *ps ) LM_DBG("acc callback called for t(%p) event type %d, reply code %d\n", t, type, ps->code); if (type&TMCB_RESPONSE_OUT) { + env_set_reason(ps->rpl, &ps->send_buf); acc_onreply( t, ps->req, ps->rpl, ps->code); } else if (type&TMCB_E2EACK_IN) { acc_onack( t, t->uas.request, ps->req, ps->code);

1 0

git:master:696df60d: Merge pull request #2422 from kamailio/jchavanton/acc_totag
by GitHub 24 Aug '20

24 Aug '20

Module: kamailio Branch: master Commit: 696df60d3b7af852b61d072907417405122e5f1b URL: https://github.com/kamailio/kamailio/commit/696df60d3b7af852b61d07290741740… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-08-24T09:23:23+02:00 Merge pull request #2422 from kamailio/jchavanton/acc_totag acc: add to-tag for locally generated replies --- Modified: src/modules/acc/acc.c Modified: src/modules/acc/acc_api.h Modified: src/modules/acc/acc_logic.c --- Diff: https://github.com/kamailio/kamailio/commit/696df60d3b7af852b61d07290741740… Patch: https://github.com/kamailio/kamailio/commit/696df60d3b7af852b61d07290741740…

1 0

git:master:051300e0: acc: add to-tag for locally generated replies
by Julien Chavanton 24 Aug '20

24 Aug '20

Module: kamailio Branch: master Commit: 051300e04bb6bc24796c03f0b80fda87ab07627f URL: https://github.com/kamailio/kamailio/commit/051300e04bb6bc24796c03f0b80fda8… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2020-08-12T09:16:40-07:00 acc: add to-tag for locally generated replies --- Modified: src/modules/acc/acc.c Modified: src/modules/acc/acc_api.h Modified: src/modules/acc/acc_logic.c --- Diff: https://github.com/kamailio/kamailio/commit/051300e04bb6bc24796c03f0b80fda8… Patch: https://github.com/kamailio/kamailio/commit/051300e04bb6bc24796c03f0b80fda8… --- diff --git a/src/modules/acc/acc.c b/src/modules/acc/acc.c index 91a12f6cdb..500629cf73 100644 --- a/src/modules/acc/acc.c +++ b/src/modules/acc/acc.c @@ -123,6 +123,13 @@ int core2strar(struct sip_msg *req, str *c_vals, int *i_vals, char *t_vals) t_vals[2] = TYPE_NULL; } + LM_DBG("default - totag[%.*s]\n", c_vals[2].len, c_vals[2].s); + if (c_vals[2].len == 0 && acc_env.to_tag.s && acc_env.to_tag.len > 0) { + LM_DBG("extra [%p] totag[%.*s]\n", acc_env.to_tag.s, acc_env.to_tag.len, acc_env.to_tag.s); + c_vals[2].len = acc_env.to_tag.len; + c_vals[2].s = acc_env.to_tag.s; + } + /* Callid */ if (req->callid && req->callid->body.len) { c_vals[3] = req->callid->body; diff --git a/src/modules/acc/acc_api.h b/src/modules/acc/acc_api.h index 93f8acc100..0a6df2e32c 100644 --- a/src/modules/acc/acc_api.h +++ b/src/modules/acc/acc_api.h @@ -54,6 +54,7 @@ typedef struct acc_enviroment { str code_s; str reason; struct hdr_field *to; + str to_tag; /*!< locally generated to-tag */ str text; time_t ts; struct timeval tv; diff --git a/src/modules/acc/acc_logic.c b/src/modules/acc/acc_logic.c index 41636705d8..818c7aa101 100644 --- a/src/modules/acc/acc_logic.c +++ b/src/modules/acc/acc_logic.c @@ -79,8 +79,7 @@ struct acc_enviroment acc_env; static void tmcb_func( struct cell* t, int type, struct tmcb_params *ps ); -static inline struct hdr_field* get_rpl_to( struct cell *t, - struct sip_msg *reply) +static inline struct hdr_field* get_rpl_to( struct cell *t, struct sip_msg *reply) { if (reply==FAKED_REPLY || !reply || !reply->to) return t->uas.request->to; @@ -88,13 +87,17 @@ static inline struct hdr_field* get_rpl_to( struct cell *t, return reply->to; } +void env_set_totag(struct cell *t, struct sip_msg *reply) +{ + if (reply==FAKED_REPLY || !reply || !reply->to) + tmb.t_get_reply_totag(t->uas.request, &acc_env.to_tag); +} static inline void env_set_to(struct hdr_field *to) { acc_env.to = to; } - static inline void env_set_text(char *p, int len) { acc_env.text.s = p; @@ -493,7 +496,9 @@ static inline void on_missed(struct cell *t, struct sip_msg *req, /* set env variables */ env_set_to( get_rpl_to(t,reply) ); - env_set_code_status( code, reply); + env_set_code_status(code, reply); + /* for missed calls, we make sure to include the totag if it is locally generated */ + env_set_totag(t, reply); /* we report on missed calls when the first * forwarding attempt fails; we do not wish to @@ -512,7 +517,6 @@ static inline void on_missed(struct cell *t, struct sip_msg *req, acc_db_request( req ); flags_to_reset |= 1 << db_missed_flag; } - /* run extra acc engines */ acc_run_engines(req, 1, &flags_to_reset);

1 0

[kamailio/kamailio] master ignores OPTIONS messages via IPv6 socket (#2453)
by sergey-safarov 21 Aug '20

21 Aug '20

### Description Added IPv6 listeners into the default config file. ``` listen=udp:[2600:1f18:63e1:6936::300]:5060 listen=tcp:[2600:1f18:63e1:6936::300]:5060 ``` Kamailio is able receive REGISTER messages. But ignores `OPTIONS`. When `#!define WITH_DEBUG` kamailio shows nothing on `OPTIONS` messages. ### Troubleshooting #### Reproduction 1) add IPv6 listeners into default config 2) send OPTIONS messages to kamailio. #### Debugging Data None #### Log Messages None #### SIP Traffic Kamailio receive this OPTIONS messages ``` OPTIONS sip:proxy-0.wv.example.com:5080 SIP/2.0 Via: SIP/2.0/UDP [2600:1F1C:257:8706:ACAB:AE:2A01:1EA3];branch=z9hG4bK2b03.70dce6f2000000000000000000000000.0 To: <sip:proxy-0.wv.example.com:5080> From: <sip:proxy@aggregator.example.com>;tag=44bcb2ee24537bd62851129efb658b7a-17d18de8 CSeq: 10 OPTIONS Call-ID: 59605197726e91db-2653(a)172.22.6.201 Max-Forwards: 70 Content-Length: 0 User-Agent: kamailio (5.5.0-dev1 (x86_64/linux)) ``` ### Possible Solutions Not known ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [root@proxy-0 ~]# kamailio -v version: kamailio 5.5.0-dev1 (x86_64/linux) c960ca 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_BLACKLIST, 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: c960ca compiled on 04:08:19 Aug 20 2020 with gcc 4.8.5 ``` * **Operating System**: ``` [root@proxy-0 ~]# cat /etc/os-release NAME="CentOS Linux" VERSION="7 (Core)" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="7" PRETTY_NAME="CentOS Linux 7 (Core)" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:7" HOME_URL="https://www.centos.org/" BUG_REPORT_URL="https://bugs.centos.org/" CENTOS_MANTISBT_PROJECT="CentOS-7" CENTOS_MANTISBT_PROJECT_VERSION="7" REDHAT_SUPPORT_PRODUCT="centos" REDHAT_SUPPORT_PRODUCT_VERSION="7" ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2453

1 3

git:master:d9dd2abe: core: kemi - exported core route function
by Daniel-Constantin Mierla 20 Aug '20

20 Aug '20

Module: kamailio Branch: master Commit: d9dd2abeb82be8b992ddf534864b6d84594b7a47 URL: https://github.com/kamailio/kamailio/commit/d9dd2abeb82be8b992ddf534864b6d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-20T16:16:56+02:00 core: kemi - exported core route function --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/d9dd2abeb82be8b992ddf534864b6d8… Patch: https://github.com/kamailio/kamailio/commit/d9dd2abeb82be8b992ddf534864b6d8… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 3cbeee6d08..6ca519e804 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1482,6 +1482,41 @@ static int sr_kemi_core_get_debug(sip_msg_t *msg) return get_cfg_debug_level(); } +/** + * + */ +static int sr_kemi_core_route(sip_msg_t *msg, str *route) +{ + run_act_ctx_t tctx; + run_act_ctx_t *pctx = NULL; + int rtid = -1; + int ret = 0; + + if(route == NULL || route->s == NULL) { + return -1; + } + + rtid = route_lookup(&main_rt, route->s); + if (rtid < 0) { + return -1; + } + + if(_sr_kemi_act_ctx != NULL) { + pctx = _sr_kemi_act_ctx; + } else { + init_run_actions_ctx(&tctx); + pctx = &tctx; + } + + ret=run_actions(pctx, main_rt.rlist[rtid], msg); + + if (pctx->run_flags & EXIT_R_F) { + return 0; + } + + return ret; +} + /** * */ @@ -1881,6 +1916,11 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("route"), + SR_KEMIP_INT, sr_kemi_core_route, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:ecba550f: cfgutils: exported route check functions to kemi
by Daniel-Constantin Mierla 20 Aug '20

20 Aug '20

Module: kamailio Branch: master Commit: ecba550f5d35435adfa9c692cec8cee6cae8a77b URL: https://github.com/kamailio/kamailio/commit/ecba550f5d35435adfa9c692cec8cee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-20T15:59:05+02:00 cfgutils: exported route check functions to kemi --- Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/ecba550f5d35435adfa9c692cec8cee… Patch: https://github.com/kamailio/kamailio/commit/ecba550f5d35435adfa9c692cec8cee… --- diff --git a/src/modules/cfgutils/cfgutils.c b/src/modules/cfgutils/cfgutils.c index 7be7181d82..9a77b40aed 100644 --- a/src/modules/cfgutils/cfgutils.c +++ b/src/modules/cfgutils/cfgutils.c @@ -790,28 +790,23 @@ static int w_cfg_trylock(struct sip_msg *msg, char *key, char *s2) /*! Check if a route block exists - only request routes */ -static int w_check_route_exists(struct sip_msg *msg, char *route) +static int ki_check_route_exists(sip_msg_t *msg, str *route) { - str s; - - if (fixup_get_svalue(msg, (gparam_p) route, &s) != 0) - { - LM_ERR("invalid route parameter\n"); - return -1; + if(route == NULL || route->s == NULL) { + return -1; } - if (route_lookup(&main_rt, s.s)<0) { + + if (route_lookup(&main_rt, route->s)<0) { /* not found */ return -1; } return 1; } -/*! Run a request route block if it exists +/*! Check if a route block exists - only request routes */ -static int w_route_exists(struct sip_msg *msg, char *route) +static int w_check_route_exists(struct sip_msg *msg, char *route) { - struct run_act_ctx ctx; - int newroute, ret; str s; if (fixup_get_svalue(msg, (gparam_p) route, &s) != 0) { @@ -819,18 +814,49 @@ static int w_route_exists(struct sip_msg *msg, char *route) return -1; } - newroute = route_lookup(&main_rt, s.s); + return ki_check_route_exists(msg, &s); +} + +/*! Run a request route block if it exists + */ +static int ki_route_if_exists(sip_msg_t *msg, str *route) +{ + struct run_act_ctx ctx; + int newroute, ret; + + if(route == NULL || route->s == NULL) { + return -1; + } + + newroute = route_lookup(&main_rt, route->s); if (newroute<0) { return -1; } + init_run_actions_ctx(&ctx); ret=run_actions(&ctx, main_rt.rlist[newroute], msg); if (ctx.run_flags & EXIT_R_F) { return 0; } + return ret; } + +/*! Run a request route block if it exists + */ +static int w_route_exists(struct sip_msg *msg, char *route) +{ + str s; + + if (fixup_get_svalue(msg, (gparam_p) route, &s) != 0) { + LM_ERR("invalid route parameter\n"); + return -1; + } + + return ki_route_if_exists(msg, &s); +} + static int mod_init(void) { /* Register RPC commands */ @@ -1078,6 +1104,16 @@ static sr_kemi_t sr_kemi_cfgutils_exports[] = { { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("cfgutils"), str_init("check_route_exists"), + SR_KEMIP_INT, ki_check_route_exists, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("cfgutils"), str_init("route_if_exists"), + SR_KEMIP_INT, ki_route_if_exists, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

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