sr-dev June 2015

sr-dev@lists.kamailio.org

34 participants
273 discussions

git:master:5db8bec2: rtjson: more documentation about json routing document format

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5db8bec2fdfba911f7053e615cf156d76af5fa46 URL: https://github.com/kamailio/kamailio/commit/5db8bec2fdfba911f7053e615cf156d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-23T23:22:37+02:00 rtjson: more documentation about json routing document format --- Modified: modules/rtjson/doc/rtjson_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5db8bec2fdfba911f7053e615cf156d… Patch: https://github.com/kamailio/kamailio/commit/5db8bec2fdfba911f7053e615cf156d… --- diff --git a/modules/rtjson/doc/rtjson_admin.xml b/modules/rtjson/doc/rtjson_admin.xml index 4218e73..fedd40c 100644 --- a/modules/rtjson/doc/rtjson_admin.xml +++ b/modules/rtjson/doc/rtjson_admin.xml @@ -148,6 +148,8 @@ rtjson_push_routes(); ... rtjson_init_routes("$var(json)"); rtjson_push_routes(); +t_on_failure("REROUTE"); +t_relay(); ... failure_route[REROUTE] { rtjson_next_route(); @@ -174,6 +176,8 @@ failure_route[REROUTE] { ... rtjson_init_routes("$var(json)"); rtjson_push_routes(); +t_on_branch("OUTGOING"); +t_relay(); ... branch_route[OUTGOING] { rtjson_update_branch(); @@ -191,7 +195,85 @@ branch_route[OUTGOING] { The format of the JSON document containing routing information. </para> <para> - Description of the fields: TBA. + Description of the fields in the JSON routing document: + <itemizedlist> + <listitem> + <para> + <emphasis>version</emphasis> - intended to enforce versioning + checks (not enforced yet), recommended to be set to "1.0". + </para> + </listitem> + <listitem> + <para> + <emphasis>routing</emphasis> - can be "serial" or "parallel", + corresponding to desired routing type: serial or parallel forking. + </para> + </listitem> + <listitem> + <para> + <emphasis>routes</emphasis> - an array with structures holding + the attributes for destinations. The attributes can be: + <itemizedlist> + <listitem> + <para> + <emphasis>uri</emphasis> - request URI + </para> + </listitem> + <listitem> + <para> + <emphasis>dst_uri</emphasis> - outbound proxy URI + </para> + </listitem> + <listitem> + <para> + <emphasis>path</emphasis> - Path URI vector + </para> + </listitem> + <listitem> + <para> + <emphasis>socket</emphasis> - local socket + </para> + </listitem> + <listitem> + <para> + <emphasis>headers</emphasis> - a structure with values for headers + From and To specified as display name and URI, plus extra + headers to be appended to SIP request. It requires uac module in + order to update From and To headers. + Set by rtjson_update_branch() only for serial routing. + </para> + </listitem> + <listitem> + <para> + <emphasis>branch_flags</emphasis> - branch flags. + Set by rtjson_update_branch() only for serial routing. + </para> + </listitem> + <listitem> + <para> + <emphasis>fr_timer</emphasis> - value for fr_timer parameter of + tm module. + Set by rtjson_update_branch() only for serial routing. + </para> + </listitem> + <listitem> + <para> + <emphasis>fr_inv_timer</emphasis> - value for fr_inv_timer parameter + of tm module. + Set by rtjson_update_branch() only for serial routing. + </para> + </listitem> + </itemizedlist> + </para> + </listitem> + </itemizedlist> + </para> + <para> + Other fields can appear in the JSON routing document, being ignored + by rtjson functions. They can be processed directly in the configuration + files using json or jansson modules. For example, the document can include + the transaction identification tuple (index,label) that can be used + to resume the execution of a suspended transaction. </para> <example> <title>JSON Routing Structure</title> @@ -199,7 +281,7 @@ branch_route[OUTGOING] { ... { "version": "1.0", - "routing": "parallel", + "routing": "serial", "routes": [ { "uri": "sip:127.0.0.1:5080",

8 years, 10 months

git:master:324d64e9: kazoo : more federation tweaks

by lazedo

Module: kamailio Branch: master Commit: 324d64e9ed301dab2204bda5e7cd143516edf64d URL: https://github.com/kamailio/kamailio/commit/324d64e9ed301dab2204bda5e7cd143… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2015-06-23T16:23:42+01:00 kazoo : more federation tweaks when using federation, only use federation exchanges for zones != primary --- Modified: modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/324d64e9ed301dab2204bda5e7cd143… Patch: https://github.com/kamailio/kamailio/commit/324d64e9ed301dab2204bda5e7cd143…

