sr-dev July 2015

sr-dev@lists.kamailio.org

26 participants
301 discussions

git:master:9c3ea838: dialog: re-entrant mutex for dialogs hash table slots

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9c3ea838b31039ac067e17d519df67b64b0dada1 URL: https://github.com/kamailio/kamailio/commit/9c3ea838b31039ac067e17d519df67b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-16T15:18:27+02:00 dialog: re-entrant mutex for dialogs hash table slots - changed from a lock set usage to per slot lock field --- Modified: modules/dialog/dlg_hash.c Modified: modules/dialog/dlg_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/9c3ea838b31039ac067e17d519df67b… Patch: https://github.com/kamailio/kamailio/commit/9c3ea838b31039ac067e17d519df67b…

9 years, 4 months

RLS Notify sent to wrong transport

by M S

Hi, I have a Kamailio v4.3.0 with SVN Rev. c6aa95 running an RLS based presence setup. Everything works fine when end-user has UDP transport, however, if user has TCP or TLS transport then i aggregated NOTIFY sent by RLS gives send error, -- WARNING: <core> [forward.c:231]: get_send_socket2(): protocol/port mismatch (forced tls:X.X.X.X:5061, to udp:Y.Y.Y.Y:12345) -- (X.X.X.X is server IP and Y.Y.Y.Y is end user IP). Not sure if it is configuration issue or some bug, so posting it to both mailing list. Please help. Thank you.

9 years, 4 months

Kamailio v4.2.6 Released

by Daniel-Constantin Mierla

Hello, Kamailio SIP Server v4.2.6 stable release is out. This is a maintenance release of the previous stable branch, 4.2, that includes fixes since release of v4.2.5. There is no change to database schema or configuration language structure that you have to do on installations of v4.2.x. Deployments running previous v4.x.x versions are strongly recommended to be upgraded to v4.2.6 (or to 4.3.x series). For more details about version 4.2.6 (including links and guidelines to download the tarball or from GIT repository), visit: * http://www.kamailio.org/w/2015/07/kamailio-v4-2-6-released/ RPM, Debian/Ubuntu packages will be available soon as well. Note: the latest stable branch is 4.3, at this moment with its latest release v4.3.1. See more details about it at: * http://www.kamailio.org/w/kamailio-v4-3-0-release-notes/ Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/miconda - http://www.linkedin.com/in/miconda

9 years, 4 months

app_java and Oracle Java 8

by Jon Schøpzinsky

Hello List, Im planing to update the app_java module to be usable with Oracle Java 8. Should I do this in a new module, etc. app_java8, or update the existing one? And is the community interested in such a module? Kind Regards Jon Schøpzinsky Firstcom

9 years, 4 months

git:master:b0a776b3: registrar: updated the docs for registered(...) function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b0a776b31220fc5e8599288b14ddb9ffccb24c0f URL: https://github.com/kamailio/kamailio/commit/b0a776b31220fc5e8599288b14ddb9f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-31T18:40:31+02:00 registrar: updated the docs for registered(...) function --- Modified: modules/registrar/README Modified: modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b0a776b31220fc5e8599288b14ddb9f… Patch: https://github.com/kamailio/kamailio/commit/b0a776b31220fc5e8599288b14ddb9f… --- diff --git a/modules/registrar/README b/modules/registrar/README index e3f5a7f..8756816 100644 --- a/modules/registrar/README +++ b/modules/registrar/README @@ -891,15 +891,16 @@ lookup_branches("location"); 4.4. registered(domain [, uri [, match_option [, match_action]]]) - The function returns true if the AOR in the Request-URI is registered, - false otherwise. The function does not modify the message being - process, it neither rewrites the Request-URI if a contact is found nor - append branches. + The function returns true if the AOR in the URI is registered, false + otherwise. The function does not modify the message being process, it + neither rewrites the Request-URI if a contact is found nor append + branches. If uri parameter is not provided, then it considered to be + the Request-URI for SIP requests and To-URI for SIP replies. Meaning of the parameters is as follows: * domain - Name of table that should be used for the lookup. - * uri (optional) - SIP URI to do be used instead of R-URI. It can be - a dynamic string with pseudo-variables. + * uri (optional) - SIP URI to do be used instead of Request/To-URI. + It can be a dynamic string with pseudo-variables. * match_option (optional) - flag parameter to restrict contact search. use reg_xavp_cfg to set the values to compare to. flag values is as follows: @@ -911,7 +912,7 @@ lookup_branches("location"); flag values is as follows: + 1 - set xavp_rcd with value from matched contact - This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. + This function can be used from ANY_ROUTE. Example 1.31. registered usage ... diff --git a/modules/registrar/doc/registrar_admin.xml b/modules/registrar/doc/registrar_admin.xml index 672cee8..f1c7063 100644 --- a/modules/registrar/doc/registrar_admin.xml +++ b/modules/registrar/doc/registrar_admin.xml @@ -1110,10 +1110,12 @@ lookup_branches("location"); <function moreinfo="none">registered(domain [, uri [, match_option [, match_action]]])</function> </title> <para> - The function returns true if the AOR in the Request-URI is + The function returns true if the AOR in the URI is registered, false otherwise. The function does not modify the message being process, it neither rewrites the Request-URI if a - contact is found nor append branches. + contact is found nor append branches. If uri parameter is not + provided, then it considered to be the Request-URI for SIP requests + and To-URI for SIP replies. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -1126,7 +1128,7 @@ lookup_branches("location"); <listitem> <para> <emphasis>uri</emphasis> (optional) - SIP URI to do be used instead - of R-URI. It can be a dynamic string with pseudo-variables. + of Request/To-URI. It can be a dynamic string with pseudo-variables. </para> </listitem> <listitem> @@ -1160,7 +1162,7 @@ lookup_branches("location"); </listitem> </itemizedlist> <para> - This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. + This function can be used from ANY_ROUTE. </para> <example> <title><function>registered</function> usage</title>

