sr-dev October 2017

sr-dev@lists.kamailio.org

33 participants
301 discussions

ul.add params
by Juha Heinanen 18 Oct '17

18 Oct '17

I noticed that my ul.add command that works OK in 5.0 doesn't anymore work in 5.1. I get back to the xmlrpc query: <name>faultString</name> <value><string>Not enough parameters or wrong format</string></value> I then went and compared ul.add in 5.0 and 5.1 and noticed that in 5.1 it has added two optional params: received (optional) value with the received-from address (source address) (use '0' or '.' if it should not be set). Format: sip:srcip:srcport;transport=abc socket (optional) value with the local socket address (use '0' or '.' if it should not be set). Format: proto:localip:localport Note: the position of parameters is relevant, in the case of optional parameters, use '0' or '.' for parameters that should not be set which are positioned before any parameter that has to be set. What does that mean? Isn't optional really optional, but 0 or . is needed? -- Juha

2 8

git:master:cae9b565: sipdump: details of running processes written in meta file
by Daniel-Constantin Mierla 18 Oct '17

18 Oct '17

Module: kamailio Branch: master Commit: cae9b5655b1779e4f968f9ab16a5bae41151e4a4 URL: https://github.com/kamailio/kamailio/commit/cae9b5655b1779e4f968f9ab16a5bae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-18T18:41:20+02:00 sipdump: details of running processes written in meta file --- Modified: src/modules/sipdump/sipdump_mod.c Modified: src/modules/sipdump/sipdump_write.c --- Diff: https://github.com/kamailio/kamailio/commit/cae9b5655b1779e4f968f9ab16a5bae… Patch: https://github.com/kamailio/kamailio/commit/cae9b5655b1779e4f968f9ab16a5bae… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index 4a7dfd4c16..c95e0b091a 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -169,7 +169,6 @@ int sipdump_buffer_write(sipdump_info_t *sdi, str *obuf) ti = localtime(&tv.tv_sec); obuf->len = snprintf(_sipdump_wbuf, SIPDUMP_WBUF_SIZE, "====================\n" - "v: 1.0\n" "tag: %.*s\n" "pid: %d\n" "process: %d\n" diff --git a/src/modules/sipdump/sipdump_write.c b/src/modules/sipdump/sipdump_write.c index d3b2a8a7fe..03ed711d81 100644 --- a/src/modules/sipdump/sipdump_write.c +++ b/src/modules/sipdump/sipdump_write.c @@ -28,6 +28,8 @@ #include "../../core/dprint.h" #include "../../core/ut.h" #include "../../core/globals.h" +#include "../../core/ver.h" +#include "../../core/pt.h" #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" @@ -133,6 +135,7 @@ static int sipdump_write_meta(char *fpath) { char mpath[SIPDUMP_FPATH_SIZE]; int len; + int i; FILE *mfile = NULL; struct tm *ti; @@ -156,9 +159,19 @@ static int sipdump_write_meta(char *fpath) ti = localtime(&up_since); fprintf(mfile, "v: 1.0\n" - "start: %s", - asctime(ti) + "version: %s %s\n" + "start: %s" + "nrprocs: %d\n", + ver_name, ver_version, + asctime(ti), + *process_count ); + for (i=0; i<*process_count; i++) { + fprintf(mfile, + "process: %d %d %s\n", + i, pt[i].pid, pt[i].desc); + } + fclose(mfile); return 0; }

1 0

git:master:9483efe6: xmlrpc: fix handling the optional param spec on no more params
by Daniel-Constantin Mierla 18 Oct '17

18 Oct '17

