sr-dev April 2019

sr-dev@lists.kamailio.org

23 participants
317 discussions

git:master:395cae83: core: kemi - wrapper function to run callbacks with context

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 395cae83da4d83920dd038d299c30ffa97b6c272 URL: https://github.com/kamailio/kamailio/commit/395cae83da4d83920dd038d299c30ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-09T13:03:38+02:00 core: kemi - wrapper function to run callbacks with context --- Modified: src/core/kemi.c Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/395cae83da4d83920dd038d299c30ff… Patch: https://github.com/kamailio/kamailio/commit/395cae83da4d83920dd038d299c30ff… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 2469e067c6..deb9285b9d 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -2422,3 +2422,13 @@ int sr_kemi_route(sr_kemi_eng_t *keng, sip_msg_t *msg, int rtype, setsflagsval(sfbk); return ret; } + +/** + * + */ +int sr_kemi_ctx_route(sr_kemi_eng_t *keng, run_act_ctx_t *ctx, sip_msg_t *msg, + int rtype, str *ename, str *edata) +{ + sr_kemi_act_ctx_set(ctx); + return sr_kemi_route(keng, msg, rtype, ename, edata); +} diff --git a/src/core/kemi.h b/src/core/kemi.h index 3321dd8b4e..5d3c84ebb7 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -147,5 +147,7 @@ int sr_kemi_core_set_drop(sip_msg_t *msg); int sr_kemi_route(sr_kemi_eng_t *keng, sip_msg_t *msg, int rtype, str *ename, str *edata); +int sr_kemi_ctx_route(sr_kemi_eng_t *keng, run_act_ctx_t *ctx, sip_msg_t *msg, + int rtype, str *ename, str *edata); #endif

5 years, 7 months

