sr-dev February 2016

sr-dev@lists.kamailio.org

28 participants
302 discussions

git:master:b038f1d6: dnssec Find library in /usr/local too

by Olle E. Johansson

Module: kamailio Branch: master Commit: b038f1d6641d44907e64a676a2aa3d99ea932119 URL: https://github.com/kamailio/kamailio/commit/b038f1d6641d44907e64a676a2aa3d9… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-02-26T16:40:44+01:00 dnssec Find library in /usr/local too --- Modified: modules/dnssec/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/b038f1d6641d44907e64a676a2aa3d9… Patch: https://github.com/kamailio/kamailio/commit/b038f1d6641d44907e64a676a2aa3d9… --- diff --git a/modules/dnssec/Makefile b/modules/dnssec/Makefile index 1c7e2de..d357201 100644 --- a/modules/dnssec/Makefile +++ b/modules/dnssec/Makefile @@ -7,10 +7,14 @@ include ../../Makefile.defs auto_gen= NAME=dnssec.so -LIBS= -lval-threads -lcrypto -lsres -lpthread -lssl + +DEFS+=-I$(LOCALBASE)/include + +LIBS+=-L$(LOCALBASE)/lib +LIBS+= -lval-threads -lcrypto -lsres -lpthread -lssl DEFS+=-DKAMAILIO_MOD_INTERFACE -DEFS +=-I$(LOCALBASE)/include + SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/kmi/kmi

8 years, 2 months

git:master:28f11e70: dnssec Build with include files in /usr/local as well

by Olle E. Johansson

Module: kamailio Branch: master Commit: 28f11e7072739a34b5fe3968c10ac8a7aebbcd82 URL: https://github.com/kamailio/kamailio/commit/28f11e7072739a34b5fe3968c10ac8a… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-02-26T16:40:44+01:00 dnssec Build with include files in /usr/local as well --- Modified: modules/dnssec/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/28f11e7072739a34b5fe3968c10ac8a… Patch: https://github.com/kamailio/kamailio/commit/28f11e7072739a34b5fe3968c10ac8a… --- diff --git a/modules/dnssec/Makefile b/modules/dnssec/Makefile index b782087..1c7e2de 100644 --- a/modules/dnssec/Makefile +++ b/modules/dnssec/Makefile @@ -10,6 +10,7 @@ NAME=dnssec.so LIBS= -lval-threads -lcrypto -lsres -lpthread -lssl DEFS+=-DKAMAILIO_MOD_INTERFACE +DEFS +=-I$(LOCALBASE)/include SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/kmi/kmi

8 years, 2 months

git:master:2b1e8db2: kazoo: log invalid json

by lazedo

Module: kamailio Branch: master Commit: 2b1e8db2838b7efc50b21ac66d6ef4494e96ddec URL: https://github.com/kamailio/kamailio/commit/2b1e8db2838b7efc50b21ac66d6ef44… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2016-02-26T15:38:50Z kazoo: log invalid json --- Modified: modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/2b1e8db2838b7efc50b21ac66d6ef44… Patch: https://github.com/kamailio/kamailio/commit/2b1e8db2838b7efc50b21ac66d6ef44… --- diff --git a/modules/kazoo/kz_amqp.c b/modules/kazoo/kz_amqp.c index 0557a71..e4c0779 100644 --- a/modules/kazoo/kz_amqp.c +++ b/modules/kazoo/kz_amqp.c @@ -1855,8 +1855,10 @@ int kz_amqp_send_ex(kz_amqp_server_ptr srv, kz_amqp_cmd_ptr cmd, kz_amqp_channel payload = amqp_bytes_malloc_dup(amqp_cstring_bytes(cmd->payload)); json_obj = kz_json_parse(cmd->payload); - if (json_obj == NULL) - goto error; + if (json_obj == NULL) { + LM_ERR("error parsing json when publishing %s\n", cmd->payload); + goto error; + } if(kz_json_get_object(json_obj, BLF_JSON_SERVERID) == NULL) { json_object_object_add(json_obj, BLF_JSON_SERVERID, json_object_new_string((char*)srv->channels[idx].targeted->routing_key.bytes)); @@ -2560,13 +2562,13 @@ void kz_amqp_send_worker_event(int _kz_server_id, amqp_envelope_t* envelope, kz_ str* message_id = NULL; int idx = envelope->channel-1; - json_obj_ptr json_obj = kz_json_parse((char*)envelope->message.body.bytes); + json_obj_ptr json_obj = kz_json_parse((char*)envelope->message.body.bytes); if (json_obj == NULL) { LM_ERR("error parsing json body\n"); return; } - json_object* JObj = kz_json_get_object(json_obj, BLF_JSON_SERVERID); + json_object* JObj = kz_json_get_object(json_obj, BLF_JSON_SERVERID); if(JObj != NULL) { const char* _kz_server_id_str = json_object_get_string(JObj); sprintf(buffer, "consumer://%d/%s", _kz_server_id, _kz_server_id_str);

