sr-dev May 2017

sr-dev@lists.kamailio.org

32 participants
298 discussions

git:master:358cf95e: tm: t_drop_replies() exported to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 358cf95e68fd1b41ff8f7aee6478aa9c79361765 URL: https://github.com/kamailio/kamailio/commit/358cf95e68fd1b41ff8f7aee6478aa9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-09T06:30:55+02:00 tm: t_drop_replies() exported to kemi framework --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/358cf95e68fd1b41ff8f7aee6478aa9… Patch: https://github.com/kamailio/kamailio/commit/358cf95e68fd1b41ff8f7aee6478aa9… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index c7dd7df..0559286 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -2044,19 +2044,34 @@ int t_grep_status(struct sip_msg* msg, char* status, char* bar) /* drop all the existing replies in failure_route to make sure * that none of them is picked up again */ -static int w_t_drop_replies(struct sip_msg* msg, char* foo, char* bar) +static int t_drop_replies_helper(sip_msg_t* msg, char* mode) { - if(foo==NULL) + if(mode==NULL) t_drop_replies(1); - else if(*foo=='n') + else if(*mode=='n') t_drop_replies(0); - else if(*foo=='l') + else if(*mode=='l') t_drop_replies(2); else t_drop_replies(1); return 1; } +static int w_t_drop_replies(struct sip_msg* msg, char* mode, char* bar) +{ + return t_drop_replies_helper(msg, mode); +} + +static int ki_t_drop_replies(sip_msg_t* msg, str* mode) +{ + return t_drop_replies_helper(msg, (mode)?mode->s:NULL); +} + +static int ki_t_drop_replies_all(sip_msg_t* msg) +{ + return t_drop_replies_helper(msg, NULL); +} + /* save the message lumps after t_newtran() but before t_relay() */ static int w_t_save_lumps(struct sip_msg* msg, char* foo, char* bar) { @@ -2695,6 +2710,16 @@ static sr_kemi_t tm_kemi_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("tm"), str_init("t_drop_replies_all"), + SR_KEMIP_INT, ki_t_drop_replies_all, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("tm"), str_init("t_drop_replies"), + SR_KEMIP_INT, ki_t_drop_replies, + { 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 } } };

7 years, 6 months

git:5.0:1ce6019d: topos: correct order of Route header after restoring from b_rr

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: 1ce6019d4296603f701231cf55b090e22a137e0f URL: https://github.com/kamailio/kamailio/commit/1ce6019d4296603f701231cf55b090e… Author: sergey-vb <sergey.v.basov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-08T20:56:13+02:00 topos: correct order of Route header after restoring from b_rr - fixes routing with a chain of sip proxies - GH #1124 (cherry picked from commit 98d1cf0454faa8f904d8bc08c73c70dc7b15de61) --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/1ce6019d4296603f701231cf55b090e… Patch: https://github.com/kamailio/kamailio/commit/1ce6019d4296603f701231cf55b090e… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 462dedd..bff2b2a 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -789,7 +789,7 @@ int tps_request_received(sip_msg_t *msg, int dialog) return -1; } } else { - if(tps_reappend_route(msg, &stsd, &stsd.b_rr, 0)<0) { + if(tps_reappend_route(msg, &stsd, &stsd.b_rr, 1)<0) { LM_ERR("failed to reappend b-route\n"); return -1; }

7 years, 6 months