Module: kamailio Branch: master Commit: 9483efe6af26a2a8b08ee132e8ed2afe25e71cbc URL: https://github.com/kamailio/kamailio/commit/9483efe6af26a2a8b08ee132e8ed2af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-18T18:41:01+02:00 xmlrpc: fix handling the optional param spec on no more params --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/9483efe6af26a2a8b08ee132e8ed2af… Patch: https://github.com/kamailio/kamailio/commit/9483efe6af26a2a8b08ee132e8ed2af… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index d3689d3af1..2e7c644279 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -1533,7 +1533,13 @@ static int rpc_scan(rpc_ctx_t* ctx, char* fmt, ...) f=(autoconvert?GET_X_AUTOCONV:0) | (lflf2crlf?GET_X_LFLF2CRLF:0); while(*fmt) { - if (!ctx->act_param) goto error; + if (!ctx->act_param) { + if(*fmt=='*') { + break; + } else { + goto error; + } + } value = ctx->act_param->xmlChildrenNode; switch(*fmt) {

1 0

git:master:87d71619: jsonrpcs: fix handling the optional param spec on no more params
by Daniel-Constantin Mierla 18 Oct '17

18 Oct '17

Module: kamailio Branch: master Commit: 87d71619e7896d3d333bb6c15d4c00616add71a6 URL: https://github.com/kamailio/kamailio/commit/87d71619e7896d3d333bb6c15d4c006… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-18T18:36:26+02:00 jsonrpcs: fix handling the optional param spec on no more params --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/87d71619e7896d3d333bb6c15d4c006… Patch: https://github.com/kamailio/kamailio/commit/87d71619e7896d3d333bb6c15d4c006… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index cd99ad8a01..e2b4b80cb6 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -649,7 +649,7 @@ static int jsonrpc_scan(jsonrpc_ctx_t* ctx, char* fmt, ...) ctx->req_node = ctx->req_node->next; } /* error if there is still a scan char type and it is not optional */ - if(*fmt && mandatory_param==1) + if(*fmt && *fmt!='*' && mandatory_param==1) goto error; va_end(ap);

1 0

git:master:7ffa6a4f: usrloc: log message when rpc ul.add does not get proper params
by Daniel-Constantin Mierla 18 Oct '17

18 Oct '17

Module: kamailio Branch: master Commit: 7ffa6a4fd2b4daf9edf0f46d5be0bb9cc06e00d7 URL: https://github.com/kamailio/kamailio/commit/7ffa6a4fd2b4daf9edf0f46d5be0bb9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-18T18:35:31+02:00 usrloc: log message when rpc ul.add does not get proper params --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/7ffa6a4fd2b4daf9edf0f46d5be0bb9… Patch: https://github.com/kamailio/kamailio/commit/7ffa6a4fd2b4daf9edf0f46d5be0bb9… --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index d9533af262..c7d48cde8f 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -599,6 +599,7 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) &dtemp, &path, &ci.flags, &ci.cflags, &ci.methods, &ci.received, &socket); if (ret < 9) { + LM_ERR("not enough parameters - read so far: %d\n", ret); rpc->fault(ctx, 500, "Not enough parameters or wrong format"); return; }

1 0

git:master:6bfdbbcd: sipdump: write a meta file along the data file
by Daniel-Constantin Mierla 18 Oct '17

18 Oct '17

