sr-dev January 2019

sr-dev@lists.kamailio.org

27 participants
301 discussions

git:master:a975bca1: websocket: put the ws connection after keepalive

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a975bca1702ea2f3db47f834f7e4da2786ced201 URL: https://github.com/kamailio/kamailio/commit/a975bca1702ea2f3db47f834f7e4da2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-31T09:25:28+01:00 websocket: put the ws connection after keepalive - c&p error of last commits resulted in doing get op instead --- Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/a975bca1702ea2f3db47f834f7e4da2… Patch: https://github.com/kamailio/kamailio/commit/a975bca1702ea2f3db47f834f7e4da2… --- diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index 94004cb2f2..840125a041 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -820,7 +820,7 @@ void ws_keepalive(unsigned int ticks, void *param) } } if(wsc) { - wsconn_get(list_head[i].id); + wsconn_put_id(list_head[i].id); } i++;

5 years, 9 months

Planing the release of Kamailio v5.1.7

by Daniel-Constantin Mierla

Hello, I am considering to release Kamailio v5.1.7 later this week, likely on Thursday, January 31, 2019. As usual, here come the notice to report any issue that you are aware of and not yet registered on the bug tracker in order to give them a chance to be analyzed and eventually fixed before the release. Also, take a look at the branch 5.1 in git and check if there are any missing commits from those you expected to be backported. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 6-8, 2019 -- www.kamailioworld.com Kamailio Advanced Training - Mar 4-6, 2019 in Berlin; Mar 25-27, 2019, in Washington, DC, USA -- www.asipto.com

5 years, 9 months

git:master:d61b570c: core: added command line option --alias=val

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d61b570c21200bb90cb00d8203f62997c6035bdb URL: https://github.com/kamailio/kamailio/commit/d61b570c21200bb90cb00d8203f6299… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-30T13:39:04+01:00 core: added command line option --alias=val * set an alias from command line * example: kamailio --alias=udp:kamailio.org:5060 ... --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/d61b570c21200bb90cb00d8203f6299… Patch: https://github.com/kamailio/kamailio/commit/d61b570c21200bb90cb00d8203f6299… --- diff --git a/src/main.c b/src/main.c index f1a26359f6..4e3b9112e4 100644 --- a/src/main.c +++ b/src/main.c @@ -155,6 +155,8 @@ Usage: " NAME " [options]\n\ Options:\n\ -a mode Auto aliases mode: enable with yes or on,\n\ disable with no or off\n\ + --alias=val Add an alias, the value has to be '[proto:]hostname[:port]'\n\ + (like for 'alias' global parameter)\n\ -A define Add config pre-processor define (e.g., -A WITH_AUTH)\n\ -b nr Maximum receive buffer size which will not be exceeded by\n\ auto-probing procedure even if OS allows\n\ @@ -170,7 +172,7 @@ Options:\n\ -g gid Change gid (group id)\n\ -G file Create a pgid file\n\ -h This help message\n\ - --help Same as `-h`\n\ + --help Long option for `-h`\n\ -I Print more internal compile flags and options\n\ -K Turn on \"via:\" host checking when forwarding replies\n\ -l address Listen on the specified address/interface (multiple -l\n\ @@ -209,8 +211,9 @@ Options:\n\ " -T Disable tcp\n" #endif " -u uid Change uid (user id)\n\ - -v (-V) Version number\n\ - --version Same as `-v`\n\ + -v Version number\n\ + --version Long option for `-v`\n\ + -V Alternative for `-v`\n\ -x name Specify internal manager for shared memory (shm)\n\ - can be: fm, qm or tlsf\n\ -X name Specify internal manager for private memory (pkg)\n\ @@ -1878,9 +1881,13 @@ int main(int argc, char** argv) int option_index = 0; +#define KARGOPTVAL 1024 static struct option long_options[] = { + /* long options with short variant */ {"help", no_argument, 0, 'h'}, {"version", no_argument, 0, 'v'}, + /* long options without short variant */ + {"alias", required_argument, 0, KARGOPTVAL}, {0, 0, 0, 0 } }; @@ -2101,6 +2108,21 @@ int main(int argc, char** argv) case 's': case 'Y': break; + + /* long options */ + case KARGOPTVAL: + if(parse_phostport(optarg, &tmp, &tmp_len, + &port, &proto)!=0) { + fprintf(stderr, "Invalid alias value '%s'\n", optarg); + goto error; + } + if(add_alias(tmp, tmp_len, port, proto)<0) { + fprintf(stderr, "Failed to add alias value '%s'\n", optarg); + goto error; + } + break; + + /* special cases */ case '?': if (isprint(optopt)) { fprintf(stderr, "Unknown option '-%c'." @@ -2122,6 +2144,7 @@ int main(int argc, char** argv) optopt, option_index); } goto error; + default: fprintf(stderr, "Invalid option code '0x%x'", c); return -1;