[kamailio/kamailio] topos: correct order of Route header after restoring from b_rr (#1124)

by sergey-vb

With topoh enabled I have: Route: <sip:10.56.42.37:5070;lr;ftag=IpXq-LwNvJF6WrkOcmZNf9WjmGjK5dUv;did=90c.1132;vsf=AAAAAAAAAAAAAAAAAABlY2Bmf359HGJ6cX8bc3h9OjUwNjA7dXNlcj1waG9uZQ--;vst=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAgEAAgcAAAABAAAAAAAAAAAAAAAA> Route: <sip:TEST.MSS.LIFE.COM:5060;transport=UDP;lr> But with topos enabled I have: Route: <sip:TEST.MSS.LIFE.COM:5060;transport=UDP;lr>,<sip:10.56.42.37:5070;lr;ftag=EN0cvoXXCOgdGoO2zizq-WNmE4Enf4Nt;did=434.5ce1;vsf=AAAAAAAAAAAAAAAAAABlY2Bmf359HGJ6cX8bc3h9OjUwNjA7dXNlcj1waG9uZQ--;vst=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAgEAAgcAAAABAAAAAAAAAAAAAAAA> And kamailio trying to send ACK to TEST.MSS.LIFE.COM:5060 After this patch Route header are restores in from: Route: <sip:10.56.42.37:5070;lr;ftag=EN0cvoXXCOgdGoO2zizq-WNmE4Enf4Nt;did=434.5ce1;vsf=AAAAAAAAAAAAAAAAAABlY2Bmf359HGJ6cX8bc3h9OjUwNjA7dXNlcj1waG9uZQ--;vst=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAgEAAgcAAAABAAAAAAAAAAAAAAAA> Route: <sip:TEST.MSS.LIFE.COM:5060;transport=UDP;lr> Now ACK are routed correctly. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1124 -- Commit Summary -- * topos: correct order of Route header after restoring from b_rr -- File Changes -- M src/modules/topos/tps_msg.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1124.patch https://github.com/kamailio/kamailio/pull/1124.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/1124

7 years, 6 months

git:master:98d1cf04: topos: correct order of Route header after restoring from b_rr

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 98d1cf0454faa8f904d8bc08c73c70dc7b15de61 URL: https://github.com/kamailio/kamailio/commit/98d1cf0454faa8f904d8bc08c73c70d… Author: sergey-vb <sergey.v.basov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-08T20:53:17+02:00 topos: correct order of Route header after restoring from b_rr - fixes routing with a chain of sip proxies - GH #1124 --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/98d1cf0454faa8f904d8bc08c73c70d… Patch: https://github.com/kamailio/kamailio/commit/98d1cf0454faa8f904d8bc08c73c70d… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 462dedd..bff2b2a 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -789,7 +789,7 @@ int tps_request_received(sip_msg_t *msg, int dialog) return -1; } } else { - if(tps_reappend_route(msg, &stsd, &stsd.b_rr, 0)<0) { + if(tps_reappend_route(msg, &stsd, &stsd.b_rr, 1)<0) { LM_ERR("failed to reappend b-route\n"); return -1; }

7 years, 6 months

git:master:653b7343: p_usrloc: limit db writes of error count

by Lucian Balaceanu

Module: kamailio Branch: master Commit: 653b7343ebcca5f53f56bace94772a982bf0f887 URL: https://github.com/kamailio/kamailio/commit/653b7343ebcca5f53f56bace94772a9… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2017-05-08T19:10:00+03:00 p_usrloc: limit db writes of error count - when db_errors_treshold limit is reached kamailio should stop increasing the errors field so as not to load mysql with no use --- Modified: src/modules/p_usrloc/ul_db.c --- Diff: https://github.com/kamailio/kamailio/commit/653b7343ebcca5f53f56bace94772a9… Patch: https://github.com/kamailio/kamailio/commit/653b7343ebcca5f53f56bace94772a9… --- diff --git a/src/modules/p_usrloc/ul_db.c b/src/modules/p_usrloc/ul_db.c index a954259..cf1b940 100644 --- a/src/modules/p_usrloc/ul_db.c +++ b/src/modules/p_usrloc/ul_db.c @@ -162,26 +162,29 @@ int db_handle_error(ul_db_handle_t * handle, int no) { LM_ERR("can't get db.\n"); return -1; } - - if (sprintf(query, "UPDATE %.*s " - "SET %.*s=%.*s+1 " - "WHERE %.*s=%i " - "AND %.*s=%i", - reg_table.len, reg_table.s, - error_col.len, error_col.s, error_col.len, error_col.s, - id_col.len, id_col.s, handle->id, - num_col.len, num_col.s, db->no) < 0) { - LM_ERR("could not print the query\n"); - return -1; - } - tmp.s = query; - tmp.len = strlen(query); - if (mdb.write.dbf.raw_query (mdb.write.dbh, &tmp, NULL)) { - LM_ERR("error in database update.\n"); - return -1; + if (db->errors < db_error_threshold) { + if (sprintf(query, "UPDATE %.*s " + "SET %.*s=%.*s+1 " + "WHERE %.*s=%i " + "AND %.*s=%i", + reg_table.len, reg_table.s, + error_col.len, error_col.s, error_col.len, error_col.s, + id_col.len, id_col.s, handle->id, + num_col.len, num_col.s, db->no) < 0) { + LM_ERR("could not print the query\n"); + return -1; + } + + tmp.s = query; + tmp.len = strlen(query); + + if (mdb.write.dbf.raw_query (mdb.write.dbh, &tmp, NULL)) { + LM_ERR("error in database update.\n"); + return -1; + } } - + for(i=0; i<DB_NUM; i++){ if (handle->db[i].dbh && handle->db[i].dbf.close){ handle->db[i].dbf.close(handle->db[i].dbh);

7 years, 6 months

git:master:e2a5608e: ndb_redis: increasing a log message level

by Lucian Balaceanu

Module: kamailio Branch: master Commit: e2a5608e421d8e10e915abaadc0d9d3d5a155b8a URL: https://github.com/kamailio/kamailio/commit/e2a5608e421d8e10e915abaadc0d9d3… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2017-05-08T13:31:19+03:00 ndb_redis: increasing a log message level --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/e2a5608e421d8e10e915abaadc0d9d3… Patch: https://github.com/kamailio/kamailio/commit/e2a5608e421d8e10e915abaadc0d9d3… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 0bf9838..9fb7791 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -1029,7 +1029,7 @@ int redis_check_server(redisc_server_t *rsrv) { if (get_ticks() > rsrv->disable.restore_tick) { - LM_INFO("REDIS server %.*s re-enabled",rsrv->sname->len,rsrv->sname->s); + LM_NOTICE("REDIS server %.*s re-enabled",rsrv->sname->len,rsrv->sname->s); rsrv->disable.disabled = 0; rsrv->disable.consecutive_errors = 0; }

7 years, 6 months

linking WebRTC with SDR at Kamailio World?

by Daniel Pocock

Hi, There is a demo session at Kamailio World on Wednesday and I had an idea for a demo that could potentially be hacked together as a collaborative/team effort. The idea is simple: using WebRTC to control a radio transceiver. This is not so hard thanks to Software Defined Radio (SDR). It would be like RetroRTC[1], but with a radio instead of a rotary phone. I have SDR and ham equipment with me in Berlin (for use at OSCAL'17 on the weekend[2]) and but I simply wouldn't have time to put the whole thing together individually in the next two days. If anybody wants to collaborate on it with me, however, it is possible to break it into small pieces and we could get it going: - JsSIP / JSCommunicator[3] - adding a slider for squelch control - sending a SIP INFO message to send squelch level - adding a box for frequency selection - sending a SIP INFO message to change frequency - adding a PTT button - sending a SIP INFO message for PTT - adding a green LED light for RX (squelch open) and red for TX - receiving SIP INFO messages with RX and TX status (maybe some of that could be done with SUBSCRIBE/NOTIFY instead of SIP INFO?) - gqrx[4] (GNU-Radio based app developed in Python) - adding some hooks to receive commands over a message queue with Qpid Proton's Python API[5] and dispatch the commands to the button handlers - adding some hooks to send status (e.g. squelch open) over a topic with Qpid Proton - instead of sending the audio to the speaker, send it to the B2BUA or as RTP - SIP proxy or B2BUA - which one would be best? - add some glue code to map the SIP INFO messages to the Qpid Proton messages and vice versa - take the audio from gqrx (maybe regular RTP on localhost) and send it as DTLS-SRTP to the browser I had a look in Google and it doesn't find any example of anybody doing WebRTC with SDR before, so if we got this going it would be quite innovative. Regards, Daniel 1. http://retrortc.versatica.com/ 2. https://danielpocock.com/fsfe-fellowship-representative-and-upcoming-events 3. https://jscommunicator.org 4. http://gqrx.dk/ 5. https://qpid.apache.org/releases/qpid-proton-0.17.0/proton/python/book/tuto…

7 years, 6 months

git:master:d5d2bbd4: log_custom: exported functions to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d5d2bbd4fd6cad48bd0dcf8e577009f95ff3f53e URL: https://github.com/kamailio/kamailio/commit/d5d2bbd4fd6cad48bd0dcf8e577009f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-08T07:59:56+02:00 log_custom: exported functions to kemi framework --- Modified: src/modules/log_custom/log_custom_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d5d2bbd4fd6cad48bd0dcf8e577009f… Patch: https://github.com/kamailio/kamailio/commit/d5d2bbd4fd6cad48bd0dcf8e577009f… --- diff --git a/src/modules/log_custom/log_custom_mod.c b/src/modules/log_custom/log_custom_mod.c index b0ecbd7..f88a783 100644 --- a/src/modules/log_custom/log_custom_mod.c +++ b/src/modules/log_custom/log_custom_mod.c @@ -32,6 +32,7 @@ #include "../../core/forward.h" #include "../../core/resolve.h" #include "../../core/udp_server.h" +#include "../../core/kemi.h" MODULE_VERSION @@ -71,52 +72,6 @@ struct module_exports exports = { child_init /* per child init function */ }; - -int mod_register(char *path, int *dlflags, void *p1, void *p2) -{ - str dest = {0}; - int ret = 0; - struct sip_uri next_hop, *u; - char *p; - - if(_km_log_engine_type==0 || _km_log_engine_data==0) - return 0; - - - if(strcasecmp(_km_log_engine_type, "udp")!=0) - return 0; - - dest.s = _km_log_engine_data; - dest.len = strlen(dest.s); - - init_dest_info(&_lc_udp_dst); - - u = &next_hop; - u->port_no = 5060; - u->host = dest; - p = dest.s; - /* detect ipv6 */ - p = memchr(p, ']', dest.len); - if (p) p++; - else p = dest.s; - p = memchr(p, ':', dest.len - (p - dest.s)); - if (p) { - u->host.len = p - dest.s; - p++; - u->port_no = str2s(p, dest.len - (p - dest.s), NULL); - } - - ret = sip_hostport2su(&_lc_udp_dst.to, &u->host, u->port_no, - &_lc_udp_dst.proto); - if(ret!=0) { - LM_ERR("failed to resolve [%.*s]\n", u->host.len, - ZSW(u->host.s)); - return -1;; - } - - return 0; -} - /** * init module function */ @@ -195,3 +150,79 @@ void _lc_core_log_udp(int lpriority, const char *format, ...) va_end(arglist); udp_send(&_lc_udp_dst, obuf, n); } + +int ki_log_udp(sip_msg_t *msg, str *txt) +{ + int ret; + + if(_lc_log_udp==0) + return 1; + + ret=udp_send(&_lc_udp_dst, txt->s, txt->len); + + if(ret==0) return 1; + + return ret; + +} + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_log_custom_exports[] = { + { str_init("log_custom"), str_init("log_udp"), + SR_KEMIP_INT, ki_log_udp, + { 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 } } +}; +/* clang-format on */ + +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + str dest = {0}; + int ret = 0; + struct sip_uri next_hop, *u; + char *p; + + if(_km_log_engine_type==0 || _km_log_engine_data==0) + return 0; + + + if(strcasecmp(_km_log_engine_type, "udp")!=0) + return 0; + + dest.s = _km_log_engine_data; + dest.len = strlen(dest.s); + + init_dest_info(&_lc_udp_dst); + + u = &next_hop; + u->port_no = 5060; + u->host = dest; + p = dest.s; + /* detect ipv6 */ + p = memchr(p, ']', dest.len); + if (p) p++; + else p = dest.s; + p = memchr(p, ':', dest.len - (p - dest.s)); + if (p) { + u->host.len = p - dest.s; + p++; + u->port_no = str2s(p, dest.len - (p - dest.s), NULL); + } + + ret = sip_hostport2su(&_lc_udp_dst.to, &u->host, u->port_no, + &_lc_udp_dst.proto); + if(ret!=0) { + LM_ERR("failed to resolve [%.*s]\n", u->host.len, + ZSW(u->host.s)); + return -1; + } + + sr_kemi_modules_add(sr_kemi_log_custom_exports); + return 0; +}

7 years, 6 months

git:master:17be61ed: path: exported functions to kemi interface

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 17be61ed40dc995e301c2bf24f7e7151a3e16ff0 URL: https://github.com/kamailio/kamailio/commit/17be61ed40dc995e301c2bf24f7e715… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-07T08:22:57+02:00 path: exported functions to kemi interface --- Modified: src/modules/path/path.c Modified: src/modules/path/path.h Modified: src/modules/path/path_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/17be61ed40dc995e301c2bf24f7e715… Patch: https://github.com/kamailio/kamailio/commit/17be61ed40dc995e301c2bf24f7e715…

7 years, 6 months

[kamailio/kamailio] Parse error in config file with $msrp(msgid) pseudovariable (#1122)

by NGSegovia

### Description I got parse error in config file. I am using MSRP module and if I try to use (to print a log) with `$msrp(msgid)` I get an error. According to the psudovariables documentation should work.  ### Troubleshooting #### Reproduction Just use within an event_route[msrp:frame-in] block $msrp(msgid). #### Log Messages  ``` 0(9827) ERROR: msrp [msrp_vars.c:118]: pv_parse_msrp_name(): unknown PV msrp name msgid 0(9827) ERROR: <core> [pvapi.c:877]: pv_parse_spec2(): pvar "msrp" has an invalid name param [msgid] 0(9827) ERROR: <core> [pvapi.c:1032]: pv_parse_spec2(): wrong char [)/41] in [$msrp(msgid)] at [11 (5)] 0(9827) : <core> [cfg.y:3368]: yyerror_at(): parse error in config file route.cfg, line 649, column 40-51: Can't get from cache: $msrp(msgid) ERROR: bad config file (1 errors) ``` ### Additional Information * **Kamailio Version** -4.4.5 * **Operating System**:  ``` Linux test 2.6.32-642.15.1.el6.x86_64 #1 SMP Fri Feb 24 14:31:22 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/1122

7 years, 6 months

← Newer
1
...
19
20
21
22
23
24
25
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2017