sr-dev October 2017

sr-dev@lists.kamailio.org

33 participants
301 discussions

git:master:60f177bf: db_postgres: clang format of the code

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 60f177bf04cd116b1e34f5563f594da327af8c09 URL: https://github.com/kamailio/kamailio/commit/60f177bf04cd116b1e34f5563f594da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-11T18:23:19+02:00 db_postgres: clang format of the code --- Modified: src/modules/db_postgres/db_postgres.c Modified: src/modules/db_postgres/km_dbase.c Modified: src/modules/db_postgres/km_dbase.h Modified: src/modules/db_postgres/km_pg_con.c Modified: src/modules/db_postgres/km_pg_con.h Modified: src/modules/db_postgres/km_pg_type.h Modified: src/modules/db_postgres/km_res.c Modified: src/modules/db_postgres/km_res.h Modified: src/modules/db_postgres/km_val.c Modified: src/modules/db_postgres/km_val.h Modified: src/modules/db_postgres/pg_cmd.c Modified: src/modules/db_postgres/pg_cmd.h Modified: src/modules/db_postgres/pg_con.c Modified: src/modules/db_postgres/pg_con.h Modified: src/modules/db_postgres/pg_fld.c Modified: src/modules/db_postgres/pg_fld.h Modified: src/modules/db_postgres/pg_mod.c Modified: src/modules/db_postgres/pg_oid.c Modified: src/modules/db_postgres/pg_oid.h Modified: src/modules/db_postgres/pg_res.c Modified: src/modules/db_postgres/pg_res.h Modified: src/modules/db_postgres/pg_sql.c Modified: src/modules/db_postgres/pg_sql.h Modified: src/modules/db_postgres/pg_uri.c Modified: src/modules/db_postgres/pg_uri.h --- Diff: https://github.com/kamailio/kamailio/commit/60f177bf04cd116b1e34f5563f594da… Patch: https://github.com/kamailio/kamailio/commit/60f177bf04cd116b1e34f5563f594da…

7 years, 2 months

