sr-dev May 2016

sr-dev@lists.kamailio.org

28 participants
348 discussions

git:master:64f49992: json: some enhancements to the docs

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 64f499921f2b466729eba3c35f6a8c82ef990593 URL: https://github.com/kamailio/kamailio/commit/64f499921f2b466729eba3c35f6a8c8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-05-16T11:53:22+02:00 json: some enhancements to the docs - referring to jansson module for more complex json operations - added id to exported function section --- Modified: modules/json/README Modified: modules/json/doc/json_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/64f499921f2b466729eba3c35f6a8c8… Patch: https://github.com/kamailio/kamailio/commit/64f499921f2b466729eba3c35f6a8c8… --- diff --git a/modules/json/README b/modules/json/README index b74bd69..dc3de58 100644 --- a/modules/json/README +++ b/modules/json/README @@ -47,7 +47,10 @@ Chapter 1. Admin Guide 1. Overview - This module provides operations on json strings. + This is a simple module allowing to retrieve values from a JSON string. + + For more complex operations with JSON documents, see the JANSSON + module. 2. Dependencies diff --git a/modules/json/doc/json_admin.xml b/modules/json/doc/json_admin.xml index d0084b0..3023692 100644 --- a/modules/json/doc/json_admin.xml +++ b/modules/json/doc/json_admin.xml @@ -14,7 +14,12 @@ <section> <title>Overview</title> <para> - This module provides operations on json strings. + This is a simple module allowing to retrieve values from + a JSON string. + </para> + <para> + For more complex operations with JSON documents, + see the JANSSON module. </para> </section> @@ -51,7 +56,7 @@ <section> <title>Functions</title> - <section> + <section id="json.f.json_get_field"> <title> <function moreinfo="none">json_get_field(json_string, field_name, destination)</function> </title>

8 years, 8 months

git:master:ee11732b: usrloc: coonect to db from rpc processes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ee11732bdc1637d646b772ce22d43bd571f7a736 URL: https://github.com/kamailio/kamailio/commit/ee11732bdc1637d646b772ce22d43bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-05-15T08:52:29+02:00 usrloc: coonect to db from rpc processes - evapi consumers are using rpc rank and there can be save/lookup operations - reported by GH #622 --- Modified: modules/usrloc/ul_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ee11732bdc1637d646b772ce22d43bd… Patch: https://github.com/kamailio/kamailio/commit/ee11732bdc1637d646b772ce22d43bd… --- diff --git a/modules/usrloc/ul_mod.c b/modules/usrloc/ul_mod.c index fa72e2b..0e1a452 100644 --- a/modules/usrloc/ul_mod.c +++ b/modules/usrloc/ul_mod.c @@ -421,8 +421,10 @@ static int child_init(int _rank) return 0; case DB_ONLY: case WRITE_THROUGH: - /* connect to db only from SIP workers, TIMER and MAIN processes */ - if (_rank<=0 && _rank!=PROC_TIMER && _rank!=PROC_MAIN) + /* connect to db only from SIP workers, TIMER and MAIN processes, + * and RPC processes */ + if (_rank<=0 && _rank!=PROC_TIMER && _rank!=PROC_MAIN + && _rank!=PROC_RPC) return 0; break; case WRITE_BACK:

8 years, 8 months