Module: kamailio Branch: master Commit: 6bfdbbcda638265409be1f22bd19eda8beed24ff URL: https://github.com/kamailio/kamailio/commit/6bfdbbcda638265409be1f22bd19eda… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-18T09:11:58+02:00 sipdump: write a meta file along the data file - store there the common details (runtime environment attributes) --- Modified: src/modules/sipdump/sipdump_write.c --- Diff: https://github.com/kamailio/kamailio/commit/6bfdbbcda638265409be1f22bd19eda… Patch: https://github.com/kamailio/kamailio/commit/6bfdbbcda638265409be1f22bd19eda… --- diff --git a/src/modules/sipdump/sipdump_write.c b/src/modules/sipdump/sipdump_write.c index 4a566e9ff5..d3b2a8a7fe 100644 --- a/src/modules/sipdump/sipdump_write.c +++ b/src/modules/sipdump/sipdump_write.c @@ -27,6 +27,7 @@ #include "../../core/dprint.h" #include "../../core/ut.h" +#include "../../core/globals.h" #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" @@ -67,7 +68,7 @@ int sipdump_list_init(int en) } /** - * + * */ int sipdump_enabled(void) { @@ -86,7 +87,7 @@ int sipdump_list_destroy(void) sipdump_data_t *sdd0 = NULL; if(_sipdump_list==NULL) return 0; - + sdd=_sipdump_list->first; while(sdd!=NULL) { sdd0 = sdd; @@ -126,7 +127,44 @@ int sipdump_list_add(str *data) } /** - * + * + */ +static int sipdump_write_meta(char *fpath) +{ + char mpath[SIPDUMP_FPATH_SIZE]; + int len; + FILE *mfile = NULL; + struct tm *ti; + + len = strlen(fpath); + if(len>=SIPDUMP_FPATH_SIZE-1) { + LM_ERR("file path too long\n"); + return -1; + } + strcpy(mpath, fpath); + mpath[len-4] = 'm'; + mpath[len-3] = 'e'; + mpath[len-2] = 't'; + mpath[len-1] = 'a'; + + LM_DBG("writing meta to file: %s\n", mpath); + mfile = fopen( mpath , "w" ); + if(mfile==NULL) { + LM_ERR("failed to open meta file %s\n", mpath); + return -1; + } + ti = localtime(&up_since); + fprintf(mfile, + "v: 1.0\n" + "start: %s", + asctime(ti) + ); + fclose(mfile); + return 0; +} + +/** + * */ static int sipdump_rotate_file(void) { @@ -153,18 +191,19 @@ static int sipdump_rotate_file(void) 1900+ti->tm_year, ti->tm_mon, ti->tm_mday, ti->tm_hour, ti->tm_min, ti->tm_sec); LM_DBG("writing to file: %s (%d)\n", _sipdump_fpath, n); - _sipdump_file = fopen( _sipdump_fpath , "w" ); + _sipdump_file = fopen( _sipdump_fpath, "w" ); if(_sipdump_file==NULL) { LM_ERR("failed to open file %s\n", _sipdump_fpath); return -1; } + sipdump_write_meta(_sipdump_fpath); sipdump_last_rotate = tv; - + return 0; } /** - * + * */ int sipdump_file_init(str *folder, str *fprefix) { @@ -288,4 +327,4 @@ int sipdump_rpc_init(void) return -1; } return 0; -} \ No newline at end of file +}

1 0

git:master:4de01bbf: geoip: fixed typo in definition of gip variable
by Daniel-Constantin Mierla 17 Oct '17

17 Oct '17

Module: kamailio Branch: master Commit: 4de01bbf3c0a80e67554285988a92fcf18ff9f2b URL: https://github.com/kamailio/kamailio/commit/4de01bbf3c0a80e67554285988a92fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-17T09:15:03+02:00 geoip: fixed typo in definition of gip variable --- Modified: src/modules/geoip/geoip_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4de01bbf3c0a80e67554285988a92fc… Patch: https://github.com/kamailio/kamailio/commit/4de01bbf3c0a80e67554285988a92fc… --- diff --git a/src/modules/geoip/geoip_mod.c b/src/modules/geoip/geoip_mod.c index ab827a17a5..556806ea80 100644 --- a/src/modules/geoip/geoip_mod.c +++ b/src/modules/geoip/geoip_mod.c @@ -46,7 +46,7 @@ static int w_geoip_match(struct sip_msg* msg, char* str1, char* str2); static int geoip_match(sip_msg_t *msg, str *tomatch, str *pvclass); static pv_export_t mod_pvs[] = { - { {"gip", sizeof("git")-1}, PVT_OTHER, pv_get_geoip, 0, + { {"gip", sizeof("gip")-1}, PVT_OTHER, pv_get_geoip, 0, pv_parse_geoip_name, 0, 0, 0 }, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; @@ -153,4 +153,4 @@ static sr_kemi_t sr_kemi_geoip_exports[] = { int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_geoip_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:ad84dd05: pkg/kamailio/deb: buster files
by Victor Seva 17 Oct '17

17 Oct '17

