sr-dev December 2015

sr-dev@lists.kamailio.org

30 participants
230 discussions

git:4.3:c4adb485: dispatcher: proper handling of socket parameter when is not last in attrs

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: c4adb485cf19e2961845c0074949126a74de4fd8 URL: https://github.com/kamailio/kamailio/commit/c4adb485cf19e2961845c0074949126… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-12-17T09:37:40+01:00 dispatcher: proper handling of socket parameter when is not last in attrs - parsing socket function expects a null terminated string (cherry picked from commit fd79adb4975fc0799fe8488d1dd1a771041a0939) --- Modified: modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/c4adb485cf19e2961845c0074949126… Patch: https://github.com/kamailio/kamailio/commit/c4adb485cf19e2961845c0074949126… --- diff --git a/modules/dispatcher/dispatch.c b/modules/dispatcher/dispatch.c index a5f8a2a..a0582b6 100644 --- a/modules/dispatcher/dispatch.c +++ b/modules/dispatcher/dispatch.c @@ -241,6 +241,7 @@ int add_dest2list(int id, str uri, int flags, int priority, str *attrs, int orig_id = 0, orig_nr = 0; str host; int port, proto; + char c = 0; ds_set_t *orig_ds_lists = ds_lists[list_idx]; /* check uri */ @@ -315,11 +316,23 @@ int add_dest2list(int id, str uri, int flags, int priority, str *attrs, /* check socket attribute */ if (dp->attrs.socket.s && dp->attrs.socket.len > 0) { + /* parse_phostport(...) expects 0-terminated string + * - after socket parameter is either ';' or '\0' */ + if(dp->attrs.socket.s[dp->attrs.socket.len]!='\0') { + c = dp->attrs.socket.s[dp->attrs.socket.len]; + dp->attrs.socket.s[dp->attrs.socket.len] = '\0'; + } if (parse_phostport(dp->attrs.socket.s, &host.s, &host.len, &port, &proto)!=0) { LM_ERR("bad socket <%.*s>\n", dp->attrs.socket.len, dp->attrs.socket.s); + if(c!=0) { + dp->attrs.socket.s[dp->attrs.socket.len] = c; + } goto err; } + if(c!=0) { + dp->attrs.socket.s[dp->attrs.socket.len] = c; + } dp->sock = grep_sock_info( &host, (unsigned short)port, proto); if (dp->sock==0) { LM_ERR("non-local socket <%.*s>\n", dp->attrs.socket.len, dp->attrs.socket.s);

8 years, 11 months

git:4.3:8807dbc9: core: skip zero char and whitespaces before parsing first line in parse_msg()

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 8807dbc93a3731cb51a979158433fc28ff0c04ee URL: https://github.com/kamailio/kamailio/commit/8807dbc93a3731cb51a979158433fc2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-12-17T09:36:58+01:00 core: skip zero char and whitespaces before parsing first line in parse_msg() - reported by Vasiliy Ganchev (cherry picked from commit 12160de3c2052c4696b8c073b9fa5919f6da7060) --- Modified: parser/msg_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/8807dbc93a3731cb51a979158433fc2… Patch: https://github.com/kamailio/kamailio/commit/8807dbc93a3731cb51a979158433fc2… --- diff --git a/parser/msg_parser.c b/parser/msg_parser.c index b907772..21b3cc2 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -589,9 +589,11 @@ int parse_msg(char* const buf, const unsigned int len, struct sip_msg* const msg int offset; hdr_flags_t flags; - /* eat crlf from the beginning */ - for (tmp=buf; (*tmp=='\n' || *tmp=='\r')&& - tmp-buf < len ; tmp++); + /* eat crlf & whitespaces from the beginning */ + for (tmp=buf; (tmp-buf < len) + && (*tmp=='\n' || *tmp=='\r' || *tmp=='\0' + || *tmp=='\t' || *tmp==' '); + tmp++); offset=tmp-buf; fl=&(msg->first_line); rest=parse_first_line(tmp, len-offset, fl);

8 years, 11 months