8 years, 10 months

git:master:59389b28: rtjson: safety check for branch index stored interanlly in xavp

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 59389b288fd50369226681b309c0895de03d7b77 URL: https://github.com/kamailio/kamailio/commit/59389b288fd50369226681b309c0895… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-23T16:45:17+02:00 rtjson: safety check for branch index stored interanlly in xavp --- Modified: modules/rtjson/rtjson_routing.c --- Diff: https://github.com/kamailio/kamailio/commit/59389b288fd50369226681b309c0895… Patch: https://github.com/kamailio/kamailio/commit/59389b288fd50369226681b309c0895… --- diff --git a/modules/rtjson/rtjson_routing.c b/modules/rtjson/rtjson_routing.c index c9ee5c3..bb59da5 100644 --- a/modules/rtjson/rtjson_routing.c +++ b/modules/rtjson/rtjson_routing.c @@ -677,6 +677,10 @@ int rtjson_update_branch(sip_msg_t *msg) LM_WARN("no idx for routing\n"); return -1; } + if(iavp->val.v.i<=0) { + LM_WARN("invalid branch idx for routing\n"); + return -1; + } srjson_InitDoc(&tdoc, NULL); @@ -708,7 +712,8 @@ int rtjson_update_branch(sip_msg_t *msg) nj = tj->child; i = 0; - while(nj && i<iavp->val.v.i) { + /* stop at number of branches - 1 */ + while(nj && i<iavp->val.v.i-1) { nj = nj->next; i++; }

8 years, 10 months

git:master:57b75141: evapi: don't print the message after relaying to evapi dispatcher

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 57b75141542cdaa471dab00cfb4f7d8812d41824 URL: https://github.com/kamailio/kamailio/commit/57b75141542cdaa471dab00cfb4f7d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-23T16:44:11+02:00 evapi: don't print the message after relaying to evapi dispatcher - the dispatcher process can consume it and frees the pointers --- Modified: modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/57b75141542cdaa471dab00cfb4f7d8… Patch: https://github.com/kamailio/kamailio/commit/57b75141542cdaa471dab00cfb4f7d8… --- diff --git a/modules/evapi/evapi_dispatch.c b/modules/evapi/evapi_dispatch.c index 3029d77..159d14e 100644 --- a/modules/evapi/evapi_dispatch.c +++ b/modules/evapi/evapi_dispatch.c @@ -534,8 +534,8 @@ int evapi_relay(str *evdata) int sbsize; str *sbuf; - LM_DBG("relaying event data [%.*s]\n", - evdata->len, evdata->s); + LM_DBG("relaying event data [%.*s] (%d)\n", + evdata->len, evdata->s, evdata->len); sbsize = evdata->len; sbuf = (str*)shm_malloc(sizeof(str) + ((sbsize+32) * sizeof(char))); @@ -560,12 +560,12 @@ int evapi_relay(str *evdata) return -1; } + LM_DBG("sending [%p] [%.*s] (%d)\n", sbuf, sbuf->len, sbuf->s, sbuf->len); len = write(_evapi_notify_sockets[1], &sbuf, sizeof(str*)); if(len<=0) { LM_ERR("failed to pass the pointer to evapi dispatcher\n"); return -1; } - LM_DBG("sent [%p] [%.*s] (%d)\n", sbuf, sbuf->len, sbuf->s, sbuf->len); return 0; }

8 years, 10 months

git:master:8025761d: rtjson: proper access to items in routes array

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8025761dc0c75fd50e3ee24be96d420df79659d5 URL: https://github.com/kamailio/kamailio/commit/8025761dc0c75fd50e3ee24be96d420… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-23T16:09:40+02:00 rtjson: proper access to items in routes array - more debug messages to show the internal operations --- Modified: modules/rtjson/rtjson_routing.c --- Diff: https://github.com/kamailio/kamailio/commit/8025761dc0c75fd50e3ee24be96d420… Patch: https://github.com/kamailio/kamailio/commit/8025761dc0c75fd50e3ee24be96d420…

8 years, 10 months