8 years, 2 months

git:master:8740bf3d: http_async_client: updated README

by Federico Cabiddu

Module: kamailio Branch: master Commit: 8740bf3d636f063cf4759d7ded231f1d86a94a6b URL: https://github.com/kamailio/kamailio/commit/8740bf3d636f063cf4759d7ded231f1… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2016-02-26T15:22:30+01:00 http_async_client: updated README --- Modified: modules/http_async_client/README --- Diff: https://github.com/kamailio/kamailio/commit/8740bf3d636f063cf4759d7ded231f1… Patch: https://github.com/kamailio/kamailio/commit/8740bf3d636f063cf4759d7ded231f1… --- diff --git a/modules/http_async_client/README b/modules/http_async_client/README index fbaf8a6..e513106 100644 --- a/modules/http_async_client/README +++ b/modules/http_async_client/README @@ -1,4 +1,4 @@ -ASYNC_HTTP Module +HTTP_ASYNC_CLIENT Module Federico Cabiddu @@ -6,7 +6,7 @@ Federico Cabiddu Giacomo Vacca - <Giacomo.vacca(a)gmail.com> + <giacomo.vacca(a)gmail.com> Camille Oudot @@ -267,8 +267,11 @@ modparam("http_async_client", "curl_verbose", 1) free, ...) Note: if this module is used in conjunction with another module using - libcurl, this parameter will have no effect, and curl will likely use - the system memory allocator by default. + libcurl (http_client, utils, xcap, xcap_client), it must be loaded as + first one for this parameter to have effect, otherwise curl will likely + use the system memory allocator by default. On the other hand if the + module is loaded before any other module using libcurl, all the modules + will use the memory manager specified by this parameter. Default value "shm" @@ -344,13 +347,15 @@ modparam("http_async_client", "tls_ca_path", "/etc/kamailio/ssl/ca/") of HTTP reply, on error or on timeout. If a transaction exists before calling http_async_query(), it will be paused and resumed in this route, while the routing script execution will be stopped. If executed - in a transactionless context, or if http_async_suspend_transaction() is - used to not suspend the transaction, the routing script execution will - continue and the query result will be available in “route_name”. + in a transactionless context, or if http_async_suspend_transaction() or + $http_req(suspend) are used to not suspend the transaction, the routing + script execution will continue and the query result will be available + in “route_name”. Return value: 0 (stop script execution) on success in transaction - context, 1 (continue script execution) in transaction-less context or - if http_async_suspend_transaction(0) is used, -1 on error. + context, 1 (continue script execution) in transaction-less context (or + if http_async_suspend_transaction(0) or $http_req(suspend) are used), + -1 on error. This function can be used from ANY_ROUTE. @@ -554,6 +559,8 @@ http_async_query("https://example.com/test.php", "HTTP_REPLY"); http_set_tls_client_key()) * tls_ca_path: sets the CA certificate files to use (see http_set_tls_ca_path()) + * suspend: if set to 0 doesn't suspend the current transaction before + performing the query (see http_async_suspend()) Example 1.22. $http_req(key) variable usage ... @@ -562,6 +569,8 @@ $http_req(timeout) = 100; # 100 ms $http_req(method) = "DELETE"; $http_req(hdr) = "X-Sip-Call-Id: " + $ci; $http_req(hdr) = "X-Foo: bar"; # add a 2nd header +$http_req(suspend) = 0; # don't suspend the transaction, continue ro +uting script's execution # the following request will use the above parameters http_async_query("https://example.com/test.php", "HTTP_REPLY"); ... @@ -569,11 +578,11 @@ http_async_query("https://example.com/test.php", "HTTP_REPLY"); The following read-only pseudo variables can only be used in the callback routes executed by http_async_query() * $http_ok: 1 if cURL executed the request successfully, 0 otherwise - (check $ah_err for details) + (check $http_err for details) * $http_err: cURL error string if an error occured, $null otherwise * $http_rs: http status * $http_rr: http reason phrase - * $http_hdr(Name): value of the Name header (the $(ah_hdr(Name)[N]) + * $http_hdr(Name): value of the Name header (the $(http_hdr(Name)[N]) syntax can also be used, check the SIP $hdr() PV documentation for details) * $http_mb and $http_ml: HTTP response buffer (including headers) and