git:4.3:d4613882: htable: fixing htable.stats for max slot value

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: d4613882da9b478dcb8f01cc38dd9319694c5901 URL: https://github.com/kamailio/kamailio/commit/d4613882da9b478dcb8f01cc38dd931… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-12-17T09:36:03+01:00 htable: fixing htable.stats for max slot value add missed 'd' parameter to rpc->struct_add format string (cherry picked from commit 305381bb6b40dc4859f0862411a0c1a261b476c2) --- Modified: modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/d4613882da9b478dcb8f01cc38dd931… Patch: https://github.com/kamailio/kamailio/commit/d4613882da9b478dcb8f01cc38dd931… --- diff --git a/modules/htable/htable.c b/modules/htable/htable.c index 0a31fd7..88ae0e3 100644 --- a/modules/htable/htable.c +++ b/modules/htable/htable.c @@ -1102,7 +1102,7 @@ static void htable_rpc_stats(rpc_t* rpc, void* c) ht_slot_unlock(ht, i); } - if(rpc->struct_add(th, "Sddd", + if(rpc->struct_add(th, "Sdddd", "name", &ht->name, /* str */ "slots", (int)ht->htsize, /* uint */ "all", (int)all, /* uint */

8 years, 11 months

git:4.3:1b2dee30: utils/misc/vim: added recent core parameter to vim syntax highlighting

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 1b2dee301ba6da206fcd9abb3b2f3f1a601b145c URL: https://github.com/kamailio/kamailio/commit/1b2dee301ba6da206fcd9abb3b2f3f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-12-17T09:35:24+01:00 utils/misc/vim: added recent core parameter to vim syntax highlighting (cherry picked from commit f9d16e38dbf6b263fc29dceca66007357a9e6f37) --- Modified: utils/misc/vim/syntax/kamailio.vim --- Diff: https://github.com/kamailio/kamailio/commit/1b2dee301ba6da206fcd9abb3b2f3f1… Patch: https://github.com/kamailio/kamailio/commit/1b2dee301ba6da206fcd9abb3b2f3f1…

8 years, 11 months

git:4.3:a350e33b: outbound: adjusted log message for trying to import the api

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: a350e33b3fe13e807a621d12325342c93c4ab706 URL: https://github.com/kamailio/kamailio/commit/a350e33b3fe13e807a621d12325342c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-12-17T09:34:54+01:00 outbound: adjusted log message for trying to import the api - when module is not loaded, a messages with 'failed' was printed, which could trigger an alert even for info level (cherry picked from commit 700617c6b3707fba16001f82fab6ca0370b23acf) --- Modified: modules/outbound/api.h --- Diff: https://github.com/kamailio/kamailio/commit/a350e33b3fe13e807a621d12325342c… Patch: https://github.com/kamailio/kamailio/commit/a350e33b3fe13e807a621d12325342c… --- diff --git a/modules/outbound/api.h b/modules/outbound/api.h index b8ed738..bc80589 100644 --- a/modules/outbound/api.h +++ b/modules/outbound/api.h @@ -51,7 +51,7 @@ inline static int ob_load_api(ob_api_t *pxb) bind_ob_f bind_ob_exports; if (!(bind_ob_exports = (bind_ob_f)find_export("bind_ob", 1, 0))) { - LM_INFO("Failed to import bind_ob\n"); + LM_INFO("unable to import bind_ob - maybe module is not loaded\n"); return -1; } return bind_ob_exports(pxb);

8 years, 11 months

git:4.3:6516699e: core: proper test of return code for add_interfaces() in case of IPv6

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 6516699e46bd912de3b65d4cc4eb668e919e845e URL: https://github.com/kamailio/kamailio/commit/6516699e46bd912de3b65d4cc4eb668… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-12-17T09:34:25+01:00 core: proper test of return code for add_interfaces() in case of IPv6 - report with patch by Christian KÃ¼hnke (cherry picked from commit 299d2f7764527fbc5b6de1833976f43c58b1ff2d) --- Modified: socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/6516699e46bd912de3b65d4cc4eb668… Patch: https://github.com/kamailio/kamailio/commit/6516699e46bd912de3b65d4cc4eb668… --- diff --git a/socket_info.c b/socket_info.c index 75d09da..678b6d8 100644 --- a/socket_info.c +++ b/socket_info.c @@ -1809,7 +1809,7 @@ int fix_all_socket_lists() #ifdef __OS_linux && (!auto_bind_ipv6 || add_interfaces_via_netlink(0, AF_INET6, 0, PROTO_UDP, &ai_lst) == 0) #else - && ( !auto_bind_ipv6 || add_interfaces(0, AF_INET6, 0, PROTO_UDP, &ai_lst) !=0 ) /* add_interface does not work for IPv6 on Linux */ + && ( !auto_bind_ipv6 || add_interfaces(0, AF_INET6, 0, PROTO_UDP, &ai_lst) ==0 ) /* add_interface does not work for IPv6 on Linux */ #endif /* __OS_linux */ ) && (addr_info_to_si_lst(ai_lst, 0, PROTO_UDP, 0, &udp_listen)==0)){ free_addr_info_lst(&ai_lst);

