sr-dev April 2017

sr-dev@lists.kamailio.org

31 participants
426 discussions

[kamailio/kamailio] sipcapture: fix HEP3 capture-id >= 2^16 (#1073)

by Bastian Triller

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1073 -- Commit Summary -- * sipcapture: fix HEP3 capture-id >= 2^16 -- File Changes -- M src/modules/sipcapture/sipcapture.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1073.patch https://github.com/kamailio/kamailio/pull/1073.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/1073

7 years, 8 months

git:master:91a81625: srdb1/schema: made 'domain_attrs_domain_attrs_idx' index not unique

by Juha Heinanen

Module: kamailio Branch: master Commit: 91a81625f89da38e5890f3b3c84ed4141eb3652c URL: https://github.com/kamailio/kamailio/commit/91a81625f89da38e5890f3b3c84ed41… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2017-04-15T17:39:39+03:00 srdb1/schema: made 'domain_attrs_domain_attrs_idx' index not unique and removed 'value' field from the index - generated sql files from schema --- Modified: src/lib/srdb1/schema/domain_attrs.xml Modified: utils/kamctl/db_sqlite/domain-create.sql Modified: utils/kamctl/mysql/domain-create.sql Modified: utils/kamctl/oracle/domain-create.sql Modified: utils/kamctl/postgres/domain-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/91a81625f89da38e5890f3b3c84ed41… Patch: https://github.com/kamailio/kamailio/commit/91a81625f89da38e5890f3b3c84ed41… --- diff --git a/src/lib/srdb1/schema/domain_attrs.xml b/src/lib/srdb1/schema/domain_attrs.xml index 6f60781..0dedf38 100644 --- a/src/lib/srdb1/schema/domain_attrs.xml +++ b/src/lib/srdb1/schema/domain_attrs.xml @@ -65,7 +65,5 @@ <name>domain_attrs_idx</name> <colref linkend="did"/> <colref linkend="name"/> - <colref linkend="value"/> - <unique/> </index> </table> diff --git a/utils/kamctl/db_sqlite/domain-create.sql b/utils/kamctl/db_sqlite/domain-create.sql index 5586eee..399e10e 100644 --- a/utils/kamctl/db_sqlite/domain-create.sql +++ b/utils/kamctl/db_sqlite/domain-create.sql @@ -14,9 +14,10 @@ CREATE TABLE domain_attrs ( name VARCHAR(32) NOT NULL, type INTEGER NOT NULL, value VARCHAR(255) NOT NULL, - last_modified TIMESTAMP WITHOUT TIME ZONE DEFAULT '2000-01-01 00:00:01' NOT NULL, - CONSTRAINT domain_attrs_domain_attrs_idx UNIQUE (did, name, value) + last_modified TIMESTAMP WITHOUT TIME ZONE DEFAULT '2000-01-01 00:00:01' NOT NULL ); +CREATE INDEX domain_attrs_domain_attrs_idx ON domain_attrs (did, name); + INSERT INTO version (table_name, table_version) values ('domain_attrs','1'); diff --git a/utils/kamctl/mysql/domain-create.sql b/utils/kamctl/mysql/domain-create.sql index 393fdab..44238e1 100644 --- a/utils/kamctl/mysql/domain-create.sql +++ b/utils/kamctl/mysql/domain-create.sql @@ -14,9 +14,10 @@ CREATE TABLE `domain_attrs` ( `name` VARCHAR(32) NOT NULL, `type` INT UNSIGNED NOT NULL, `value` VARCHAR(255) NOT NULL, - `last_modified` DATETIME DEFAULT '2000-01-01 00:00:01' NOT NULL, - CONSTRAINT domain_attrs_idx UNIQUE (`did`, `name`, `value`) + `last_modified` DATETIME DEFAULT '2000-01-01 00:00:01' NOT NULL ); +CREATE INDEX domain_attrs_idx ON domain_attrs (`did`, `name`); + INSERT INTO version (table_name, table_version) values ('domain_attrs','1'); diff --git a/utils/kamctl/oracle/domain-create.sql b/utils/kamctl/oracle/domain-create.sql index ee1fe99..39e41a0 100644 --- a/utils/kamctl/oracle/domain-create.sql +++ b/utils/kamctl/oracle/domain-create.sql @@ -22,8 +22,7 @@ CREATE TABLE domain_attrs ( name VARCHAR2(32), type NUMBER(10), value VARCHAR2(255), - last_modified DATE DEFAULT to_date('2000-01-01 00:00:01','yyyy-mm-dd hh24:mi:ss'), - CONSTRAINT domain_attrs_domain_attrs_idx UNIQUE (did, name, value) + last_modified DATE DEFAULT to_date('2000-01-01 00:00:01','yyyy-mm-dd hh24:mi:ss') ); CREATE OR REPLACE TRIGGER domain_attrs_tr @@ -34,5 +33,7 @@ END domain_attrs_tr; / BEGIN map2users('domain_attrs'); END; / +CREATE INDEX domain_attrs_domain_attrs_idx ON domain_attrs (did, name); + INSERT INTO version (table_name, table_version) values ('domain_attrs','1'); diff --git a/utils/kamctl/postgres/domain-create.sql b/utils/kamctl/postgres/domain-create.sql index c358bdf..e4345ff 100644 --- a/utils/kamctl/postgres/domain-create.sql +++ b/utils/kamctl/postgres/domain-create.sql @@ -14,9 +14,10 @@ CREATE TABLE domain_attrs ( name VARCHAR(32) NOT NULL, type INTEGER NOT NULL, value VARCHAR(255) NOT NULL, - last_modified TIMESTAMP WITHOUT TIME ZONE DEFAULT '2000-01-01 00:00:01' NOT NULL, - CONSTRAINT domain_attrs_domain_attrs_idx UNIQUE (did, name, value) + last_modified TIMESTAMP WITHOUT TIME ZONE DEFAULT '2000-01-01 00:00:01' NOT NULL ); +CREATE INDEX domain_attrs_domain_attrs_idx ON domain_attrs (did, name); + INSERT INTO version (table_name, table_version) values ('domain_attrs','1');

7 years, 8 months

Failed: lazedo/kamailio#1 (4.4 - 7c2e8c7)

by Travis CI

Build Update for lazedo/kamailio ------------------------------------- Build: #1 Status: Failed Duration: 16 minutes and 27 seconds Commit: 7c2e8c7 (4.4) Author: Luis Azedo Message: fix include View the changeset: https://github.com/lazedo/kamailio/compare/33cf2966d2ff...7c2e8c7130aa View the full build log and details: https://travis-ci.org/lazedo/kamailio/builds/222219364 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

7 years, 8 months

git:master:cc7adf79: kazoo: add time msg was received

by lazedo

Module: kamailio Branch: master Commit: cc7adf798c1f533e77dfab94563d7995094aa4c5 URL: https://github.com/kamailio/kamailio/commit/cc7adf798c1f533e77dfab94563d799… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-04-14T16:58:48+01:00 kazoo: add time msg was received --- Modified: src/modules/kazoo/defs.h Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/cc7adf798c1f533e77dfab94563d799… Patch: https://github.com/kamailio/kamailio/commit/cc7adf798c1f533e77dfab94563d799… --- diff --git a/src/modules/kazoo/defs.h b/src/modules/kazoo/defs.h index 6059f53..91877c8 100644 --- a/src/modules/kazoo/defs.h +++ b/src/modules/kazoo/defs.h @@ -30,6 +30,14 @@ #define DBK_DEFS_H_ #define BLF_MAX_DIALOGS 8 + +#define BLF_JSON_AMQP_RECEIVED "AMQP-Received" +#define BLF_JSON_AMQP_CONSUMER "AMQP-Consumer" +#define BLF_JSON_AMQP_PUBLISHED "AMQP-Published" +#define BLF_JSON_AMQP_SENT "AMQP-Sent" +#define BLF_JSON_AMQP_PIPE_IN "AMQP-Pipe-In" +#define BLF_JSON_AMQP_PIPE_OUT "AMQP-Pipe-Out" + #define BLF_JSON_PRES "Presentity" #define BLF_JSON_PRES_USER "Presentity-User" #define BLF_JSON_PRES_REALM "Presentity-Realm" diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index d759490..6657443 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -2897,6 +2897,7 @@ void kz_amqp_send_worker_event(kz_amqp_server_ptr server_ptr, amqp_envelope_t* e } json_object_object_add(json_obj, BLF_JSON_BROKER_ZONE, json_object_new_string(server_ptr->zone->zone)); + json_object_object_add(json_obj, BLF_JSON_AMQP_RECEIVED, json_object_new_int(time(NULL))); JObj = kz_json_get_object(json_obj, BLF_JSON_SERVERID);

7 years, 8 months

git:master:c86b8820: kex: exported setdebug() and resetdebug() to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c86b882087b6fa9b45f70715c4178178a0086804 URL: https://github.com/kamailio/kamailio/commit/c86b882087b6fa9b45f70715c417817… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-14T17:50:14+02:00 kex: exported setdebug() and resetdebug() to kemi framework --- Modified: src/modules/kex/kex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c86b882087b6fa9b45f70715c417817… Patch: https://github.com/kamailio/kamailio/commit/c86b882087b6fa9b45f70715c417817… --- diff --git a/src/modules/kex/kex_mod.c b/src/modules/kex/kex_mod.c index 9af58c6..46bc97a 100644 --- a/src/modules/kex/kex_mod.c +++ b/src/modules/kex/kex_mod.c @@ -32,6 +32,7 @@ #include "../../core/flags.h" #include "../../core/dset.h" #include "../../core/mod_fix.h" +#include "../../core/kemi.h" #include "../../core/parser/parse_uri.h" #include "../../lib/srutils/sruid.h" @@ -233,3 +234,49 @@ static int pv_get_sruid_val(struct sip_msg *msg, pv_param_t *param, return pv_get_strval(msg, param, res, &_kex_sruid.uid); } +/** + * + */ +static int ki_kex_setdebug(sip_msg_t *msg, int lval) +{ + set_local_debug_level(lval); + return 1; +} + +/** + * + */ +static int ki_kex_resetdebug(sip_msg_t *msg) +{ + reset_local_debug_level(); + return 1; +} + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_kex_exports[] = { + { str_init("kex"), str_init("setdebug"), + SR_KEMIP_INT, ki_kex_setdebug, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kex"), str_init("resetdebug"), + SR_KEMIP_INT, ki_kex_resetdebug, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_kex_exports); + return 0; +} \ No newline at end of file

7 years, 8 months

How to cherry-pick from master to 4.4 since file paths have changed

by Lucian Balaceanu

Hi guys, I would like to port my latest master commit to the 4.4 branch. Since the path to the modules have changed I can no longer do a simple `git cherry-pick -x ...`. What is the accepted way to backport changes to 4.4? Maybe something using the `git cherry-pick --strategy ...` ? Thank you, Lucian

7 years, 8 months

git:master:f5c3d50d: jsonrpcs: exported jsonrpc_exec() to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f5c3d50d94ef92dfc82fdbbdf301ce5e79091c38 URL: https://github.com/kamailio/kamailio/commit/f5c3d50d94ef92dfc82fdbbdf301ce5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-14T09:07:39+02:00 jsonrpcs: exported jsonrpc_exec() to kemi framework - available as jsonrpcs.exec() --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f5c3d50d94ef92dfc82fdbbdf301ce5… Patch: https://github.com/kamailio/kamailio/commit/f5c3d50d94ef92dfc82fdbbdf301ce5… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index 34f5f64..7e05029 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -45,6 +45,7 @@ #include "../../core/sip_msg_clone.h" #include "../../core/data_lump.h" #include "../../core/data_lump_rpl.h" +#include "../../core/kemi.h" #include "../../modules/xhttp/api.h" #include "jsonrpcs_mod.h" @@ -1445,3 +1446,35 @@ static int jsonrpc_pv_parse_jrpl_name(pv_spec_t *sp, str *in) } return 0; } + +/** + * + */ +static int ki_jsonrpcs_exec(sip_msg_t *msg, str *scmd) +{ + return jsonrpc_exec_ex(scmd, NULL); +} + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_jsonrpcs_exports[] = { + { str_init("jsonrpcs"), str_init("exec"), + SR_KEMIP_INT, ki_jsonrpcs_exec, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_jsonrpcs_exports); + return 0; +}

7 years, 8 months

git:master:8ed58143: alias_db: exported alias_db_lookup(...) to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8ed581436a9e9aecadac620b9f6dbc8f773d5899 URL: https://github.com/kamailio/kamailio/commit/8ed581436a9e9aecadac620b9f6dbc8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-14T09:07:39+02:00 alias_db: exported alias_db_lookup(...) to kemi framework --- Modified: src/modules/alias_db/alias_db.c --- Diff: https://github.com/kamailio/kamailio/commit/8ed581436a9e9aecadac620b9f6dbc8… Patch: https://github.com/kamailio/kamailio/commit/8ed581436a9e9aecadac620b9f6dbc8… --- diff --git a/src/modules/alias_db/alias_db.c b/src/modules/alias_db/alias_db.c index ded91d8..5450f3c 100644 --- a/src/modules/alias_db/alias_db.c +++ b/src/modules/alias_db/alias_db.c @@ -1,6 +1,7 @@ /* * ALIAS_DB Module * + * Copyright (C) 2017 Daniel-Constantin Mierla (asipto.com) * Copyright (C) 2004 Voice Sistem SRL * * This file is part of a module for Kamailio, a free SIP server. @@ -34,6 +35,7 @@ #include "../../core/mem/mem.h" #include "../../core/ut.h" #include "../../core/mod_fix.h" +#include "../../core/kemi.h" #include "alookup.h" #include "api.h" @@ -338,3 +340,84 @@ int bind_alias_db(struct alias_db_binds *pxb) pxb->alias_db_find = alias_db_find; return 0; } + +/** + * + */ +static int ki_alias_db_lookup(sip_msg_t* msg, str* stable) +{ + str table_s; + unsigned long flags; + + flags = 0; + if(alias_db_use_domain) { + flags |= ALIAS_DOMAIN_FLAG; + } + + return alias_db_lookup_ex(msg, *stable, flags); +} + +/** + * + */ +static int ki_alias_db_lookup_ex(sip_msg_t* msg, str* stable, str* sflags) +{ + unsigned long flags; + int i; + + flags = 0; + if(alias_db_use_domain) { + flags |= ALIAS_DOMAIN_FLAG; + } + for(i=0; i<sflags->len; i++) { + switch (sflags->s[i]) + { + case 'd': + case 'D': + flags &= ~ALIAS_DOMAIN_FLAG; + break; + case 'r': + case 'R': + flags |= ALIAS_REVERSE_FLAG; + break; + case 'u': + case 'U': + flags |= ALIAS_DOMAIN_FLAG; + break; + default: + LM_ERR("unsupported flag '%c' - ignoring\n", sflags->s[i]); + break; + } + } + + return alias_db_lookup_ex(msg, *stable, flags); +} + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_alias_db_exports[] = { + { str_init("alias_db"), str_init("lookup"), + SR_KEMIP_INT, ki_alias_db_lookup, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("alias_db"), str_init("lookup_ex"), + SR_KEMIP_INT, ki_alias_db_lookup_ex, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_alias_db_exports); + return 0; +}

7 years, 8 months

[kamailio/kamailio] After having updated to 5.1 version of kamailio ICSCF doesn't send the UAR towards HSS (#1065)

by vhuertas

### Description Hello, I have just upgraded our IMS core to the very last version. However, when I try to register one user (Alice) the SIP REGISTER does not reach the SCSCF. After having captured packets flow I realized that it was fault of I-CSCF. I saw DWR/DWA messages between HSS and ICSCF so I assume that the Diameter connection is successfully estalbished. However, no UAR message is sent from I-CSCF to HSS.  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages Apr 1 19:45:30 ims systemd[1]: Starting LSB: Start the Kamailio ICSCF SIP proxy server... Apr 1 19:45:30 ims /usr/sbin/kamailio[5847]: CRITICAL: cdp [diameter_peer.c:423]: diameter_peer_destroy(): destroy_diameter_peer(): Bye Bye from C Diameter Peer test Apr 1 19:45:31 ims icscf[7406]: Starting Kamailio ICSCF SIP Server: icscf:loading modules under config path: /usr/lib64/kamailio/modules_k/:/usr/lib64/kamailio/modules/:/usr/lib/kam ailio/modules_k/:/usr/lib/kamailio/modules/ Apr 1 19:45:31 ims icscf[7406]: Listening on Apr 1 19:45:31 ims icscf[7406]: udp: 127.0.0.1:6060 Apr 1 19:45:31 ims icscf[7406]: tcp: 127.0.0.1:6060 Apr 1 19:45:31 ims icscf[7406]: Aliases: Apr 1 19:45:31 ims icscf[7406]: *: icscf.open-ims.test:* Apr 1 19:45:31 ims icscf[7406]: *: open-ims.test:* Apr 1 19:45:32 ims /usr/sbin/kamailio[7499]: WARNING: cdp [tcp_accept.c:121]: create_socket(): create_socket(): Trying to open/bind/listen on 127.0.0.1 port 4868 Apr 1 19:45:32 ims /usr/sbin/kamailio[7499]: WARNING: cdp [tcp_accept.c:146]: create_socket(): create_socket(): Successful socket open/bind/listen on 127.0.0.1 port 4868 Apr 1 19:45:32 ims icscf[7406]: . Apr 1 19:45:32 ims /usr/sbin/kamailio[7498]: ERROR: cdp [peerstatemachine.c:634]: I_Snd_CER(): I_Snd_CER(): Error on finding local host address > Socket operation on non-socket Apr 1 19:45:32 ims systemd[1]: Started LSB: Start the Kamailio ICSCF SIP proxy server. Apr 1 19:45:43 ims /usr/sbin/kamailio[5664]: ERROR: <script>: REGISTER (sip:alice@open-ims.test (192.168.0.102:60853) to sip:alice@open-ims.test, e3225651-1232-ee8b-a00b-04145146264 6) Apr 1 19:45:43 ims /usr/sbin/kamailio[7427]: ERROR: <core> [core/sr_module.c:1766]: get_int_fparam(): Unexpected param type: 1280329042 Apr 1 19:45:43 ims /usr/sbin/kamailio[7427]: ERROR: ims_icscf [registration.c:78]: I_perform_user_authorization_request(): no int value param passed Apr 1 19:45:47 ims /usr/sbin/kamailio[7430]: ERROR: <core> [core/sr_module.c:1766]: get_int_fparam(): Unexpected param type: 1280329042 Apr 1 19:45:47 ims /usr/sbin/kamailio[7430]: ERROR: ims_icscf [registration.c:78]: I_perform_user_authorization_request(): no int value param passed Apr 1 19:45:48 ims rtpengine[6441]: WARNING: Received invalid data on NG port (no cookie) from 127.0.0.1:33168: Apr 1 19:45:51 ims /usr/sbin/kamailio[7431]: ERROR: <core> [core/sr_module.c:1766]: get_int_fparam(): Unexpected param type: 1280329042 Apr 1 19:45:51 ims /usr/sbin/kamailio[7431]: ERROR: ims_icscf [registration.c:78]: I_perform_user_authorization_request(): no int value param passed  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.0-dev2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 4.7.2 ``` * **Operating System**:  ``` Debian 8 ``` -- 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/1065

7 years, 8 months

git:master:29aec680: kazoo: add consistent worker key

by lazedo

Module: kamailio Branch: master Commit: 29aec6800099a3b1d7a2b2c7e6d4b3865f0bc6e6 URL: https://github.com/kamailio/kamailio/commit/29aec6800099a3b1d7a2b2c7e6d4b38… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-04-14T05:47:52+01:00 kazoo: add consistent worker key --- Modified: src/modules/kazoo/kz_amqp.c Modified: src/modules/kazoo/kz_amqp.h --- Diff: https://github.com/kamailio/kamailio/commit/29aec6800099a3b1d7a2b2c7e6d4b38… Patch: https://github.com/kamailio/kamailio/commit/29aec6800099a3b1d7a2b2c7e6d4b38… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index f3a7c2c..d759490 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -384,6 +384,8 @@ void kz_amqp_free_bind(kz_amqp_bind_ptr bind) kz_amqp_bytes_free(bind->event_key); if(bind->event_subkey.bytes) kz_amqp_bytes_free(bind->event_subkey); + if(bind->consistent_worker_key) + shm_free(bind->consistent_worker_key); shm_free(bind); } @@ -1771,6 +1773,7 @@ int kz_amqp_subscribe(struct sip_msg* msg, char* payload) int no_ack = 1; int federate = 0; int consistent_worker = 0; + str* consistent_worker_key = NULL; int wait_for_consumer_ack = 1; kz_amqp_queue_ptr queue = NULL; kz_amqp_exchange_ptr exchange = NULL; @@ -1825,6 +1828,11 @@ int kz_amqp_subscribe(struct sip_msg* msg, char* payload) consistent_worker = json_object_get_int(tmpObj); } + tmpObj = kz_json_get_object(json_obj, "consistent-worker-key"); + if(tmpObj != NULL) { + consistent_worker_key = kz_str_dup_from_char((char*)json_object_get_string(tmpObj)); + } + tmpObj = kz_json_get_object(json_obj, "exchange-bindings"); if(tmpObj != NULL) { exchange_binding = kz_amqp_exchange_binding_from_json(tmpObj); @@ -1853,6 +1861,7 @@ int kz_amqp_subscribe(struct sip_msg* msg, char* payload) bind->wait_for_consumer_ack = wait_for_consumer_ack; bind->federate = federate; bind->consistent_worker = consistent_worker; + bind->consistent_worker_key = consistent_worker_key; kz_amqp_binding_ptr binding = shm_malloc(sizeof(kz_amqp_binding)); @@ -2866,6 +2875,8 @@ void kz_amqp_send_worker_event(kz_amqp_server_ptr server_ptr, amqp_envelope_t* e char buffer[100]; kz_amqp_cmd_ptr cmd = NULL; kz_amqp_consumer_delivery_ptr ptr = NULL; + json_obj_ptr json_obj = NULL; + json_object* JObj = NULL; str* message_id = NULL; int idx = envelope->channel-1; int worker = 0; @@ -2878,7 +2889,7 @@ void kz_amqp_send_worker_event(kz_amqp_server_ptr server_ptr, amqp_envelope_t* e } memset(json_data, 0, msg_size + 1); memcpy(json_data, (char*)envelope->message.body.bytes, msg_size); - json_obj_ptr json_obj = kz_json_parse(json_data); + json_obj = kz_json_parse(json_data); pkg_free(json_data); if (json_obj == NULL) { LM_ERR("error parsing json body\n"); @@ -2888,7 +2899,7 @@ void kz_amqp_send_worker_event(kz_amqp_server_ptr server_ptr, amqp_envelope_t* e json_object_object_add(json_obj, BLF_JSON_BROKER_ZONE, json_object_new_string(server_ptr->zone->zone)); - json_object* JObj = kz_json_get_object(json_obj, BLF_JSON_SERVERID); + 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); @@ -2932,8 +2943,14 @@ void kz_amqp_send_worker_event(kz_amqp_server_ptr server_ptr, amqp_envelope_t* e if(bind && bind->consistent_worker) { str rk; - rk.s = (char*)envelope->routing_key.bytes; - rk.len = (int)envelope->routing_key.len; + if(bind->consistent_worker_key != NULL && + (JObj = kz_json_get_object(json_obj, bind->consistent_worker_key->s)) != NULL) { + rk.s = (char*)json_object_get_string(JObj); + rk.len = strlen(rk.s); + } else { + rk.s = (char*)envelope->routing_key.bytes; + rk.len = (int)envelope->routing_key.len; + } worker = core_hash(&rk, NULL, dbk_consumer_workers); LM_DBG("computed worker for %.*s is %d\n", rk.len, rk.s, worker); } else { diff --git a/src/modules/kazoo/kz_amqp.h b/src/modules/kazoo/kz_amqp.h index c412156..b4a88ff 100644 --- a/src/modules/kazoo/kz_amqp.h +++ b/src/modules/kazoo/kz_amqp.h @@ -217,6 +217,7 @@ typedef struct { amqp_boolean_t wait_for_consumer_ack; amqp_boolean_t federate; amqp_boolean_t consistent_worker; + str* consistent_worker_key; } kz_amqp_bind, *kz_amqp_bind_ptr; typedef struct {

7 years, 8 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2017