8 years, 2 months

git:master:8f209d4d: http_async_client: documentation fixes

by Federico Cabiddu

Module: kamailio Branch: master Commit: 8f209d4d5c9c0632fc225d338f29d2d900ed752b URL: https://github.com/kamailio/kamailio/commit/8f209d4d5c9c0632fc225d338f29d2d… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2016-02-26T15:22:19+01:00 http_async_client: documentation fixes --- Modified: modules/http_async_client/doc/http_async_client.xml Modified: modules/http_async_client/doc/http_async_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8f209d4d5c9c0632fc225d338f29d2d… Patch: https://github.com/kamailio/kamailio/commit/8f209d4d5c9c0632fc225d338f29d2d…

8 years, 2 months

git:master:e12bf2cd: http_async_client: some module's logs fixes

by Federico Cabiddu

Module: kamailio Branch: master Commit: e12bf2cd3b7b79b1e31030e555dfe379ed12fe33 URL: https://github.com/kamailio/kamailio/commit/e12bf2cd3b7b79b1e31030e555dfe37… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2016-02-26T15:22:01+01:00 http_async_client: some module's logs fixes --- Modified: modules/http_async_client/http_async_client_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e12bf2cd3b7b79b1e31030e555dfe37… Patch: https://github.com/kamailio/kamailio/commit/e12bf2cd3b7b79b1e31030e555dfe37… --- diff --git a/modules/http_async_client/http_async_client_mod.c b/modules/http_async_client/http_async_client_mod.c index e945136..0ea2923 100644 --- a/modules/http_async_client/http_async_client_mod.c +++ b/modules/http_async_client/http_async_client_mod.c @@ -667,13 +667,13 @@ static int fixup_http_async_post(void** param, int param_no) { \ if (ah_reply) { \ if (ah_error.s) { \ - LM_WARN("an async_http variable was read after http error, use $ah_ok to check the request's status\n"); \ + LM_WARN("an async variable was read after http error, use $http_ok to check the request's status\n"); \ return pv_get_null(msg, param, res); \ } else { \ return pv_api.PV_F(ah_reply, param, res); \ } \ } else { \ - LM_ERR("the async_http variables can only be read from an async http worker\n"); \ + LM_ERR("the async variables can only be read from an async http worker\n"); \ return pv_get_null(msg, param, res); \ } \ } @@ -698,7 +698,7 @@ static int ah_get_ok(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { return pv_get_intstrval(msg, param, res, 1, &pv_str_1); } } else { - LM_ERR("the async_http variables can only be read from an async http worker\n"); + LM_ERR("the async variables can only be read from an async http worker\n"); return pv_get_null(msg, param, res); } } @@ -711,7 +711,7 @@ static int ah_get_err(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { return pv_get_null(msg, param, res); } } else { - LM_ERR("the async_http variables can only be read from an async http worker\n"); + LM_ERR("the async variables can only be read from an async http worker\n"); return pv_get_null(msg, param, res); } }