8 years, 11 months

git:4.3:7dd01982: app_python: readme regenerated

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 7dd019826dccf6c3c5d2185faf331603b550f895 URL: https://github.com/kamailio/kamailio/commit/7dd019826dccf6c3c5d2185faf33160… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-12-17T09:33:05+01:00 app_python: readme regenerated (cherry picked from commit f025df7a0ac292bd22304683dd976863311b53cd) --- Modified: modules/app_python/README --- Diff: https://github.com/kamailio/kamailio/commit/7dd019826dccf6c3c5d2185faf33160… Patch: https://github.com/kamailio/kamailio/commit/7dd019826dccf6c3c5d2185faf33160… --- diff --git a/modules/app_python/README b/modules/app_python/README index 770b9f7..243f9cc 100644 --- a/modules/app_python/README +++ b/modules/app_python/README @@ -6,7 +6,7 @@ Edited by Maxim Sobolev - Copyright Â© 2010 Maxim Sobolev + Copyright © 2010 Maxim Sobolev __________________________________________________________________ Table of Contents @@ -27,7 +27,7 @@ Maxim Sobolev 4. Functions - 4.1. python_exec(method [, mystr]) + 4.1. python_exec(method [, args]) List of Examples @@ -54,13 +54,17 @@ Chapter 1. Admin Guide 4. Functions - 4.1. python_exec(method [, mystr]) + 4.1. python_exec(method [, args]) 1. Overview This module allows executing Python scripts from config file, exporting functions to access the SIP message from Python. + For some basic examples of Python scripts that can be used with this + module, look at the files inside source tree located at + 'modules/app_python/python_examples/'. + 2. Dependencies 2.1. Kamailio Modules @@ -85,20 +89,22 @@ Chapter 1. Admin Guide 3.1. script_name (string) - TBD. + The path to the fiel with Python code to be executed from configuration + file. - Default value is â/usr/local/etc/sip-router/handler.pyâ. + Default value is "/usr/local/etc/kamailio/handler.py". Example 1.1. Set script_name parameter ... -modparam("app_python", "script_name", "/usr/local/etc/sip-router/myscript.py") +modparam("app_python", "script_name", "/usr/local/etc/kamailio/myscript.py") ... 3.2. mod_init_function (string) - TBD. + The Python function to be executed by this module when it is initialied + by Kamailio. - Default value is âmod_initâ. + Default value is "mod_init". Example 1.2. Set mod_init_function parameter ... @@ -107,9 +113,10 @@ modparam("app_python", "mod_init_function", "my_mod_init") 3.3. child_init_method (string) - TBD. + The Python function to be executed by this module when a new worker + process (child) is initialied by Kamailio. - Default value is âchild_initâ. + Default value is "child_init". Example 1.3. Set child_init_method parameter ... @@ -118,14 +125,16 @@ modparam("app_python", "child_init_method", "my_child_init") 4. Functions - 4.1. python_exec(method [, mystr]) + 4.1. python_exec(method [, args]) -4.1. python_exec(method [, mystr]) +4.1. python_exec(method [, args]) - TBD. + Execute the Python function with the name given by the parameter + 'method'. Optionally can be provided a second string with parameters to + be passed to the Python function. Example 1.4. python_exec usage ... -python_exec("..."); -python_exec("...", "..."); +python_exec("my_python_function"); +python_exec("my_python_function", "my_params"); ...

8 years, 11 months