5 years, 9 months

git:master:60f13ffe: core: added long command line options

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 60f13ffe2b97d21841335361ccadfa3061c0c3db URL: https://github.com/kamailio/kamailio/commit/60f13ffe2b97d21841335361ccadfa3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-30T13:14:06+01:00 core: added long command line options * --help - print help message * --version - print version string --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/60f13ffe2b97d21841335361ccadfa3… Patch: https://github.com/kamailio/kamailio/commit/60f13ffe2b97d21841335361ccadfa3… --- diff --git a/src/main.c b/src/main.c index 44b9f8399d..f1a26359f6 100644 --- a/src/main.c +++ b/src/main.c @@ -35,6 +35,7 @@ #include <errno.h> #include <ctype.h> #include <string.h> +#include <getopt.h> #include <netdb.h> #include <unistd.h> #include <sys/types.h> @@ -169,6 +170,7 @@ Options:\n\ -g gid Change gid (group id)\n\ -G file Create a pgid file\n\ -h This help message\n\ + --help Same as `-h`\n\ -I Print more internal compile flags and options\n\ -K Turn on \"via:\" host checking when forwarding replies\n\ -l address Listen on the specified address/interface (multiple -l\n\ @@ -208,6 +210,7 @@ Options:\n\ #endif " -u uid Change uid (user id)\n\ -v (-V) Version number\n\ + --version Same as `-v`\n\ -x name Specify internal manager for shared memory (shm)\n\ - can be: fm, qm or tlsf\n\ -X name Specify internal manager for private memory (pkg)\n\ @@ -1873,6 +1876,14 @@ int main(int argc, char** argv) char *p; struct stat st = {0}; + int option_index = 0; + + static struct option long_options[] = { + {"help", no_argument, 0, 'h'}, + {"version", no_argument, 0, 'v'}, + {0, 0, 0, 0 } + }; + /*init*/ time(&up_since); creator_pid = getpid(); @@ -1901,7 +1912,8 @@ int main(int argc, char** argv) * later */ opterr = 0; - while((c=getopt(argc,argv,options))!=-1) { + option_index = 0; + while((c=getopt_long(argc, argv, options, long_options, &option_index))!=-1) { switch(c) { case 'd': debug_flag = 1; @@ -1977,9 +1989,10 @@ int main(int argc, char** argv) pp_define_core(); /* process command line (cfg. file path etc) */ - optind = 1; /* reset getopt */ + optind = 1; /* reset getopt index */ + option_index = 0; /* switches required before script processing */ - while((c=getopt(argc,argv,options))!=-1) { + while((c=getopt_long(argc, argv, options, long_options, &option_index))!=-1) { switch(c) { case 'M': case 'x': @@ -2090,21 +2103,28 @@ int main(int argc, char** argv) break; case '?': if (isprint(optopt)) { - fprintf(stderr, "Unknown option `-%c'." + fprintf(stderr, "Unknown option '-%c'." " Use -h for help.\n", optopt); } else { - fprintf(stderr, "Unknown option character `\\x%x'." + fprintf(stderr, "Unknown option code '0x%x' (%d)." " Use -h for help.\n", - optopt); + optopt, option_index); } goto error; case ':': - fprintf(stderr, "Option `-%c' requires an argument." + if (isprint(optopt)) { + fprintf(stderr, "Option '-%c' requires an argument." " Use -h for help.\n", - optopt); + optopt); + } else { + fprintf(stderr, "Option code '0x%x' (%d) requires an argument." + " Use -h for help.\n", + optopt, option_index); + } goto error; default: - abort(); + fprintf(stderr, "Invalid option code '0x%x'", c); + return -1; } } if (shm_mem_size == 0) { @@ -2186,8 +2206,9 @@ int main(int argc, char** argv) goto error; } /* options with higher priority than cfg file */ - optind = 1; /* reset getopt */ - while((c=getopt(argc,argv,options))!=-1) { + optind = 1; /* reset getopt index */ + option_index = 0; + while((c=getopt_long(argc, argv, options, long_options, &option_index))!=-1) { switch(c) { case 'f': case 'c':

5 years, 9 months

git:master:adb599f0: core: better order for command line options in help message

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: adb599f0c7c91c4d21f491eaa81c23694fb65655 URL: https://github.com/kamailio/kamailio/commit/adb599f0c7c91c4d21f491eaa81c236… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-30T09:06:45+01:00 core: better order for command line options in help message --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/adb599f0c7c91c4d21f491eaa81c236… Patch: https://github.com/kamailio/kamailio/commit/adb599f0c7c91c4d21f491eaa81c236…

5 years, 9 months