8 years, 2 months

git:master:778e4a1e: http_async_client: add "suspend" to $http_req keys

by Federico Cabiddu

Module: kamailio Branch: master Commit: 778e4a1e7ea2143089749bab317d87fcfdcd6629 URL: https://github.com/kamailio/kamailio/commit/778e4a1e7ea2143089749bab317d87f… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2016-02-26T15:21:41+01:00 http_async_client: add "suspend" to $http_req keys --- Modified: modules/http_async_client/doc/http_async_client_admin.xml Modified: modules/http_async_client/http_async_client_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/778e4a1e7ea2143089749bab317d87f… Patch: https://github.com/kamailio/kamailio/commit/778e4a1e7ea2143089749bab317d87f… --- diff --git a/modules/http_async_client/doc/http_async_client_admin.xml b/modules/http_async_client/doc/http_async_client_admin.xml index 3c3f46b..e2c30d9 100644 --- a/modules/http_async_client/doc/http_async_client_admin.xml +++ b/modules/http_async_client/doc/http_async_client_admin.xml @@ -573,6 +573,7 @@ http_async_query("https://example.com/test.php", "HTTP_REPLY"); <listitem><para><emphasis>tls_client_cert</emphasis>: sets the client certificate to use (see <emphasis>http_set_tls_client_cert()</emphasis>)</para></listitem> <listitem><para><emphasis>tls_client_key</emphasis>: sets the client certificate key to use (see <emphasis>http_set_tls_client_key()</emphasis>)</para></listitem> <listitem><para><emphasis>tls_ca_path</emphasis>: sets the CA certificate files to use (see <emphasis>http_set_tls_ca_path()</emphasis>)</para></listitem> + <listitem><para><emphasis>suspend</emphasis>: if set to 0 doesn't suspend the current transaction before performing the query (see <emphasis>http_async_suspend()</emphasis>)</para></listitem> </itemizedlist> <example> <title><literal>$http_req(key)</literal> variable usage</title> @@ -583,6 +584,7 @@ $http_req(timeout) = 100; # 100 ms $http_req(method) = "DELETE"; $http_req(hdr) = "X-Sip-Call-Id: " + $ci; $http_req(hdr) = "X-Foo: bar"; # add a 2nd header +$http_req(suspend) = 0; # don't suspend the transaction, continue routing script's execution # the following request will use the above parameters http_async_query("https://example.com/test.php", "HTTP_REPLY"); ... diff --git a/modules/http_async_client/http_async_client_mod.c b/modules/http_async_client/http_async_client_mod.c index 20d953a..e945136 100644 --- a/modules/http_async_client/http_async_client_mod.c +++ b/modules/http_async_client/http_async_client_mod.c @@ -124,7 +124,7 @@ enum http_req_name_t { E_HRN_ALL = 0, E_HRN_HDR, E_HRN_METHOD, E_HRN_TIMEOUT, E_HRN_TLS_CA_PATH, E_HRN_TLS_CLIENT_KEY, - E_HRN_TLS_CLIENT_CERT + E_HRN_TLS_CLIENT_CERT, E_HRN_SUSPEND }; static cmd_export_t cmds[]={ @@ -737,6 +737,8 @@ static int ah_parse_req_name(pv_spec_p sp, str *in) { case 7: if(strncmp(in->s, "timeout", 7)==0) sp->pvp.pvn.u.isname.name.n = E_HRN_TIMEOUT; + else if(strncmp(in->s, "suspend", 7)==0) + sp->pvp.pvn.u.isname.name.n = E_HRN_SUSPEND; else goto error; break; case 11: @@ -849,6 +851,17 @@ static int ah_set_req(struct sip_msg* msg, pv_param_t *param, set_query_param(&ah_params.tls_client_cert, tls_client_cert); } break; + case E_HRN_SUSPEND: + if (tval) { + if (!(tval->flags & PV_VAL_INT)) { + LM_ERR("invalid value type for $http_req(suspend)\n"); + return -1; + } + ah_params.suspend_transaction = tval->ri?1:0; + } else { + ah_params.suspend_transaction = 1; + } + break; } return 1;