[kamailio/kamailio] kazoo: amqp_connection parameter maximum length is too short (#1269)

by Mark Lipscombe

The 100 character hard-coded maximum length of the kazoo module's amqp_connection parameter is too short. The limit was previously bumped from 50 to 100 following on from #529 but this is still too short. Example use case, using Hashicorp's vault to dish out AMQP credentials yields a connection URL like this: amqp://aws-ec2-13e1e70e-d4d3-abbe-5f3b-7b631f83def7:63b8d362-72d1-878e-81ca-d62667503495@rabbitmq.service.consul:5672 https://github.com/kamailio/kamailio/blob/48791fae1ba8508b18856d90e85a93df0… -- 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/1269

7 years, 2 months

git:master:33ecbbba: kazoo : increase max url size to 512

by lazedo

Module: kamailio Branch: master Commit: 33ecbbbaf8054220372637ac89ac4e4a7c7748d0 URL: https://github.com/kamailio/kamailio/commit/33ecbbbaf8054220372637ac89ac4e4… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-10-11T06:22:42+01:00 kazoo : increase max url size to 512 --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/33ecbbbaf8054220372637ac89ac4e4… Patch: https://github.com/kamailio/kamailio/commit/33ecbbbaf8054220372637ac89ac4e4… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index fbf2e9a8a9..bcea2e6ee0 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -679,7 +679,7 @@ void kz_amqp_destroy() { kz_hash_destroy(); } -#define KZ_URL_MAX_SIZE 100 +#define KZ_URL_MAX_SIZE 512 static char* KZ_URL_ROOT = "/"; int kz_amqp_add_connection(modparam_t type, void* val)

7 years, 2 months

git:master:b87ac344: kazoo : add consumer key if appropriate

by lazedo

Module: kamailio Branch: master Commit: b87ac3440ae38526cca15dd26625e481e331d51e URL: https://github.com/kamailio/kamailio/commit/b87ac3440ae38526cca15dd26625e48… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-10-11T06:21:23+01:00 kazoo : add consumer key if appropriate --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/b87ac3440ae38526cca15dd26625e48… Patch: https://github.com/kamailio/kamailio/commit/b87ac3440ae38526cca15dd26625e48… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index af6223d693..fbf2e9a8a9 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -2848,9 +2848,13 @@ char* maybe_add_consumer_key(int server_id, amqp_bytes_t body) } char buffer[100]; const char* server_id_str = json_object_get_string(server_id_obj); - sprintf(buffer, "consumer://%d/%s", server_id, server_id_str); - json_object_object_del(json_obj, BLF_JSON_SERVERID); - json_object_object_add(json_obj, BLF_JSON_SERVERID, json_object_new_string(buffer)); + if(server_id_str && strlen(server_id_str) > 0) { + sprintf(buffer, "consumer://%d/%s", server_id, server_id_str); + json_object_object_del(json_obj, BLF_JSON_SERVERID); + json_object_object_add(json_obj, BLF_JSON_SERVERID, json_object_new_string(buffer)); + } else { + json_object_object_del(json_obj, BLF_JSON_SERVERID); + } shm_free(payload); payload = kz_amqp_bytes_dup(amqp_cstring_bytes((char*)json_object_to_json_string(json_obj))); json_object_put(json_obj); @@ -2894,9 +2898,13 @@ void kz_send_targeted_cmd(int server_id, amqp_bytes_t body) JObj = kz_json_get_object(json_obj, BLF_JSON_SERVERID); if(JObj != NULL) { server_id_str = (char*) json_object_get_string(JObj); - sprintf(buffer, "consumer://%d/%s", server_id, server_id_str); - json_object_object_del(json_obj, BLF_JSON_SERVERID); - json_object_object_add(json_obj, BLF_JSON_SERVERID, json_object_new_string(buffer)); + if(server_id_str && strlen(server_id_str) > 0) { + sprintf(buffer, "consumer://%d/%s", server_id, server_id_str); + json_object_object_del(json_obj, BLF_JSON_SERVERID); + json_object_object_add(json_obj, BLF_JSON_SERVERID, json_object_new_string(buffer)); + } else { + json_object_object_del(json_obj, BLF_JSON_SERVERID); + } } cmd->return_payload = kz_amqp_string_dup((char*)json_object_to_json_string(json_obj)); @@ -2957,9 +2965,13 @@ void kz_amqp_send_worker_event(kz_amqp_server_ptr server_ptr, amqp_envelope_t* e 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); - json_object_object_del(json_obj, BLF_JSON_SERVERID); - json_object_object_add(json_obj, BLF_JSON_SERVERID, json_object_new_string(buffer)); + if(_kz_server_id_str && strlen(_kz_server_id_str) > 0) { + sprintf(buffer, "consumer://%d/%s", _kz_server_id, _kz_server_id_str); + json_object_object_del(json_obj, BLF_JSON_SERVERID); + json_object_object_add(json_obj, BLF_JSON_SERVERID, json_object_new_string(buffer)); + } else { + json_object_object_del(json_obj, BLF_JSON_SERVERID); + } } json_object_object_add(json_obj, BLF_JSON_BROKER_ZONE, json_object_new_string(server_ptr->zone->zone));

7 years, 2 months

git:master:48791fae: modules: readme files regenerated - dialog ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 48791fae1ba8508b18856d90e85a93df003b1e3b URL: https://github.com/kamailio/kamailio/commit/48791fae1ba8508b18856d90e85a93d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-10-10T11:46:38+02:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/48791fae1ba8508b18856d90e85a93d… Patch: https://github.com/kamailio/kamailio/commit/48791fae1ba8508b18856d90e85a93d… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index f56c64cad8..29c7f28ebd 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -1914,10 +1914,11 @@ kamcmd dlg.profile_list inbound_calls * from - SIP address to initiate the call * to - SIP address to refer 'from' to * op (optional) - outbound proxy SIP address + * body (optional) - SDP body for initial INVITE RPC Command Format: ... -kamcmd dlg.list _from_ _to_ _op_ +kamcmd dlg.bridge_dlg _from_ _to_ _op_ ... 10. Exported Variables

7 years, 2 months

git:master:59b58035: dialog: documented optional sdp body for rpc bridge command

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 59b58035bfe8e722a696db889d5295254092ae90 URL: https://github.com/kamailio/kamailio/commit/59b58035bfe8e722a696db889d52952… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-10T11:33:22+02:00 dialog: documented optional sdp body for rpc bridge command --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/59b58035bfe8e722a696db889d52952… Patch: https://github.com/kamailio/kamailio/commit/59b58035bfe8e722a696db889d52952… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 4823de489d..d01ea69cff 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2453,11 +2453,15 @@ if(has_totag() and is_present_hf("Route") and uri==myself ) { <listitem><para> <emphasis>op</emphasis> (optional) - outbound proxy SIP address </para></listitem> + <listitem><para> + <emphasis>body</emphasis> (optional) - SDP body for initial + INVITE + </para></listitem> </itemizedlist> <para>RPC Command Format:</para> <programlisting format="linespecific"> ... -&kamcmd; dlg.list _from_ _to_ _op_ +&kamcmd; dlg.bridge_dlg _from_ _to_ _op_ ... </programlisting> </section>

7 years, 2 months

[kamailio/kamailio] Use NAT IP to keep DNS-loadbalance (#1268)

by abell-star

I let two kamailio server processes run in two Nat IP , and DNS to keep loadbalance. but DNS can return two Nat IP,when the IP it returns is not the same as the account register,the server cann't deal with request,i wonder if i can use Nat IP to keep DNS loadbalance? -- 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/1268

7 years, 2 months

git:master:4267e1ef: tm: updated some structs to typedefs

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4267e1ef7c9ffaac606964fb1b2d64334754b5d9 URL: https://github.com/kamailio/kamailio/commit/4267e1ef7c9ffaac606964fb1b2d643… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-09T18:27:28+02:00 tm: updated some structs to typedefs --- Modified: src/modules/tmx/tmx_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4267e1ef7c9ffaac606964fb1b2d643… Patch: https://github.com/kamailio/kamailio/commit/4267e1ef7c9ffaac606964fb1b2d643…

7 years, 2 months

[kamailio/kamailio] p_usrloc: Fix #1265: missing columns in location.sql file. (#1266)

by Andrew Siplas

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #1265 #### Description Add columns referenced by [p_usrloc_mod.c](https://github.com/kamailio/kamailio/blob/6c01e2692d5ff56dd… You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1266 -- Commit Summary -- * p_usrloc: Fix #1265: missing columns in location.sql file. -- File Changes -- M src/modules/p_usrloc/location.sql (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1266.patch https://github.com/kamailio/kamailio/pull/1266.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/1266

7 years, 2 months

git:master:9c936647: modules: readme files regenerated - path ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 9c9366473280c52d7f79348637a56264420d48fc URL: https://github.com/kamailio/kamailio/commit/9c9366473280c52d7f79348637a5626… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-10-09T16:46:17+02:00 modules: readme files regenerated - path ... [skip ci] --- Modified: src/modules/path/README --- Diff: https://github.com/kamailio/kamailio/commit/9c9366473280c52d7f79348637a5626… Patch: https://github.com/kamailio/kamailio/commit/9c9366473280c52d7f79348637a5626… --- diff --git a/src/modules/path/README b/src/modules/path/README index d2e3d69398..4d6e7cba5c 100644 --- a/src/modules/path/README +++ b/src/modules/path/README @@ -292,6 +292,13 @@ if (!add_path("loadbalancer", "ob")) { address as domain-part, and the address the request has been received from as received-parameter. + If the “outbound” module was loaded before this module, and outbound is + required for this request, the header will be in the form “Path: + <sip:flowtoken@1.2.3.4;lr;received=sip:2.3.4.5:1234;ob>”, where + “flowtoken” is the RFC 5626 flow-token that can be used to identify the + source and local address and transport the request was received on, and + where “1.2.3.4” is the address of the outgoing interface. + This function can be used from REQUEST_ROUTE. Example 1.8. add_path_received() usage

7 years, 2 months

← Newer
1
...
23
24
25
26
27
28
29
30
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2017