[kamailio/kamailio] Entities for from tag and to tag (#1921)

by Øyvind Kolbu

#### 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  We have locally needed to update the `from_tag` and `to_tag` columns in `acc`, `dialog` and `siptrace` as we get requests which are larger than the defaults can handle. While bumping the limit, I added two entities to `entities.xml` to get consistent sizes for `from_tag` and `to_tag` in the tables. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1921 -- Commit Summary -- * lib/srdb1: schema - add definitions for from_tag and to_tag * lib/srdb1: schema - use defined entities for from_tag and to_tag. * kamctl: regenerated db schema files for from_tag and to_tag changes. -- File Changes -- M src/lib/srdb1/schema/acc.xml (4) M src/lib/srdb1/schema/dialog.xml (4) M src/lib/srdb1/schema/entities.xml (2) M src/lib/srdb1/schema/missed_calls.xml (4) M src/lib/srdb1/schema/pr_active_watchers.xml (4) M src/lib/srdb1/schema/pr_pua.xml (4) M src/lib/srdb1/schema/rls_watchers.xml (4) M src/lib/srdb1/schema/sca.xml (4) M src/lib/srdb1/schema/sip_trace.xml (4) M utils/kamctl/db_sqlite/acc-create.sql (8) M utils/kamctl/db_sqlite/dialog-create.sql (4) M utils/kamctl/db_sqlite/presence-create.sql (8) M utils/kamctl/db_sqlite/rls-create.sql (4) M utils/kamctl/db_sqlite/sca-create.sql (4) M utils/kamctl/db_sqlite/siptrace-create.sql (4) M utils/kamctl/mysql/acc-create.sql (8) M utils/kamctl/mysql/dialog-create.sql (4) M utils/kamctl/mysql/presence-create.sql (8) M utils/kamctl/mysql/rls-create.sql (4) M utils/kamctl/mysql/sca-create.sql (4) M utils/kamctl/mysql/siptrace-create.sql (4) M utils/kamctl/oracle/acc-create.sql (8) M utils/kamctl/oracle/dialog-create.sql (4) M utils/kamctl/oracle/presence-create.sql (8) M utils/kamctl/oracle/rls-create.sql (4) M utils/kamctl/oracle/sca-create.sql (4) M utils/kamctl/oracle/siptrace-create.sql (4) M utils/kamctl/postgres/acc-create.sql (8) M utils/kamctl/postgres/dialog-create.sql (4) M utils/kamctl/postgres/presence-create.sql (8) M utils/kamctl/postgres/rls-create.sql (4) M utils/kamctl/postgres/sca-create.sql (4) M utils/kamctl/postgres/siptrace-create.sql (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1921.patch https://github.com/kamailio/kamailio/pull/1921.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/1921

5 years, 7 months

git:master:98c352de: kamctl: regenerated db schema files for from_tag and to_tag changes.

by Henning Westerholt

Module: kamailio Branch: master Commit: 98c352de1829a8238395290679280e11e9ee6b0a URL: https://github.com/kamailio/kamailio/commit/98c352de1829a8238395290679280e1… Author: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-04-08T21:21:33+02:00 kamctl: regenerated db schema files for from_tag and to_tag changes. --- Modified: utils/kamctl/db_sqlite/acc-create.sql Modified: utils/kamctl/db_sqlite/dialog-create.sql Modified: utils/kamctl/db_sqlite/presence-create.sql Modified: utils/kamctl/db_sqlite/rls-create.sql Modified: utils/kamctl/db_sqlite/sca-create.sql Modified: utils/kamctl/db_sqlite/siptrace-create.sql Modified: utils/kamctl/mysql/acc-create.sql Modified: utils/kamctl/mysql/dialog-create.sql Modified: utils/kamctl/mysql/presence-create.sql Modified: utils/kamctl/mysql/rls-create.sql Modified: utils/kamctl/mysql/sca-create.sql Modified: utils/kamctl/mysql/siptrace-create.sql Modified: utils/kamctl/oracle/acc-create.sql Modified: utils/kamctl/oracle/dialog-create.sql Modified: utils/kamctl/oracle/presence-create.sql Modified: utils/kamctl/oracle/rls-create.sql Modified: utils/kamctl/oracle/sca-create.sql Modified: utils/kamctl/oracle/siptrace-create.sql Modified: utils/kamctl/postgres/acc-create.sql Modified: utils/kamctl/postgres/dialog-create.sql Modified: utils/kamctl/postgres/presence-create.sql Modified: utils/kamctl/postgres/rls-create.sql Modified: utils/kamctl/postgres/sca-create.sql Modified: utils/kamctl/postgres/siptrace-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/98c352de1829a8238395290679280e1… Patch: https://github.com/kamailio/kamailio/commit/98c352de1829a8238395290679280e1…

5 years, 7 months

git:master:9fc28c69: lib/srdb1: schema - use defined entities for from_tag and to_tag.

by Henning Westerholt

Module: kamailio Branch: master Commit: 9fc28c698d88fa2f7ece351577fd7e5c9de774d3 URL: https://github.com/kamailio/kamailio/commit/9fc28c698d88fa2f7ece351577fd7e5… Author: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-04-08T21:21:33+02:00 lib/srdb1: schema - use defined entities for from_tag and to_tag. Currently various 64 length entities have been used instead. --- Modified: src/lib/srdb1/schema/acc.xml Modified: src/lib/srdb1/schema/dialog.xml Modified: src/lib/srdb1/schema/missed_calls.xml Modified: src/lib/srdb1/schema/pr_active_watchers.xml Modified: src/lib/srdb1/schema/pr_pua.xml Modified: src/lib/srdb1/schema/rls_watchers.xml Modified: src/lib/srdb1/schema/sca.xml Modified: src/lib/srdb1/schema/sip_trace.xml --- Diff: https://github.com/kamailio/kamailio/commit/9fc28c698d88fa2f7ece351577fd7e5… Patch: https://github.com/kamailio/kamailio/commit/9fc28c698d88fa2f7ece351577fd7e5…

5 years, 7 months

git:master:9f351514: lib/srdb1: schema - add definitions for from_tag and to_tag

by Henning Westerholt

Module: kamailio Branch: master Commit: 9f35151401563877285f673b2de2a662fd1bd4e3 URL: https://github.com/kamailio/kamailio/commit/9f35151401563877285f673b2de2a66… Author: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-04-08T21:21:33+02:00 lib/srdb1: schema - add definitions for from_tag and to_tag --- Modified: src/lib/srdb1/schema/entities.xml --- Diff: https://github.com/kamailio/kamailio/commit/9f35151401563877285f673b2de2a66… Patch: https://github.com/kamailio/kamailio/commit/9f35151401563877285f673b2de2a66… --- diff --git a/src/lib/srdb1/schema/entities.xml b/src/lib/srdb1/schema/entities.xml index 2bfe39540f..17a47baf83 100644 --- a/src/lib/srdb1/schema/entities.xml +++ b/src/lib/srdb1/schema/entities.xml @@ -1,5 +1,7 @@ <!ENTITY user_len "64"> <!ENTITY domain_len "64"> +<!ENTITY from_tag_len "128"> +<!ENTITY to_tag_len "128"> <!ENTITY password_len "64"> <!ENTITY ha1_len "128"> <!ENTITY realm_len "64">

5 years, 7 months

git:master:ce00265d: lcr: implemented structured output for lcr.dump_rules rpc command

by Ovidiu Sas

Module: kamailio Branch: master Commit: ce00265d25741657f255bd35403ba9d6cce297fc URL: https://github.com/kamailio/kamailio/commit/ce00265d25741657f255bd35403ba9d… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2019-04-08T15:00:06-04:00 lcr: implemented structured output for lcr.dump_rules rpc command --- Modified: src/modules/lcr/lcr_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/ce00265d25741657f255bd35403ba9d… Patch: https://github.com/kamailio/kamailio/commit/ce00265d25741657f255bd35403ba9d… --- diff --git a/src/modules/lcr/lcr_rpc.c b/src/modules/lcr/lcr_rpc.c index ec10653a32..ef5b351e6c 100644 --- a/src/modules/lcr/lcr_rpc.c +++ b/src/modules/lcr/lcr_rpc.c @@ -131,7 +131,9 @@ static void dump_rules(rpc_t *rpc, void *c) str _prefix = {NULL,0}; struct rule_info **rules, *rule; struct target *t; - void *st; + void *rec = NULL; + void *srec = NULL; + void *st, *sst, *ssst; str prefix, from_uri, request_uri; if (rpc->scan(c, "d", &_lcr_id)>0) { @@ -156,7 +158,14 @@ static void dump_rules(rpc_t *rpc, void *c) continue; } } - if(rpc->add(c, "{", &st) < 0) + if (srec==NULL) { + /* We create one array per lcr_id */ + if(rpc->add(c, "{", &rec) < 0) + return; + if(rpc->struct_add(rec, "[", "rule", &srec) < 0) + return; + } + if(rpc->array_add(srec, "{", &st) < 0) return; prefix.s = rule->prefix; prefix.len = rule->prefix_len; @@ -168,24 +177,37 @@ static void dump_rules(rpc_t *rpc, void *c) rule->rule_id, "prefix", &prefix, "from_uri", &from_uri, "request_uri", &request_uri, "stopper", rule->stopper); t = rule->targets; - while(t) { - if(rpc->add(c, "{", &st) < 0) + if (t) { + if (rpc->struct_add(st, "[", "gw", &sst) < 0) return; - rpc->struct_add(st, "ddd", "gw_index", t->gw_index, - "priority", t->priority, "weight", t->weight); - t = t->next; + while(t) { + if (rpc->array_add(sst, "{", &ssst) < 0) + return; + rpc->struct_add(ssst, "ddd", "gw_index", t->gw_index, + "priority", t->priority, "weight", t->weight); + t = t->next; + } } rule = rule->next; } } + + /* Mark the end of rule array */ + srec = NULL; + if (_filter_by_prefix) continue; rule = rules[lcr_rule_hash_size_param]; - while(rule) { - rpc->add(c, "d", rule->prefix_len); - rule = rule->next; + if (rule) { + if(rpc->struct_add(rec, "[", "prefix_len", &st) < 0) + return; + while(rule) { + rpc->array_add(st, "d", rule->prefix_len); + rule = rule->next; + } } } + if (rec==NULL) rpc->fault(c, 404, "Empty reply"); }

5 years, 7 months

git:master:b4cf8f68: websocket: added check mechanism based on tcp connection

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b4cf8f6819ddb89b572fe25e778baaad53a6e081 URL: https://github.com/kamailio/kamailio/commit/b4cf8f6819ddb89b572fe25e778baaa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-08T10:33:22+02:00 websocket: added check mechanism based on tcp connection - type 3 (KEEPALIVE_MECHANISM_CONCHECK) - based on GH #1892 --- Modified: src/modules/websocket/ws_frame.c Modified: src/modules/websocket/ws_frame.h --- Diff: https://github.com/kamailio/kamailio/commit/b4cf8f6819ddb89b572fe25e778baaa… Patch: https://github.com/kamailio/kamailio/commit/b4cf8f6819ddb89b572fe25e778baaa… --- diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index 840125a041..36b465bc65 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -812,6 +812,14 @@ void ws_keepalive(unsigned int ticks, void *param) if(wsc->state == WS_S_CLOSING || wsc->awaiting_pong) { LM_WARN("forcibly closing connection\n"); wsconn_close_now(wsc); + } else if (ws_keepalive_mechanism == KEEPALIVE_MECHANISM_CONCHECK) { + tcp_connection_t *con = tcpconn_get(wsc->id, 0, 0, 0, 0); + if(con==NULL) { + LM_INFO("tcp connection has been lost\n"); + wsc->state = WS_S_CLOSING; + } else { + tcpconn_put(con); + } } else { int opcode = (ws_keepalive_mechanism == KEEPALIVE_MECHANISM_PING) ? OPCODE_PING diff --git a/src/modules/websocket/ws_frame.h b/src/modules/websocket/ws_frame.h index d2cfe3a577..d0f8d84ed0 100644 --- a/src/modules/websocket/ws_frame.h +++ b/src/modules/websocket/ws_frame.h @@ -40,7 +40,8 @@ enum { KEEPALIVE_MECHANISM_NONE = 0, KEEPALIVE_MECHANISM_PING = 1, - KEEPALIVE_MECHANISM_PONG = 2 + KEEPALIVE_MECHANISM_PONG = 2, + KEEPALIVE_MECHANISM_CONCHECK = 3 }; #define DEFAULT_KEEPALIVE_MECHANISM KEEPALIVE_MECHANISM_PING extern int ws_keepalive_mechanism;

5 years, 7 months

[kamailio/kamailio] crash in slow timer (#1897)

by lazedo

### Description slow_timer proc exited with crash, kamailio kept running but tm transaction kept accumulating which will lead to shared memory exhaustion and crash. in line 1131 `ret=tl->f(*ticks, tl, tl->data);` f is null, reason of crash  ### Troubleshooting #### Reproduction happens from time to time, not a way to reliably reproduce it.  #### Debugging Data  ``` #0 0x0000000000000000 in ?? () #1 0x000000000049f648 in slow_timer_main () at core/timer.c:1131 #2 0x0000000000424b84 in main_loop () at main.c:1685 #3 0x000000000042b9d3 in main (argc=16, argv=0x7ffe568bcd08) at main.c:2663 (gdb) frame 1 #1 0x000000000049f648 in slow_timer_main () at core/timer.c:1131 1131 ret=tl->f(*ticks, tl, tl->data); (gdb) list 1126 #ifdef TIMER_DEBUG 1127 tl->expires_no++; 1128 #endif 1129 SET_RUNNING_SLOW(tl); 1130 UNLOCK_SLOW_TIMER_LIST(); 1131 ret=tl->f(*ticks, tl, tl->data); 1132 /* reset the configuration group handles */ 1133 cfg_reset_all(); 1134 if (ret==0){ 1135 /* one shot */ (gdb) p *tl $1 = {next = 0x0, prev = 0x0, expire = 938928580, initial_timeout = 80, data = 0x0, f = 0x0, flags = 768, slow_idx = 45488} (gdb) info locals n = 12 ret = 4294967295 tl = 0x7fb2d3c860d0 i = 432 __func__ = "slow_timer_main" ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` 5.1.7 ``` * **Operating System**:  ``` centos 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/1897

5 years, 7 months

git:master:ee9f1a86: modules: readme files regenerated - sdpops ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: ee9f1a8695e4e921eb97834f880355f08aa97f16 URL: https://github.com/kamailio/kamailio/commit/ee9f1a8695e4e921eb97834f880355f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-04-08T09:31:53+02:00 modules: readme files regenerated - sdpops ... [skip ci] --- Modified: src/modules/sdpops/README --- Diff: https://github.com/kamailio/kamailio/commit/ee9f1a8695e4e921eb97834f880355f… Patch: https://github.com/kamailio/kamailio/commit/ee9f1a8695e4e921eb97834f880355f…

5 years, 7 months

git:master:a1884dca: sdpops: fix module README '&&' in example, fix conversion error

by Henning Westerholt

Module: kamailio Branch: master Commit: a1884dca372d0b3bc82d5ad36dced99fa088d141 URL: https://github.com/kamailio/kamailio/commit/a1884dca372d0b3bc82d5ad36dced99… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-04-08T09:29:42+02:00 sdpops: fix module README '&&' in example, fix conversion error --- Modified: src/modules/sdpops/doc/sdpops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a1884dca372d0b3bc82d5ad36dced99… Patch: https://github.com/kamailio/kamailio/commit/a1884dca372d0b3bc82d5ad36dced99… --- diff --git a/src/modules/sdpops/doc/sdpops_admin.xml b/src/modules/sdpops/doc/sdpops_admin.xml index 6cd8a68f69..5ed3c57d40 100644 --- a/src/modules/sdpops/doc/sdpops_admin.xml +++ b/src/modules/sdpops/doc/sdpops_admin.xml @@ -583,15 +583,16 @@ if(sdp_get_line_startswith("$avp(mline)", "m=")) { </para> <example> <title><function>sdp_get_address_family</function>usage</title> - <programlisting format="linespecific"> - ... - if(is_method("INVITE") && has_body("application/sdp")){ - - $avp(af) = sdp_get_address_family(); - xlog("L_INFO","ADDRESS FAMILY OF SDP C line $avp(af) "); - } - ... - </programlisting> + <programlisting> +<![CDATA[ +... +if(is_method("INVITE") && has_body("application/sdp")){ + $avp(af) = sdp_get_address_family(); + xlog("L_INFO","ADDRESS FAMILY OF SDP C line $avp(af) "); +} +... +]]> + </programlisting> </example> </section>

5 years, 7 months

← Newer
1
...
22
23
24
25
26
27
28
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2019