Module: kamailio Branch: master Commit: ad84dd05e678a180663c857637154bac1b159c27 URL: https://github.com/kamailio/kamailio/commit/ad84dd05e678a180663c857637154ba… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-10-17T09:03:07+02:00 pkg/kamailio/deb: buster files --- Added: pkg/kamailio/deb/buster/changelog Added: pkg/kamailio/deb/buster/compat Added: pkg/kamailio/deb/buster/control Added: pkg/kamailio/deb/buster/copyright Added: pkg/kamailio/deb/buster/kamailio-autheph-modules.lintian-overrides Added: pkg/kamailio/deb/buster/kamailio-berkeley-bin.dirs Added: pkg/kamailio/deb/buster/kamailio-dnssec-modules.lintian-overrides Added: pkg/kamailio/deb/buster/kamailio-outbound-modules.lintian-overrides Added: pkg/kamailio/deb/buster/kamailio-tls-modules.lintian-overrides Added: pkg/kamailio/deb/buster/kamailio-websocket-modules.lintian-overrides Added: pkg/kamailio/deb/buster/kamailio.README.Debian Added: pkg/kamailio/deb/buster/kamailio.default Added: pkg/kamailio/deb/buster/kamailio.examples Added: pkg/kamailio/deb/buster/kamailio.init Added: pkg/kamailio/deb/buster/kamailio.lintian-overrides Added: pkg/kamailio/deb/buster/kamailio.postinst Added: pkg/kamailio/deb/buster/kamailio.service Added: pkg/kamailio/deb/buster/rules Added: pkg/kamailio/deb/buster/source.lintian-overrides Added: pkg/kamailio/deb/buster/source/format Added: pkg/kamailio/deb/buster/watch --- Diff: https://github.com/kamailio/kamailio/commit/ad84dd05e678a180663c857637154ba… Patch: https://github.com/kamailio/kamailio/commit/ad84dd05e678a180663c857637154ba…

1 0

git:master:6b021e19: pkg/kamailio/deb: add buster support
by Victor Seva 17 Oct '17

17 Oct '17