[kamailio/kamailio] BLOG conversion (#1255)

by sergey-safarov

### Description I use kazoo and postgres modules on my host. I found that many database operation generates error like ``` 19(150) exec: *** cfgtrace:request_route=[kazoo:consumer-event-presence-dialog-update] c=[//etc/kamailio/presence-role.cfg] l=270 a=32 n=kazoo_pua_publish_presence 17(148) exec: *** cfgtrace:request_route=[kazoo:consumer-event-presence-dialog-update] c=[//etc/kamailio/presence-role.cfg] l=271 a=27 n=pres_refresh_watchers Entity: line 1: parser error : Start tag expected, '<' not found \x3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d38223f3e3c ^ 17(148) ERROR: presence_xml [notify_body.c:551]: agregate_xmls(): while parsing xml body message 17(148) ERROR: presence_xml [notify_body.c:156]: pres_agg_nbody(): while aggregating body 19(150) exec: *** cfgtrace:request_route=[kazoo:consumer-event-presence-dialog-update] c=[//etc/kamailio/presence-role.cfg] l=271 a=27 n=pres_refresh_watchers Entity: line 1: parser error : Start tag expected, '<' not found \x3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d38223f3e3c ^ 19(150) ERROR: presence_xml [notify_body.c:551]: agregate_xmls(): while parsing xml body message 19(150) ERROR: presence_xml [notify_body.c:156]: pres_agg_nbody(): while aggregating body 18(149) exec: *** cfgtrace:request_route=[kazoo:consumer-event-nodes-advertise] c=[//etc/kamailio/nodes-role.cfg] l=66 a=63 n=assign 18(149) exec: *** cfgtrace:request_route=[kazoo:consumer-event-nodes-advertise] c=[//etc/kamailio/nodes-role.cfg] l=74 a=16 n=if 18(149) exec: *** cfgtrace:request_route=[kazoo:consumer-event-nodes-advertise] c=[//etc/kamailio/nodes-role.cfg] l=74 a=16 n=if 18(149) exec: *** cfgtrace:request_route=[kazoo:consumer-event-nodes-advertise] c=[//etc/kamailio/nodes-role.cfg] l=75 a=27 n=mq_add Entity: line 1: parser error : Start tag expected, '<' not found \x3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d38223f3e3c ^ 17(148) ERROR: presence_xml [notify_body.c:551]: agregate_xmls(): while parsing xml body message 17(148) ERROR: presence_xml [notify_body.c:156]: pres_agg_nbody(): while aggregating body Entity: line 1: parser error : Start tag expected, '<' not found \x3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d38223f3e3c ^ 19(150) ERROR: presence_xml [notify_body.c:551]: agregate_xmls(): while parsing xml body message 19(150) ERROR: presence_xml [notify_body.c:156]: pres_agg_nbody(): while aggregating body Entity: line 1: parser error : Start tag expected, '<' not found \x3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d38223f3e3c ^ 17(148) ERROR: presence_xml [notify_body.c:551]: agregate_xmls(): while parsing xml body message 17(148) ERROR: presence_xml [notify_body.c:156]: pres_agg_nbody(): while aggregating body 17(148) exec: *** cfgtrace:request_route=[kazoo:consumer-event-presence-dialog-update] c=[//etc/kamailio/presence-role.cfg] l=276 a=26 n=xlog 17(148) INFO: <script>: 3O75Qw3gqR3ZNla5RfCgQLVW0-8KKbrT|log|finished processing dialog update for sip:2496@rcsnet.ru state confirmed from sip:217.12.247.98:11000 at 1506632313/1506632313/1506632313 Entity: line 1: parser error : Start tag expected, '<' not found \x3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d38223f3e3c ^ ``` After some debugging i found that kamailio wants save to database xml string like this as BLOB object ``` <?xml version="1.0" encoding="UTF-8"?><presence xmlns="urn:ietf:params:xml:ns:pidf" xmlns:dm="urn:ietf:params:xml:ns:pidf:data-model" xmlns:rpid="urn:ietf:params:xml:ns:pidf:rpid" xmlns:c="urn:ietf:params:xml:ns:pidf:cipid" entity="2496"> <tuple xmlns="urn:ietf:params:xml:ns:pidf" id="t8No1hQnp65U33jS1oqFMgxbIRPq-iFP"><status><basic>open</basic></status></tuple><note xmlns="urn:ietf:params:xml:ns:pidf">On the Phone</note><dm:person xmlns:dm="urn:ietf:params:xml:ns:pidf:data-model" xmlns:rpid="urn:ietf:params:xml:ns:pidf:rpid" id="1"><rpid:activities><rpid:on-the-phone/></rpid:activities><dm:note>On the Phone</dm:note></dm:person></presence> ``` And later tries to read. But when this XML read reverse conversion of BLOB to string is not take place. And late used BLOB as is. This breaks presentation logic completely. #### Reproduction Configure kamailio on kazoo cluster to use PostgreSQL database On phone create subscribe to second >From second phone create new call. #### Operating System CentOS 7 Linux node2.docker.rcsnet.ru 3.10.0-514.16.1.el7.x86_64 #1 SMP Wed Apr 12 15:04:24 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/1255

5 years, 9 months

git:master:a0552144: pike: init head list and safety check

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a055214404b86d6418b7b6797e789773f1f42adb URL: https://github.com/kamailio/kamailio/commit/a055214404b86d6418b7b6797e78977… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-29T14:24:34+01:00 pike: init head list and safety check - related to GH #1822 --- Modified: src/modules/pike/pike_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/a055214404b86d6418b7b6797e78977… Patch: https://github.com/kamailio/kamailio/commit/a055214404b86d6418b7b6797e78977… --- diff --git a/src/modules/pike/pike_funcs.c b/src/modules/pike/pike_funcs.c index 6567ed59ef..2405090680 100644 --- a/src/modules/pike/pike_funcs.c +++ b/src/modules/pike/pike_funcs.c @@ -178,6 +178,7 @@ void clean_routine(unsigned int ticks , void *param) * be at least one element removed */ if (timer==0 || is_list_empty( timer )) return; /* quick exit */ + memset(&head, 0, sizeof(struct list_link)); /* get the expired elements */ lock_get( timer_lock ); /* check again for empty list */ @@ -201,7 +202,7 @@ void clean_routine(unsigned int ticks , void *param) continue; lock_tree_branch( i ); - for( ll=head.next ; ll!=&head ; ) { + for( ll=head.next; ll!=&head && ll!=NULL; ) { node = ll2ipnode( ll ); ll = ll->next; /* skip nodes from a different branch */

5 years, 9 months

git:master:f26f3a2b: modules: readme files regenerated - tsilo ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: f26f3a2bdc33bc8329e0dbdfe26d1d93c8447ecb URL: https://github.com/kamailio/kamailio/commit/f26f3a2bdc33bc8329e0dbdfe26d1d9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-28T21:01:54+01:00 modules: readme files regenerated - tsilo ... [skip ci] --- Modified: src/modules/tsilo/README --- Diff: https://github.com/kamailio/kamailio/commit/f26f3a2bdc33bc8329e0dbdfe26d1d9… Patch: https://github.com/kamailio/kamailio/commit/f26f3a2bdc33bc8329e0dbdfe26d1d9… --- diff --git a/src/modules/tsilo/README b/src/modules/tsilo/README index 453a9a7e4e..47c14ce1bb 100644 --- a/src/modules/tsilo/README +++ b/src/modules/tsilo/README @@ -196,7 +196,7 @@ if (is_method("INVITE")) { Example 1.4. ts_append usage ... if (is_method("REGISTER")) { - ts_append("location", "$tU"); + ts_append("location", "$tu"); } ...

5 years, 10 months

git:5.2:cd25830e: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.2 Commit: cd25830eb881b1dd667544f68a94efdf195a7cea URL: https://github.com/kamailio/kamailio/commit/cd25830eb881b1dd667544f68a94efd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-28T21:01:40+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tsilo/README --- Diff: https://github.com/kamailio/kamailio/commit/cd25830eb881b1dd667544f68a94efd… Patch: https://github.com/kamailio/kamailio/commit/cd25830eb881b1dd667544f68a94efd… --- diff --git a/src/modules/tsilo/README b/src/modules/tsilo/README index 453a9a7e4e..47c14ce1bb 100644 --- a/src/modules/tsilo/README +++ b/src/modules/tsilo/README @@ -196,7 +196,7 @@ if (is_method("INVITE")) { Example 1.4. ts_append usage ... if (is_method("REGISTER")) { - ts_append("location", "$tU"); + ts_append("location", "$tu"); } ...

5 years, 10 months

git:5.1:e131f95f: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.1 Commit: e131f95f234ce0e4e7dc7752f796e7c42620ce82 URL: https://github.com/kamailio/kamailio/commit/e131f95f234ce0e4e7dc7752f796e7c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-28T21:01:28+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tsilo/README --- Diff: https://github.com/kamailio/kamailio/commit/e131f95f234ce0e4e7dc7752f796e7c… Patch: https://github.com/kamailio/kamailio/commit/e131f95f234ce0e4e7dc7752f796e7c… --- diff --git a/src/modules/tsilo/README b/src/modules/tsilo/README index a60594a044..979e604241 100644 --- a/src/modules/tsilo/README +++ b/src/modules/tsilo/README @@ -196,7 +196,7 @@ if (is_method("INVITE")) { Example 1.4. ts_append usage ... if (is_method("REGISTER")) { - ts_append("location", "$tU"); + ts_append("location", "$tu"); } ...

5 years, 10 months

← Newer
1
...
7
8
9
10
11
12
13
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2019