[kamailio/kamailio] [Branch 4.4] Cannot save location after resuming a transaction that has been paused by avapi_async_relay (#621)

by Minh PHAN

Console log: _9(27) INFO: <script>: preparing to resume transaction for processing: 6118 / 1144728330 / resume_auth 9(27) ERROR: <script>: Saving location 9(27) ERROR: <core> [db.c:452]: db_use_table(): invalid parameter value 9(27) ERROR: usrloc [ucontact.c:1137]: db_update_ucontact_ruid(): sql use_table failed 9(27) ERROR: usrloc [ucontact.c:1658]: update_contact_db(): failed to update database 9(27) ERROR: registrar [save.c:776]: update_contacts(): failed to update contact_ Config script snipset: ``` route[authenticate] { if (!$aU) { xlog("REGISTER without aU = $aU"); www_challenge("$fd", "0"); exit; } evapi_async_relay("{'tindex': $T(id_index), 'tlabel': $T(id_label), 'method': 'authenticate', 'route': 'resume_auth'," "'data': { 'si': '$si', 'fU': '$fU', 'fd': '$fd', 'rU': '$rU', 'aU': '$aU', 'rd': '$rd' }" "}" ); xlog("L_INFO", "suspended transaction: $T(id_index) / $T(id_label)\n"); exit; } route[resume_auth] { xlog("Saving location\n"); if (!save("location")) { sl_reply_error(); } exit; } event_route[evapi:message-received] { xlog("received [$evapi(msg)] from $evapi(srcaddr):$evapi(srcport)\n"); jansson_get("tindex", "$evapi(msg)", "$var(tindex)"); jansson_get("tlabel", "$evapi(msg)", "$var(tlabel)"); jansson_get("route", "$evapi(msg)", "$var(next_route)"); xlog("L_INFO", "preparing to resume transaction for processing: $var(tindex) / $var(tlabel) / $var(next_route)\n"); t_continue("$var(tindex)", "$var(tlabel)", "$var(next_route)"); } ``` --- 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/621

8 years, 8 months

git:master:d3ae6be8: janssonrpc-c: relocated error handling section outside of functions section

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d3ae6be82eb3ec909501be9f87e3596b823e2f5a URL: https://github.com/kamailio/kamailio/commit/d3ae6be82eb3ec909501be9f87e3596… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-05-14T10:18:46+02:00 janssonrpc-c: relocated error handling section outside of functions section --- Modified: modules/janssonrpc-c/README Modified: modules/janssonrpc-c/doc/janssonrpc-c_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d3ae6be82eb3ec909501be9f87e3596… Patch: https://github.com/kamailio/kamailio/commit/d3ae6be82eb3ec909501be9f87e3596… --- diff --git a/modules/janssonrpc-c/README b/modules/janssonrpc-c/README index 53c3ca2..6e624ac 100644 --- a/modules/janssonrpc-c/README +++ b/modules/janssonrpc-c/README @@ -34,7 +34,8 @@ Matthew Williams 4.1. janssonrpc_notification(conn, method, parameters) 4.2. janssonrpc_request(conn, method, params[, options]]) - 4.3. Error Handling + + 5. Error Handling List of Examples @@ -67,7 +68,8 @@ Chapter 1. Admin Guide 4.1. janssonrpc_notification(conn, method, parameters) 4.2. janssonrpc_request(conn, method, params[, options]]) - 4.3. Error Handling + + 5. Error Handling 1. Overview @@ -187,7 +189,6 @@ modparam("janssonrpc-s", "retry_codes", "-32603, -32000..-32099"); 4.1. janssonrpc_notification(conn, method, parameters) 4.2. janssonrpc_request(conn, method, params[, options]]) - 4.3. Error Handling 4.1. janssonrpc_notification(conn, method, parameters) @@ -261,7 +262,7 @@ route[RESPONSE] { } ... -4.3. Error Handling +5. Error Handling When a route is specified as part of the janssonrpc_request() function, a JSON object is stored in the result pseudo-variable (see diff --git a/modules/janssonrpc-c/doc/janssonrpc-c_admin.xml b/modules/janssonrpc-c/doc/janssonrpc-c_admin.xml index 4ae65c0..ddf46b3 100644 --- a/modules/janssonrpc-c/doc/janssonrpc-c_admin.xml +++ b/modules/janssonrpc-c/doc/janssonrpc-c_admin.xml @@ -297,7 +297,8 @@ route[RESPONSE] { </programlisting> </example> </section> - <section> + </section> + <section> <title> Error Handling </title> @@ -402,7 +403,6 @@ route[INTERNAL] { ... </programlisting> </example> - </section> </section> </chapter>

8 years, 8 months

git:master:92dcec82: jansson: removed empty parameters section

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 92dcec82b4f7e0de07e06d51bd57d612c949241c URL: https://github.com/kamailio/kamailio/commit/92dcec82b4f7e0de07e06d51bd57d61… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-05-14T10:11:33+02:00 jansson: removed empty parameters section - added section ids --- Modified: modules/jansson/README Modified: modules/jansson/doc/jansson_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/92dcec82b4f7e0de07e06d51bd57d61… Patch: https://github.com/kamailio/kamailio/commit/92dcec82b4f7e0de07e06d51bd57d61…

8 years, 8 months

git:master:38bdeee3: acc_radius: added section ids in docbook

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 38bdeee32afb895af3a759373e1c29a30e5e5560 URL: https://github.com/kamailio/kamailio/commit/38bdeee32afb895af3a759373e1c29a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-05-14T09:30:55+02:00 acc_radius: added section ids in docbook --- Modified: modules/acc_radius/doc/acc_radius_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/38bdeee32afb895af3a759373e1c29a… Patch: https://github.com/kamailio/kamailio/commit/38bdeee32afb895af3a759373e1c29a…

8 years, 8 months

git:master:da0dbbcd: http_client Implement failover between connections

by Olle E. Johansson

Module: kamailio Branch: master Commit: da0dbbcd2e6813d149497ad62e041c2b9a021867 URL: https://github.com/kamailio/kamailio/commit/da0dbbcd2e6813d149497ad62e041c2… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-05-13T23:01:30+02:00 http_client Implement failover between connections If one http_connect attempt fails you can now switch to another server with other settings automatically --- Modified: modules/http_client/README Modified: modules/http_client/doc/http_client_admin.xml Modified: modules/http_client/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/da0dbbcd2e6813d149497ad62e041c2… Patch: https://github.com/kamailio/kamailio/commit/da0dbbcd2e6813d149497ad62e041c2…

8 years, 8 months

[kamailio/kamailio] kex: add extended core stats (#605)

by Victor Seva

* requests by method * replies by status code You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/605 -- Commit Summary -- * kex: add extended core stats -- File Changes -- M modules/kex/core_stats.c (155) M modules/kex/core_stats.h (29) -- Patch Links -- https://github.com/kamailio/kamailio/pull/605.patch https://github.com/kamailio/kamailio/pull/605.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/605

8 years, 8 months

git:master:6dd4b1f8: dispatcher: fix compiler warning #612

by Victor Seva

Module: kamailio Branch: master Commit: 6dd4b1f83cb041a42571ef1355832661be0ae492 URL: https://github.com/kamailio/kamailio/commit/6dd4b1f83cb041a42571ef135583266… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-05-13T10:34:33+02:00 dispatcher: fix compiler warning #612 > CC (gcc) [M dispatcher.so] dispatch.o > dispatch.c: In function 'ds_set_attrs': > dispatch.c:263:8: warning: 'tmp_rweight' may be used uninitialized in this function [-Wmaybe-uninitialized] > int tmp_rweight; > ^ > make[3]: 'libkmi.so.1.0' is up to date. --- Modified: modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/6dd4b1f83cb041a42571ef135583266… Patch: https://github.com/kamailio/kamailio/commit/6dd4b1f83cb041a42571ef135583266… --- diff --git a/modules/dispatcher/dispatch.c b/modules/dispatcher/dispatch.c index a8061ec..d93b985 100644 --- a/modules/dispatcher/dispatch.c +++ b/modules/dispatcher/dispatch.c @@ -225,6 +225,7 @@ int ds_set_attrs(ds_dest_t *dest, str *attrs) param_hooks_t phooks; param_t *pit=NULL; str param; + int tmp_rweight = 0; if(attrs==NULL || attrs->len<=0) return 0; @@ -260,7 +261,7 @@ int ds_set_attrs(ds_dest_t *dest, str *attrs) dest->attrs.socket = pit->body; }else if(pit->name.len==7 && strncasecmp(pit->name.s, "rweight", 7)==0) { - int tmp_rweight; + tmp_rweight = 0; str2sint(&pit->body, &tmp_rweight); if ( tmp_rweight>=1 && tmp_rweight<=100 ) { dest->attrs.rweight = tmp_rweight;

8 years, 8 months

git:master:c7c8d31e: dmq_usrloc: fix compiler warning #612

by Victor Seva

Module: kamailio Branch: master Commit: c7c8d31e4a4f9640673099aa1589e3fe96fad558 URL: https://github.com/kamailio/kamailio/commit/c7c8d31e4a4f9640673099aa1589e3f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-05-13T10:28:23+02:00 dmq_usrloc: fix compiler warning #612 > CC (gcc) [M dmq_usrloc.so] usrloc_sync.o > usrloc_sync.c: In function 'usrloc_dmq_handle_msg': > usrloc_sync.c:403:12: warning: 'reg_id' may be used uninitialized in this function [-Wmaybe-uninitialized] > ci.reg_id = reg_id; > ^ > usrloc_sync.c:401:13: warning: 'methods' may be used uninitialized in this function [-Wmaybe-uninitialized] > ci.methods = methods; > ^ > usrloc_sync.c:405:19: warning: 'last_modified' may be used uninitialized in this function [-Wmaybe-uninitialized] > ci.last_modified = last_modified; > ^ > usrloc_sync.c:394:7: warning: 'q' may be used uninitialized in this function [-Wmaybe-uninitialized] > ci.q = q; > ^ > usrloc_sync.c:399:12: warning: 'cflags' may be used uninitialized in this function [-Wmaybe-uninitialized] > ci.cflags = cflags; > ^ > usrloc_sync.c:397:11: warning: 'flags' may be used uninitialized in this function [-Wmaybe-uninitialized] > ci.flags = flags; > ^ > usrloc_sync.c:396:10: warning: 'cseq' may be used uninitialized in this function [-Wmaybe-uninitialized] > ci.cseq = cseq; > ^ > usrloc_sync.c:393:13: warning: 'expires' may be used uninitialized in this function [-Wmaybe-uninitialized] > ci.expires = expires; > ^ > usrloc_sync.c:407:2: warning: 'action' may be used uninitialized in this function [-Wmaybe-uninitialized] > switch(action) { > ^ > make[3]: 'libsrutils.so.1.0' is up to date. --- Modified: modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/c7c8d31e4a4f9640673099aa1589e3f… Patch: https://github.com/kamailio/kamailio/commit/c7c8d31e4a4f9640673099aa1589e3f… --- diff --git a/modules/dmq_usrloc/usrloc_sync.c b/modules/dmq_usrloc/usrloc_sync.c index f89500d..86e34ac 100644 --- a/modules/dmq_usrloc/usrloc_sync.c +++ b/modules/dmq_usrloc/usrloc_sync.c @@ -301,6 +301,8 @@ int usrloc_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* int action, expires, cseq, flags, cflags, q, last_modified, methods, reg_id; str aor, ruid, c, received, path, callid, user_agent, instance; + action = expires = cseq = flags = cflags = q = last_modified = methods = reg_id = 0; + parse_from_header(msg); body = ((struct to_body*)msg->from->parsed)->uri;

8 years, 8 months

← Newer
1
...
14
15
16
17
18
19
20
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2016