Module: kamailio Branch: master Commit: 6b021e199cfdfaac3e4723320742377e9da1e1d0 URL: https://github.com/kamailio/kamailio/commit/6b021e199cfdfaac3e4723320742377… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-10-17T09:02:16+02:00 pkg/kamailio/deb: add buster support * remove buildserver.net reference from backports --- Added: pkg/kamailio/deb/debian/backports/buster Modified: pkg/kamailio/deb/debian/backports/jessie Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/sid Modified: pkg/kamailio/deb/debian/backports/stretch Modified: pkg/kamailio/deb/debian/backports/trusty Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/debian/backports/xenial --- Diff: https://github.com/kamailio/kamailio/commit/6b021e199cfdfaac3e4723320742377… Patch: https://github.com/kamailio/kamailio/commit/6b021e199cfdfaac3e4723320742377… --- diff --git a/pkg/kamailio/deb/debian/backports/buster b/pkg/kamailio/deb/debian/backports/buster new file mode 100755 index 0000000000..9fc54a9e40 --- /dev/null +++ b/pkg/kamailio/deb/debian/backports/buster @@ -0,0 +1,23 @@ +#!/bin/bash +# +# Target dist: Debian buster +DIST=buster + +rm -rf ${DIST} +cp -r debian ${DIST} + +# No mi_xmlrpc module +sed -i -e '/libxmlrpc-c3-dev/d' -e '/^Package: kamailio-xmlrpc-modules/,/^$/d' \ + ${DIST}/control +sed -i -e 's/ mi_xmlrpc[ ,$]*/ /' ${DIST}/rules +sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ mi_xmlrpc/' ${DIST}/rules + +# No dnssec module: +sed -i -e '/libval-dev/d' -e '/^Package: kamailio-dnssec-modules/,/^$/d' \ + ${DIST}/control +sed -i -e 's/ dnssec[ ,$]*/ /' ${DIST}/rules +sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ dnssec/' ${DIST}/rules + +# clean backports scripts +rm -rf ${DIST}/backports +exit 0 diff --git a/pkg/kamailio/deb/debian/backports/jessie b/pkg/kamailio/deb/debian/backports/jessie index ec8187fb17..48fc3d3798 100755 --- a/pkg/kamailio/deb/debian/backports/jessie +++ b/pkg/kamailio/deb/debian/backports/jessie @@ -1,7 +1,5 @@ #!/bin/bash # -# Hook for automatic backports at buildserver.net -# # Target dist: Debian Jessie DIST=jessie diff --git a/pkg/kamailio/deb/debian/backports/precise b/pkg/kamailio/deb/debian/backports/precise index 3fbca2811f..80a2beff03 100755 --- a/pkg/kamailio/deb/debian/backports/precise +++ b/pkg/kamailio/deb/debian/backports/precise @@ -1,7 +1,5 @@ #!/bin/bash # -# Hook for automatic backports at buildserver.net -# # Target dist: Debian Squeeze DIST=precise diff --git a/pkg/kamailio/deb/debian/backports/sid b/pkg/kamailio/deb/debian/backports/sid index df1a365da9..e642c049e0 100755 --- a/pkg/kamailio/deb/debian/backports/sid +++ b/pkg/kamailio/deb/debian/backports/sid @@ -1,7 +1,5 @@ #!/bin/bash # -# Hook for automatic backports at buildserver.net -# # Target dist: Debian Sid DIST=sid diff --git a/pkg/kamailio/deb/debian/backports/stretch b/pkg/kamailio/deb/debian/backports/stretch index f75b2a3f16..285eb85633 100755 --- a/pkg/kamailio/deb/debian/backports/stretch +++ b/pkg/kamailio/deb/debian/backports/stretch @@ -1,7 +1,5 @@ #!/bin/bash # -# Hook for automatic backports at buildserver.net -# # Target dist: Debian Stretch DIST=stretch diff --git a/pkg/kamailio/deb/debian/backports/trusty b/pkg/kamailio/deb/debian/backports/trusty index 6aa1c2f76f..2e3665ba4a 100755 --- a/pkg/kamailio/deb/debian/backports/trusty +++ b/pkg/kamailio/deb/debian/backports/trusty @@ -1,7 +1,5 @@ #!/bin/bash # -# Hook for automatic backports at buildserver.net -# # Target dist: Ubuntu trusty DIST=trusty diff --git a/pkg/kamailio/deb/debian/backports/wheezy b/pkg/kamailio/deb/debian/backports/wheezy index 1b4fa2e021..c526f2fd42 100755 --- a/pkg/kamailio/deb/debian/backports/wheezy +++ b/pkg/kamailio/deb/debian/backports/wheezy @@ -1,7 +1,5 @@ #!/bin/bash # -# Hook for automatic backports at buildserver.net -# # Target dist: Debian Wheezy DIST=wheezy diff --git a/pkg/kamailio/deb/debian/backports/xenial b/pkg/kamailio/deb/debian/backports/xenial index 174fbc9fdd..721ca849a0 100755 --- a/pkg/kamailio/deb/debian/backports/xenial +++ b/pkg/kamailio/deb/debian/backports/xenial @@ -1,7 +1,5 @@ #!/bin/bash # -# Hook for automatic backports at buildserver.net -# # Target dist: Ubuntu xenial DIST=xenial

1 0

Development for Kamailio v5.1 series is frozen
by Daniel-Constantin Mierla 17 Oct '17

17 Oct '17

Hello, short note to mark the freezing of development for Kamailio v5.1 series. For few weeks, please do not push new features in the master branch. Once the branch 5.1 is created (expected to happen in 3-4 weeks from now), the master branch becomes again open for new feature. Meanwhile the focus has to be on testing current code. Work on related tools (e.g., kamctl) or documentation can still be done as well as getting the new modules in 5.1 in good shape, plus adding exports to kemi interface (which should not interfere with old code). The entire testing phase is expected to be 4 to 6 weeks, then the release of v5.1.0 -- likely by end of November should be out. Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training, Nov 13-15, 2017, in Berlin - www.asipto.com Kamailio World Conference - www.kamailioworld.com

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2017