git:master:368cc963: evapi: refreshed the readme file

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 368cc963ae63be2cfcde972473ae764538d8d4aa URL: https://github.com/kamailio/kamailio/commit/368cc963ae63be2cfcde972473ae764… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-23T14:08:01+02:00 evapi: refreshed the readme file --- Modified: modules/evapi/README --- Diff: https://github.com/kamailio/kamailio/commit/368cc963ae63be2cfcde972473ae764… Patch: https://github.com/kamailio/kamailio/commit/368cc963ae63be2cfcde972473ae764… --- diff --git a/modules/evapi/README b/modules/evapi/README index 6035cce..a8465ce 100644 --- a/modules/evapi/README +++ b/modules/evapi/README @@ -10,7 +10,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright © 2014 asipto.com + Copyright Â© 2014 asipto.com __________________________________________________________________ Table of Contents @@ -158,10 +158,18 @@ modparam("evapi", "netstring_format", 0) 4.2. evapi_async_relay(evdata) 4.3. evapi_close() -4.1. evapi_relay(evdata) +4.1. evapi_relay(evdata) - Relay the event data give as parameter to connected applications. The - format on the network is netstring with evdata payload. + Relay the event data given as parameter to connected applications. + + The format on the network is netstring with evdata payload if + netstring_format parameter is set to 1 or bare evdata if + netstring_format parameter is set to 0. + + The function is passing the task to evapi dispatcher process, therefore + the SIP worker process is not blocked. Also, it doesn't wait for any + response, therefore the processing of the configuration continues very + fast when executing evapi_relay(). This function can be used from ANY_ROUTE. @@ -180,12 +188,19 @@ evapi_relay("{ \"event\": \"test\",\n \"data\": { \"fU\": \"$fU\" }\n}"); }, ... -4.2. evapi_async_relay(evdata) +4.2. evapi_async_relay(evdata) + + Relay the event data given as parameter to connected applications. + Before evaluating the parameter, the request processing is suspended + using tm module (using the t_suspend()/t_continue() framework). The + routing of the SIP request can be continued once + event_route[evapi:message-received] is triggered. After + evapi_async_relay() returns true, no relaying should happen in + request_route(), it should be followed by exit;. - Relay the event data give as parameter to connected applications. The - format on the network is netstring with evdata payload. Before - evaluating the parameter, the request processing is suspended using tm - module. + The format on the network is netstring with evdata payload if + netstring_format parameter is set to 1 or bare evdata if + netstring_format parameter is set to 0. This function can be used from REQUEST_ROUTE. @@ -195,7 +210,7 @@ evapi_async_relay("{ \"event\": \"suspend\",\n \"data\":" " { \"index\": \"$T(id_index)\", \"label\": \"$T(id_label)\" }\n}"); ... -4.3. evapi_close() +4.3. evapi_close() Close evapi current client connection. @@ -217,7 +232,7 @@ event_route[evapi:connection-new] { 5.2. evapi:connection-closed 5.3. evapi:message-received -5.1. evapi:connection-new +5.1. evapi:connection-new If defined, the module calls event_route[evapi:connection-new] when a new client is connected. @@ -227,7 +242,7 @@ event_route[evapi:connection-new] { } ... -5.2. evapi:connection-closed +5.2. evapi:connection-closed If defined, the module calls event_route[evapi:connection-closed] when a client connection is closed. @@ -237,7 +252,7 @@ event_route[evapi:connection-closed] { } ... -5.3. evapi:message-received +5.3. evapi:message-received If defined, the module calls event_route[evapi:message-received] when a message is received from a client.

8 years, 10 months

git:master:96225847: evapi: more documentation for exported functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 96225847ddfc2f879d63adbc0117748c9cf76f02 URL: https://github.com/kamailio/kamailio/commit/96225847ddfc2f879d63adbc0117748… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-23T14:07:37+02:00 evapi: more documentation for exported functions --- Modified: modules/evapi/doc/evapi_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/96225847ddfc2f879d63adbc0117748… Patch: https://github.com/kamailio/kamailio/commit/96225847ddfc2f879d63adbc0117748… --- diff --git a/modules/evapi/doc/evapi_admin.xml b/modules/evapi/doc/evapi_admin.xml index ef2e34a..574adef 100644 --- a/modules/evapi/doc/evapi_admin.xml +++ b/modules/evapi/doc/evapi_admin.xml @@ -131,8 +131,18 @@ modparam("evapi", "netstring_format", 0) <function moreinfo="none">evapi_relay(evdata)</function> </title> <para> - Relay the event data give as parameter to connected applications. - The format on the network is netstring with evdata payload. + Relay the event data given as parameter to connected applications. + </para> + <para> + The format on the network is netstring with evdata payload if + netstring_format parameter is set to 1 or bare evdata if + netstring_format parameter is set to 0. + </para> + <para> + The function is passing the task to evapi dispatcher process, therefore + the SIP worker process is not blocked. Also, it doesn't wait for any + response, therefore the processing of the configuration continues + very fast when executing evapi_relay(). </para> <para> This function can be used from ANY_ROUTE. @@ -166,10 +176,17 @@ evapi_relay("{ \"event\": \"test\",\n \"data\": { \"fU\": \"$fU\" }\n}"); <function moreinfo="none">evapi_async_relay(evdata)</function> </title> <para> - Relay the event data give as parameter to connected applications. - The format on the network is netstring with evdata payload. Before + Relay the event data given as parameter to connected applications. Before evaluating the parameter, the request processing is suspended using - tm module. + tm module (using the t_suspend()/t_continue() framework). The routing + of the SIP request can be continued once event_route[evapi:message-received] + is triggered. After evapi_async_relay() returns true, no relaying should + happen in request_route(), it should be followed by exit;. + </para> + <para> + The format on the network is netstring with evdata payload if + netstring_format parameter is set to 1 or bare evdata if + netstring_format parameter is set to 0. </para> <para> This function can be used from REQUEST_ROUTE.