8 years, 2 months

git:master:d1197162: kazoo: fix reconnect

by lazedo

Module: kamailio Branch: master Commit: d11971629777b313790850cd393f7233dd3c31e1 URL: https://github.com/kamailio/kamailio/commit/d11971629777b313790850cd393f723… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2016-02-25T16:38:12Z kazoo: fix reconnect --- Modified: modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/d11971629777b313790850cd393f723… Patch: https://github.com/kamailio/kamailio/commit/d11971629777b313790850cd393f723…

8 years, 2 months

git:master:179b7a2b: Merge pull request #505 from smititelu/master

by Stefan Mititelu

Module: kamailio Branch: master Commit: 179b7a2bd7ad8a3aee0e4786f455868f7673a20b URL: https://github.com/kamailio/kamailio/commit/179b7a2bd7ad8a3aee0e4786f455868… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2016-02-23T13:46:59+02:00 Merge pull request #505 from smititelu/master Fix node selection when rtpengine_delete(), for branching scenarios --- Modified: modules/rtpengine/rtpengine.c Modified: modules/rtpengine/rtpengine.h Modified: modules/rtpengine/rtpengine_hash.c Modified: modules/rtpengine/rtpengine_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/179b7a2bd7ad8a3aee0e4786f455868… Patch: https://github.com/kamailio/kamailio/commit/179b7a2bd7ad8a3aee0e4786f455868…

8 years, 2 months

git:master:a4c5af2d: rtpengine: Delete all entries if viabranch.len==0

by Stefan Mititelu

Module: kamailio Branch: master Commit: a4c5af2df65a2711ea7f0fd97e7d9b8e65461a4b URL: https://github.com/kamailio/kamailio/commit/a4c5af2df65a2711ea7f0fd97e7d9b8… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2016-02-23T10:08:56+02:00 rtpengine: Delete all entries if viabranch.len==0 - try to delete all (callid, viabranchX/Y..) hashtable entries when rtpengine_delete() is called with viabranch.len==0 - release lock before returning --- Modified: modules/rtpengine/rtpengine_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/a4c5af2df65a2711ea7f0fd97e7d9b8… Patch: https://github.com/kamailio/kamailio/commit/a4c5af2df65a2711ea7f0fd97e7d9b8… --- diff --git a/modules/rtpengine/rtpengine_hash.c b/modules/rtpengine/rtpengine_hash.c index 66f1cb1..5821fe8 100644 --- a/modules/rtpengine/rtpengine_hash.c +++ b/modules/rtpengine/rtpengine_hash.c @@ -302,21 +302,30 @@ int rtpengine_hash_table_remove(str callid, str viabranch, enum rtpe_operation o // if callid found, delete entry if ((str_equal(entry->callid, callid) && str_equal(entry->viabranch, viabranch)) || (str_equal(entry->callid, callid) && viabranch.len == 0 && op == OP_DELETE)) { - // free entry + // set pointers; exclude entry last_entry->next = entry->next; + + // free current entry; entry points to unknown rtpengine_hash_table_free_entry(entry); + // set pointers + entry = last_entry; + // update total rtpengine_hash_table->row_totals[hash_index]--; - // unlock - lock_release(rtpengine_hash_table->row_locks[hash_index]); - found = 1; if (!(viabranch.len == 0 && op == OP_DELETE)) { + // unlock + lock_release(rtpengine_hash_table->row_locks[hash_index]); return found; } + + // try to also delete other viabranch entries for callid + last_entry = entry; + entry = entry->next; + continue; } // if expired entry discovered, delete it

8 years, 2 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2016