git:4.3:cf77d880: app_python: basic documentation for params and functions

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: cf77d88069407512c7d2ff234607ab6e3fc9c784 URL: https://github.com/kamailio/kamailio/commit/cf77d88069407512c7d2ff234607ab6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-12-17T09:32:54+01:00 app_python: basic documentation for params and functions - based on quick look at the code (cherry picked from commit e2853a8ac22bc26d47153731f65479f03a756c52) --- Modified: modules/app_python/doc/app_python_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cf77d88069407512c7d2ff234607ab6… Patch: https://github.com/kamailio/kamailio/commit/cf77d88069407512c7d2ff234607ab6… --- diff --git a/modules/app_python/doc/app_python_admin.xml b/modules/app_python/doc/app_python_admin.xml index 56aa4df..ef726c4 100644 --- a/modules/app_python/doc/app_python_admin.xml +++ b/modules/app_python/doc/app_python_admin.xml @@ -20,6 +20,11 @@ This module allows executing Python scripts from config file, exporting functions to access the SIP message from Python. </para> + <para> + For some basic examples of Python scripts that can be used with + this module, look at the files inside source tree located at + 'modules/app_python/python_examples/'. + </para> </section> <section> <title>Dependencies</title> @@ -56,18 +61,19 @@ <section> <title><varname>script_name</varname> (string)</title> <para> - TBD. + The path to the fiel with Python code to be executed + from configuration file. </para> <para> <emphasis> - Default value is <quote>/usr/local/etc/sip-router/handler.py</quote>. + Default value is <quote>/usr/local/etc/kamailio/handler.py</quote>. </emphasis> </para> <example> <title>Set <varname>script_name</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("app_python", "script_name", "/usr/local/etc/sip-router/myscript.py") +modparam("app_python", "script_name", "/usr/local/etc/kamailio/myscript.py") ... </programlisting> </example> @@ -76,7 +82,8 @@ modparam("app_python", "script_name", "/usr/local/etc/sip-router/myscript.py") <section> <title><varname>mod_init_function</varname> (string)</title> <para> - TBD. + The Python function to be executed by this module when + it is initialied by &kamailio;. </para> <para> <emphasis> @@ -96,7 +103,8 @@ modparam("app_python", "mod_init_function", "my_mod_init") <section> <title><varname>child_init_method</varname> (string)</title> <para> - TBD. + The Python function to be executed by this module when + a new worker process (child) is initialied by &kamailio;. </para> <para> <emphasis> @@ -119,17 +127,19 @@ modparam("app_python", "child_init_method", "my_child_init") <title>Functions</title> <section> <title> - <function moreinfo="none">python_exec(method [, mystr])</function> + <function moreinfo="none">python_exec(method [, args])</function> </title> <para> - TBD. + Execute the Python function with the name given by the parameter 'method'. + Optionally can be provided a second string with parameters to be passed + to the Python function. </para> <example> <title><function>python_exec</function> usage</title> <programlisting format="linespecific"> ... -python_exec("..."); -python_exec("...", "..."); +python_exec("my_python_function"); +python_exec("my_python_function", "my_params"); ... </programlisting> </example>

8 years, 11 months

git:4.3:768be330: app_python: use NAME compile flag for default path to the script

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 768be33037f8eefeb3a841e030d3bb3f1be4bb9e URL: https://github.com/kamailio/kamailio/commit/768be33037f8eefeb3a841e030d3bb3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-12-17T09:32:40+01:00 app_python: use NAME compile flag for default path to the script - reflects better the application name (cherry picked from commit 6ae155ee8ebc0d52fd63f208e57808c1d228f7e0) --- Modified: modules/app_python/python_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/768be33037f8eefeb3a841e030d3bb3… Patch: https://github.com/kamailio/kamailio/commit/768be33037f8eefeb3a841e030d3bb3… --- diff --git a/modules/app_python/python_mod.c b/modules/app_python/python_mod.c index f297069..7cc7a2e 100644 --- a/modules/app_python/python_mod.c +++ b/modules/app_python/python_mod.c @@ -39,7 +39,7 @@ MODULE_VERSION -static str script_name = str_init("/usr/local/etc/sip-router/handler.py"); +static str script_name = str_init("/usr/local/etc/" NAME "/handler.py"); static str mod_init_fname = str_init("mod_init"); static str child_init_mname = str_init("child_init");

8 years, 11 months

git:4.3:03f99c65: dispatcher: extended log message when hash size parameter is not set

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.3 Commit: 03f99c65f016da8816f6367ad3cafd75f89fc712 URL: https://github.com/kamailio/kamailio/commit/03f99c65f016da8816f6367ad3cafd7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-12-17T09:31:50+01:00 dispatcher: extended log message when hash size parameter is not set (cherry picked from commit 3272ff6a427ce5bb60d767ed61c8cadd13759de1) --- Modified: modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/03f99c65f016da8816f6367ad3cafd7… Patch: https://github.com/kamailio/kamailio/commit/03f99c65f016da8816f6367ad3cafd7… --- diff --git a/modules/dispatcher/dispatcher.c b/modules/dispatcher/dispatcher.c index c75b97d..4787049 100644 --- a/modules/dispatcher/dispatcher.c +++ b/modules/dispatcher/dispatcher.c @@ -514,7 +514,7 @@ static int mod_init(void) register_timer(ds_ht_timer, NULL, ds_hash_check_interval); } else { LM_ERR("call load dispatching DSTID_AVP set but no size" - " for hash table\n"); + " for hash table (see ds_hash_size parameter)\n"); return -1; } }

8 years, 11 months

← Newer
1
...
10
11
12
13
14
15
16
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2015