8 years, 10 months

git:master:42f0a1ff: uac: fixed typos in log message

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 42f0a1ffe551442058f53c9446495d5e62dc5abc URL: https://github.com/kamailio/kamailio/commit/42f0a1ffe551442058f53c9446495d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-23T13:15:29+02:00 uac: fixed typos in log message --- Modified: modules/uac/api.h --- Diff: https://github.com/kamailio/kamailio/commit/42f0a1ffe551442058f53c9446495d5… Patch: https://github.com/kamailio/kamailio/commit/42f0a1ffe551442058f53c9446495d5… --- diff --git a/modules/uac/api.h b/modules/uac/api.h index 403a303..689f1fe 100644 --- a/modules/uac/api.h +++ b/modules/uac/api.h @@ -20,7 +20,7 @@ int bind_uac(uac_api_t*); inline static int load_uac_api(uac_api_t *uacb){ bind_uac_f bind_uac_exports; if(!(bind_uac_exports=(bind_uac_f)find_export("bind_uac",1,0))){ - LM_ERR("Failed to import bind_iuax\n"); + LM_ERR("Failed to import bind_uac\n"); return -1; } return bind_uac_exports(uacb);

8 years, 10 months

git:master:239c5484: rtjson: error log level set to notice for importing uac api

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 239c54843897ec143c03693e44c994ee9cdde684 URL: https://github.com/kamailio/kamailio/commit/239c54843897ec143c03693e44c994e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-23T13:12:08+02:00 rtjson: error log level set to notice for importing uac api - printed at module init, it is not preventing to start the server --- Modified: modules/rtjson/rtjson_routing.c --- Diff: https://github.com/kamailio/kamailio/commit/239c54843897ec143c03693e44c994e… Patch: https://github.com/kamailio/kamailio/commit/239c54843897ec143c03693e44c994e… --- diff --git a/modules/rtjson/rtjson_routing.c b/modules/rtjson/rtjson_routing.c index 71ac2e6..7e088c9 100644 --- a/modules/rtjson/rtjson_routing.c +++ b/modules/rtjson/rtjson_routing.c @@ -58,7 +58,7 @@ int rtjson_init(void) memset(&tmb, 0, sizeof(struct tm_binds)); } if (load_uac_api(&uacb) < 0) { - LM_ERR("cannot bind to UAC API - some features are diabled\n"); + LM_NOTICE("cannot bind to UAC API - some features are diabled\n"); memset(&uacb, 0, sizeof(uac_api_t)); } return 0;

8 years, 10 months

git:master:cccd1a4b: evapi: evapi_close() doesn't use any parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cccd1a4b20c750246b491ff41090c5749561948d URL: https://github.com/kamailio/kamailio/commit/cccd1a4b20c750246b491ff41090c57… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-23T11:45:22+02:00 evapi: evapi_close() doesn't use any parameter --- Modified: modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cccd1a4b20c750246b491ff41090c57… Patch: https://github.com/kamailio/kamailio/commit/cccd1a4b20c750246b491ff41090c57… --- diff --git a/modules/evapi/evapi_mod.c b/modules/evapi/evapi_mod.c index 2a3a824..eeafc21 100644 --- a/modules/evapi/evapi_mod.c +++ b/modules/evapi/evapi_mod.c @@ -66,6 +66,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE}, {"evapi_async_relay", (cmd_function)w_evapi_async_relay, 1, fixup_evapi_relay, 0, REQUEST_ROUTE}, + {"evapi_close", (cmd_function)w_evapi_close, 0, NULL, + 0, ANY_ROUTE}, {"evapi_close", (cmd_function)w_evapi_close, 1, NULL, 0, ANY_ROUTE}, {0, 0, 0, 0, 0, 0}

8 years, 10 months

← Newer
1
...
4
5
6
7
8
9
10
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2015