9 years, 4 months

git:master:c3755580: registrar: allow registered() in any route

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c3755580f8e2763e33be03b0370630d04af3a019 URL: https://github.com/kamailio/kamailio/commit/c3755580f8e2763e33be03b0370630d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-31T18:40:30+02:00 registrar: allow registered() in any route - if used for a sip reply and URI is not provided, then To URI is used --- Modified: modules/registrar/lookup.c Modified: modules/registrar/reg_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c3755580f8e2763e33be03b0370630d… Patch: https://github.com/kamailio/kamailio/commit/c3755580f8e2763e33be03b0370630d… --- diff --git a/modules/registrar/lookup.c b/modules/registrar/lookup.c index efbe39c..6fb170b 100644 --- a/modules/registrar/lookup.c +++ b/modules/registrar/lookup.c @@ -36,6 +36,7 @@ #include "../../action.h" #include "../../mod_fix.h" #include "../../parser/parse_rr.h" +#include "../../parser/parse_to.h" #include "../../forward.h" #include "../usrloc/usrloc.h" #include "common.h" @@ -642,8 +643,16 @@ int registered4(struct sip_msg* _m, udomain_t* _d, str* _uri, int match_flag, in { uri = *_uri; } else { - if (_m->new_uri.s) uri = _m->new_uri; - else uri = _m->first_line.u.request.uri; + if(IS_SIP_REPLY(_m)) { + if (parse_to_header(_m) < 0) { + LM_ERR("failed to prepare the message\n"); + return -1; + } + uri = get_to(_m)->uri; + } else { + if (_m->new_uri.s) uri = _m->new_uri; + else uri = _m->first_line.u.request.uri; + } } if (extract_aor(&uri, &aor, NULL) < 0) { diff --git a/modules/registrar/reg_mod.c b/modules/registrar/reg_mod.c index 1b9ccae..7a57cb6 100644 --- a/modules/registrar/reg_mod.c +++ b/modules/registrar/reg_mod.c @@ -165,13 +165,13 @@ static cmd_export_t cmds[] = { {"lookup_to_dset", (cmd_function)w_lookup_to_dset, 2, domain_uri_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"registered", (cmd_function)w_registered, 1, domain_uri_fixup, 0, - REQUEST_ROUTE | FAILURE_ROUTE }, + ANY_ROUTE }, {"registered", (cmd_function)w_registered, 2, domain_uri_fixup, 0, - REQUEST_ROUTE | FAILURE_ROUTE }, + ANY_ROUTE }, {"registered", (cmd_function)w_registered3, 3, registered_fixup, 0, - REQUEST_ROUTE | FAILURE_ROUTE }, + ANY_ROUTE }, {"registered", (cmd_function)w_registered4, 4, registered_fixup, 0, - REQUEST_ROUTE | FAILURE_ROUTE }, + ANY_ROUTE }, {"add_sock_hdr", (cmd_function)add_sock_hdr, 1, fixup_str_null, 0, REQUEST_ROUTE }, {"unregister", (cmd_function)w_unregister, 2, unreg_fixup, 0,

9 years, 4 months

git:master:48f89ed0: pua: fix typo in matching presence.winfo

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 48f89ed0390a80cc760da5a7ed41dd9c5c5ffc4d URL: https://github.com/kamailio/kamailio/commit/48f89ed0390a80cc760da5a7ed41dd9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-31T18:40:30+02:00 pua: fix typo in matching presence.winfo - patch by foucse, GH #270 --- Modified: modules/pua/hash.h --- Diff: https://github.com/kamailio/kamailio/commit/48f89ed0390a80cc760da5a7ed41dd9… Patch: https://github.com/kamailio/kamailio/commit/48f89ed0390a80cc760da5a7ed41dd9… --- diff --git a/modules/pua/hash.h b/modules/pua/hash.h index 3da0894..923560c 100644 --- a/modules/pua/hash.h +++ b/modules/pua/hash.h @@ -166,7 +166,7 @@ static inline int get_event_flag(str* event) return CONFERENCE_EVENT; break; case 14: - if (strncmp(event->s, "presence;winfo", 14) == 0) + if (strncmp(event->s, "presence.winfo", 14) == 0) return PWINFO_EVENT; break; case 15:

9 years, 4 months

[kamailio] jsonrpc-c: kamailio will refuse to start if module is not able to connect to any server (#269)

by Victor Seva

``` Jul 30 14:36:38 sp1 proxy[34000]: CRITICAL: <core> [pass_fd.c:275]: receive_fd(): EOF on 36 Jul 30 14:36:38 sp1 proxy[33972]: ALERT: <core> [main.c:728]: handle_sigs(): child process 33995 exited by a signal 6 Jul 30 14:36:38 sp1 proxy[33972]: ALERT: <core> [main.c:731]: handle_sigs(): core was generated Jul 30 14:37:38 sp1 proxy[33972]: CRITICAL: <core> [main.c:637]: sig_alarm_abort(): shutdown timeout triggered, dying... Jul 30 15:12:39 sp1 proxy[15644]: WARNING: jsonrpc-c [jsonrpc_io.c:448]: connect_server(): Failed to connect to 172.16.74.93 on port 8991... No route to host Jul 30 15:12:39 sp1 proxy[15644]: ERROR: jsonrpc-c [jsonrpc_io.c:91]: jsonrpc_io_child_process(): failed to connect to any servers Jul 30 15:12:39 sp1 proxy[15644]: ERROR: <core> [sr_module.c:900]: init_mod_child(): Error while initializing module jsonrpc (/usr/lib/x86_64-linux-gnu/kamailio/modules/jsonrpc-c.so) Jul 30 15:12:39 sp1 proxy[15644]: ERROR: <core> [main.c:1651]: main_loop(): error in init_child Jul 30 15:12:39 sp1 proxy[15590]: ALERT: <core> [main.c:725]: handle_sigs(): child process 15644 exited normally, status=255 Jul 30 15:12:39 sp1 proxy[15654]: CRITICAL: <core> [pass_fd.c:275]: receive_fd(): EOF on 14 ``` I would say that the functions should respond with error if no server is connected but kamailio should be able to start. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/269

9 years, 4 months

git:master:b217efe5: Merge pull request #271 from kamailio/vseva/jsonrpc_fixes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b217efe5409dbbc2d76245a00a9febf1c0799c6e URL: https://github.com/kamailio/kamailio/commit/b217efe5409dbbc2d76245a00a9febf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-31T17:38:49+02:00 Merge pull request #271 from kamailio/vseva/jsonrpc_fixes jsonrpc-c: support load module even if no server is online and max reconnect attempts --- Modified: modules/jsonrpc-c/doc/jsonrpc-c_admin.xml Modified: modules/jsonrpc-c/jsonrpc_io.c Modified: modules/jsonrpc-c/jsonrpc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b217efe5409dbbc2d76245a00a9febf… Patch: https://github.com/kamailio/kamailio/commit/b217efe5409dbbc2d76245a00a9febf… --- diff --git a/modules/jsonrpc-c/doc/jsonrpc-c_admin.xml b/modules/jsonrpc-c/doc/jsonrpc-c_admin.xml index 5776d5c..8ec6648 100644 --- a/modules/jsonrpc-c/doc/jsonrpc-c_admin.xml +++ b/modules/jsonrpc-c/doc/jsonrpc-c_admin.xml @@ -91,6 +91,21 @@ modparam("jsonrpc", "servers", "localhost:9999,2 10.10.0.1:9999,2 backup.server: </programlisting> </example> </section> + <section> + <title><varname>max_conn_attempts</varname> (int)</title> + <para> + Max number of connection attempts for a server. -1 will keep reconnecting + forever, 0 will skip any attempt to reconnect. + </para> + <example> + <title>Set <varname>max_conn_attempts</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("jsonrpc", "max_conn_attempts", 10) +... + </programlisting> + </example> + </section> </section> <section> <title>Functions</title> diff --git a/modules/jsonrpc-c/jsonrpc_io.c b/modules/jsonrpc-c/jsonrpc_io.c index f001543..9acc149 100644 --- a/modules/jsonrpc-c/jsonrpc_io.c +++ b/modules/jsonrpc-c/jsonrpc_io.c @@ -44,7 +44,7 @@ struct jsonrpc_server { char *host; - int port, socket, status; + int port, socket, status, conn_attempts; struct jsonrpc_server *next; struct event *ev; struct itimerspec *timer; @@ -68,6 +68,9 @@ int connect_servers(struct jsonrpc_server_group *group); int connect_server(struct jsonrpc_server *server); int handle_server_failure(struct jsonrpc_server *server); +/* module config from jsonrpc_mod.c */ +int _jsonrpcc_max_conn_retry = 0; /* max retries to connect. -1 forever 0 none */ + int jsonrpc_io_child_process(int cmd_pipe, char* _servers) { if (parse_servers(_servers, &server_group) != 0) @@ -85,8 +88,7 @@ int jsonrpc_io_child_process(int cmd_pipe, char* _servers) if (!connect_servers(server_group)) { - LM_ERR("failed to connect to any servers\n"); - return -1; + LM_WARN("failed to connect to any servers\n"); } event_dispatch(); @@ -347,6 +349,7 @@ int parse_servers(char *_servers, struct jsonrpc_server_group **group_ptr) server->port = port; server->status = JSONRPC_SERVER_DISCONNECTED; server->socket = 0; + server->conn_attempts = _jsonrpcc_max_conn_retry; int group_cnt = 0; @@ -444,6 +447,7 @@ int connect_server(struct jsonrpc_server *server) server->socket = sockfd; server->status = JSONRPC_SERVER_CONNECTED; + server->conn_attempts = _jsonrpcc_max_conn_retry; struct event *socket_ev = pkg_malloc(sizeof(struct event)); CHECK_MALLOC(socket_ev); @@ -508,6 +512,12 @@ int handle_server_failure(struct jsonrpc_server *server) server->ev = NULL; } server->status = JSONRPC_SERVER_FAILURE; + server->conn_attempts--; + if(_jsonrpcc_max_conn_retry!=-1 && server->conn_attempts<0) { + LM_ERR("max reconnect attempts. No further attempts will be made to reconnect this server."); + return -1; + } + int timerfd = timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK); if (timerfd == -1) { diff --git a/modules/jsonrpc-c/jsonrpc_mod.c b/modules/jsonrpc-c/jsonrpc_mod.c index 49c7162..f462a14 100644 --- a/modules/jsonrpc-c/jsonrpc_mod.c +++ b/modules/jsonrpc-c/jsonrpc_mod.c @@ -48,6 +48,8 @@ int fixup_pvar_shm(void** param, int param_no); char *servers_param; int pipe_fds[2] = {-1,-1}; +extern int _jsonrpcc_max_conn_retry; /* max retries to connect */ + struct tm_binds tmb; /* @@ -65,6 +67,7 @@ static cmd_export_t cmds[]={ */ static param_export_t mod_params[]={ {"servers", PARAM_STRING, &servers_param}, + {"max_conn_attempts", INT_PARAM, &_jsonrpcc_max_conn_retry}, { 0,0,0 } };

9 years, 4 months

git:master:6f18e01b: jsonrpc-c: add max_conn_attempt parameter to control max number of reconnections

by Victor Seva

Module: kamailio Branch: master Commit: 6f18e01b96929aeeb23454534e5c1da0efc3a09b URL: https://github.com/kamailio/kamailio/commit/6f18e01b96929aeeb23454534e5c1da… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-07-31T11:03:28+02:00 jsonrpc-c: add max_conn_attempt parameter to control max number of reconnections Related: #269 --- Modified: modules/jsonrpc-c/doc/jsonrpc-c_admin.xml Modified: modules/jsonrpc-c/jsonrpc_io.c Modified: modules/jsonrpc-c/jsonrpc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6f18e01b96929aeeb23454534e5c1da… Patch: https://github.com/kamailio/kamailio/commit/6f18e01b96929aeeb23454534e5c1da… --- diff --git a/modules/jsonrpc-c/doc/jsonrpc-c_admin.xml b/modules/jsonrpc-c/doc/jsonrpc-c_admin.xml index 5776d5c..8ec6648 100644 --- a/modules/jsonrpc-c/doc/jsonrpc-c_admin.xml +++ b/modules/jsonrpc-c/doc/jsonrpc-c_admin.xml @@ -91,6 +91,21 @@ modparam("jsonrpc", "servers", "localhost:9999,2 10.10.0.1:9999,2 backup.server: </programlisting> </example> </section> + <section> + <title><varname>max_conn_attempts</varname> (int)</title> + <para> + Max number of connection attempts for a server. -1 will keep reconnecting + forever, 0 will skip any attempt to reconnect. + </para> + <example> + <title>Set <varname>max_conn_attempts</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("jsonrpc", "max_conn_attempts", 10) +... + </programlisting> + </example> + </section> </section> <section> <title>Functions</title> diff --git a/modules/jsonrpc-c/jsonrpc_io.c b/modules/jsonrpc-c/jsonrpc_io.c index a6f06e5..9acc149 100644 --- a/modules/jsonrpc-c/jsonrpc_io.c +++ b/modules/jsonrpc-c/jsonrpc_io.c @@ -44,7 +44,7 @@ struct jsonrpc_server { char *host; - int port, socket, status; + int port, socket, status, conn_attempts; struct jsonrpc_server *next; struct event *ev; struct itimerspec *timer; @@ -68,6 +68,9 @@ int connect_servers(struct jsonrpc_server_group *group); int connect_server(struct jsonrpc_server *server); int handle_server_failure(struct jsonrpc_server *server); +/* module config from jsonrpc_mod.c */ +int _jsonrpcc_max_conn_retry = 0; /* max retries to connect. -1 forever 0 none */ + int jsonrpc_io_child_process(int cmd_pipe, char* _servers) { if (parse_servers(_servers, &server_group) != 0) @@ -346,6 +349,7 @@ int parse_servers(char *_servers, struct jsonrpc_server_group **group_ptr) server->port = port; server->status = JSONRPC_SERVER_DISCONNECTED; server->socket = 0; + server->conn_attempts = _jsonrpcc_max_conn_retry; int group_cnt = 0; @@ -443,6 +447,7 @@ int connect_server(struct jsonrpc_server *server) server->socket = sockfd; server->status = JSONRPC_SERVER_CONNECTED; + server->conn_attempts = _jsonrpcc_max_conn_retry; struct event *socket_ev = pkg_malloc(sizeof(struct event)); CHECK_MALLOC(socket_ev); @@ -507,6 +512,12 @@ int handle_server_failure(struct jsonrpc_server *server) server->ev = NULL; } server->status = JSONRPC_SERVER_FAILURE; + server->conn_attempts--; + if(_jsonrpcc_max_conn_retry!=-1 && server->conn_attempts<0) { + LM_ERR("max reconnect attempts. No further attempts will be made to reconnect this server."); + return -1; + } + int timerfd = timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK); if (timerfd == -1) { diff --git a/modules/jsonrpc-c/jsonrpc_mod.c b/modules/jsonrpc-c/jsonrpc_mod.c index 49c7162..f462a14 100644 --- a/modules/jsonrpc-c/jsonrpc_mod.c +++ b/modules/jsonrpc-c/jsonrpc_mod.c @@ -48,6 +48,8 @@ int fixup_pvar_shm(void** param, int param_no); char *servers_param; int pipe_fds[2] = {-1,-1}; +extern int _jsonrpcc_max_conn_retry; /* max retries to connect */ + struct tm_binds tmb; /* @@ -65,6 +67,7 @@ static cmd_export_t cmds[]={ */ static param_export_t mod_params[]={ {"servers", PARAM_STRING, &servers_param}, + {"max_conn_attempts", INT_PARAM, &_jsonrpcc_max_conn_retry}, { 0,0,0 } };

9 years, 4 months

← Newer
1
2
3
4
5
6
7
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2015