sr-dev April 2017

sr-dev@lists.kamailio.org

31 participants
426 discussions

Jenkins build is back to normal : kamailiodev-nightly-binaries » i386,wheezy,slave #762
by jenkins＠kamailio.sipwise.com 06 Apr '17

06 Apr '17

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 0

git:master:36b6d4d2: kazoo : add broker zone to received payload
by lazedo 05 Apr '17

05 Apr '17

Module: kamailio Branch: master Commit: 36b6d4d211d86a0f4047a79cf3b122ad974a5da9 URL: https://github.com/kamailio/kamailio/commit/36b6d4d211d86a0f4047a79cf3b122a… Author: Luis Azedo <luis(a)2600hz.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-04-05T23:34:21+01:00 kazoo : add broker zone to received payload --- Modified: src/modules/kazoo/defs.h Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]36b6d4d211d86a0f4047a79cf3b122a… Patch: https://github.com/kamailio/kamailio/commit/36b6d4d211d86a0f4047a79cf3b122a… --- diff --git a/src/modules/kazoo/defs.h b/src/modules/kazoo/defs.h index ab23fba..ca355f5 100644 --- a/src/modules/kazoo/defs.h +++ b/src/modules/kazoo/defs.h @@ -57,6 +57,7 @@ #define BLF_JSON_TYPE "Type" #define BLF_JSON_MSG_ID "Msg-ID" #define BLF_JSON_DIRECTION "Direction" +#define BLF_JSON_BROKER_ZONE "AMQP-Broker-Zone" #define BLF_JSON_CONTACT "Contact" #define BLF_JSON_EVENT_PKG "Event-Package" diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 05e8407..8bbbcd8 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -2571,7 +2571,7 @@ void kz_send_targeted_cmd(int server_id, amqp_bytes_t body) } -void kz_amqp_send_worker_event(int _kz_server_id, amqp_envelope_t* envelope, kz_amqp_bind_ptr bind) +void kz_amqp_send_worker_event(kz_amqp_server_ptr server_ptr, amqp_envelope_t* envelope, kz_amqp_bind_ptr bind) { char buffer[100]; kz_amqp_cmd_ptr cmd = NULL; @@ -2579,6 +2579,7 @@ void kz_amqp_send_worker_event(int _kz_server_id, amqp_envelope_t* envelope, kz_ str* message_id = NULL; int idx = envelope->channel-1; int worker = 0; + int _kz_server_id = server_ptr->id; json_obj_ptr json_obj = kz_json_parse((char*)envelope->message.body.bytes); if (json_obj == NULL) { @@ -2594,6 +2595,8 @@ void kz_amqp_send_worker_event(int _kz_server_id, amqp_envelope_t* envelope, kz_ json_object_object_add(json_obj, BLF_JSON_SERVERID, json_object_new_string(buffer)); } + json_object_object_add(json_obj, BLF_JSON_BROKER_ZONE, json_object_new_string(server_ptr->zone->zone)); + JObj = kz_json_get_object(json_obj, BLF_JSON_MSG_ID); if(JObj != NULL) { message_id = kz_str_dup_from_char((char*)json_object_get_string(JObj)); @@ -2762,7 +2765,7 @@ int kz_amqp_consumer_proc(kz_amqp_server_ptr server_ptr) case AMQP_RESPONSE_NORMAL: idx = envelope.channel-1; if(idx < channel_base) { - kz_amqp_send_worker_event(server_ptr->id, &envelope, NULL); + kz_amqp_send_worker_event(server_ptr, &envelope, NULL); } else { idx = idx - channel_base; if(!consumer_channels[idx].consumer->no_ack ) { @@ -2772,7 +2775,7 @@ int kz_amqp_consumer_proc(kz_amqp_server_ptr server_ptr) } } if(OK) - kz_amqp_send_worker_event(server_ptr->id, &envelope, consumer_channels[idx].consumer); + kz_amqp_send_worker_event(server_ptr, &envelope, consumer_channels[idx].consumer); } break; case AMQP_RESPONSE_SERVER_EXCEPTION: [View Less]

1 0

[kamailio/kamailio] kazoo : add broker zone to received payload (#1060)
by lazedo 05 Apr '17

05 Apr '17

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1060 -- Commit Summary -- * kazoo : add broker zone to received payload -- File Changes -- M src/modules/kazoo/defs.h (1) M src/modules/kazoo/kz_amqp.c (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1060.patch https://github.com/kamailio/kamailio/pull/1060.diff -- You are receiving this because you are subscribed to this thread. Reply to this email … [View More]

1 1

Kamailio v5.0.1 Released
by Daniel-Constantin Mierla 05 Apr '17

05 Apr '17

Hello, Kamailio SIP Server v5.0.1 stable release is out! This is a maintenance release of the latest stable branch, 5.0, that includes fixes since the release of v5.0.0. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.0.x. Deployments running previous 5.x.x versions are strongly recommended to be upgraded to v5.0.1. For more details about version 5.0.1 (including links and guidelines to download the tarball or from … [View More]

1 0

git:master:cf3b1aea: pkg/rpm: specify the pid file for killproc
by Daniel-Constantin Mierla 05 Apr '17

05 Apr '17

Module: kamailio Branch: master Commit: cf3b1aeacfc9d5bd086929a6fae20f379ebb2612 URL: https://github.com/kamailio/kamailio/commit/cf3b1aeacfc9d5bd086929a6fae20f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-05T16:02:54+02:00 pkg/rpm: specify the pid file for killproc --- Modified: pkg/kamailio/centos/7/kamailio.init --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:5.0:cbff0e8a: ChangeLog: content updated for v5.0.1
by Daniel-Constantin Mierla 05 Apr '17

05 Apr '17

Module: kamailio Branch: 5.0 Commit: cbff0e8ab509eeb434b140b363ccacda354358cf URL: https://github.com/kamailio/kamailio/commit/cbff0e8ab509eeb434b140b363ccacd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-05T15:30:18+02:00 ChangeLog: content updated for v5.0.1 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/cbff0e8ab509eeb434b140b363ccacd… Patch: https://github.com/kamailio/kamailio/commit/cbff0e8ab509eeb434b140b363ccacd…

1 0

git:5.0:d8db52b7: Makefile.defs: version set to 5.0.1
by Daniel-Constantin Mierla 05 Apr '17

05 Apr '17

Module: kamailio Branch: 5.0 Commit: d8db52b76bd05b74e6cb4724883854183868eb5d URL: https://github.com/kamailio/kamailio/commit/d8db52b76bd05b74e6cb47248838541… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-05T15:23:42+02:00 Makefile.defs: version set to 5.0.1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/d8db52b76bd05b74e6cb47248838541… Patch: https://… [View More]

1 0

[kamailio/kamailio] sipcapture: destination_ip is truncated when its length is 15 (xxx.xxx.xxx.xxx) (#1058)
by Mariano Martin 05 Apr '17

05 Apr '17

For example when ip is "200.108.217.174", destination_ip is stored in sip_capture_call_20170405 as "0.108.217.174" (testing module sipcapture in kamailio 4.4.0) here it is: "full sql code sended to mysql in storing", (Captured with tcpdump at port 3306) insert into `sip_capture_rest_20170405` (`date`,`micro_ts`,`method`,`reply_reason`,`ruri`,`ruri_user`,`from_user`,`from_tag`,`to_user`,`to_tag`,`pid_user`,`contact_user`,`auth_user`,`callid`,`callid_aleg`,`via_1`,`via_1_branch`,`cseq`,`reason`,… [View More]`content_type`,`auth`,`user_agent`,`source_ip`,`source_port`,`destination_ip`,`destination_port`,`contact_ip`,`contact_port`,`originator_ip`,`originator_port`,`proto`,`family`,`rtp_stat`,`type`,`node`,`correlation_id`,`from_domain`,`to_domain`,`ruri_domain`,`msg` ) values ('2017-04-05 12:17:27',1491394647138116,'NOTIFY','','sip:vhcau2pu@200.108.217.174:49507;transport=ws','vhcau2pu','1002','Hg4cF3a42j4rQ','1002','','','mod_sofia','','ac8031c3-949c-1235-2d9c-0655eb53760b','','SIP/2.0/WSS 169.57.161.254;branch=z9hG4bK9b9b.7c3c72afaf2a4d99a510a2c40fbe419a.0','z9hG4bK9b9b.7c3c72afaf2a4d99a510a2c40fbe419a.0','105361259 NOTIFY','','application/simple-message-summary','','2600hz','169.57.161.254',5060,**'0.108.217.174'**,'49507,'169.57.161.252',11000,'',0,3,2,'',1,'homer01:1','ac8031c3-949c-1235-2d9c-0655eb53760b','ZeroUY.sp.xentric.co','ZeroUY.sp.xentric.co','200.108.217.174','NOTIFY sip:vhcau2pu@200.108.217.174:49507;transport=ws SIP/2.0\r\nVia: SIP/2.0/WSS 169.57.161.254;branch=z9hG4bK9b9b.7c3c72afaf2a4d99a510a2c40fbe419a.0\r\nVia: SIP/2.0/UDP 169.57.161.252:11000;received=169.57.161.252;rport=11000;branch=z9hG4bKXmF1Fv8y0D91B\r\nMax-Forwards: 50\r\nFrom: <sip:1002@ZeroUY.sp.xentric.co>;tag=Hg4cF3a42j4rQ\r\nTo: <sip:1002@ZeroUY.sp.xentric.co>\r\nCall-ID: ac8031c3-949c-1235-2d9c-0655eb53760b\r\nCSeq: 105361259 NOTIFY\r\nContact: <sip:mod_sofia@169.57.161.252:11000>\r\nUser-Agent: 2600hz\r\nAllow: INVITE, ACK, BYE, CANCEL, OPTIONS, MESSAGE, INFO, UPDATE, REGISTER, REFER, NOTIFY, PUBLISH, SUBSCRIBE\r\nSupported: path, replaces\r\nEvent: message-summary\r\nAllow-Events: talk, hold, conference, presence, as-feature-event, dialog, line-seize, call-info, sla, include-session-description, presence.winfo, message-summary, refer\r\nSubscription-State: terminated;reason=noresource\r\nContent-Type: application/simple-message-summary\r\nContent-Length: 98\r\n\r\nMessages-Waiting: no\r\nMessage-Account: sip:1002@ZeroUY.sp.xentric.co\r\nVoice-Message: 0/1 (0/0)\r\n\r\n') -- 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/1058 [View Less]

2 2

git:master:7b691e97: dispatcher: ds select and next functions exported to kemi
by Daniel-Constantin Mierla 05 Apr '17

05 Apr '17

Module: kamailio Branch: master Commit: 7b691e9712fc4b4333698c4538c8209c32eba901 URL: https://github.com/kamailio/kamailio/commit/7b691e9712fc4b4333698c4538c8209… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-05T13:37:24+02:00 dispatcher: ds select and next functions exported to kemi --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]7b691e9712fc4b4333698c4538c8209… Patch: https://github.com/kamailio/kamailio/commit/7b691e9712fc4b4333698c4538c8209… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index d0399e0..545d49b 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -51,6 +51,7 @@ #include "../../core/mod_fix.h" #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" +#include "../../core/kemi.h" #include "ds_ht.h" #include "dispatch.h" @@ -1004,6 +1005,137 @@ void ds_ping_reply_codes_update(str *gname, str *name) ds_parse_reply_codes(); } +/* KEMI wrappers */ +/** + * + */ +static int ki_ds_select(sip_msg_t *msg, int set, int alg) +{ + return ds_select_dst_limit(msg, set, alg, 0xffff /* limit number of dst*/, + 2 /*set no dst/uri*/); +} + +/** + * + */ +static int ki_ds_select_limit(sip_msg_t *msg, int set, int alg, int limit) +{ + return ds_select_dst_limit(msg, set, alg, limit /* limit number of dst*/, + 2 /*set no dst/uri*/); +} + +/** + * + */ +static int ki_ds_select_dst(sip_msg_t *msg, int set, int alg) +{ + return ds_select_dst_limit(msg, set, alg, 0xffff /* limit number of dst*/, + 0 /*set dst uri*/); +} + +/** + * + */ +static int ki_ds_select_dst_limit(sip_msg_t *msg, int set, int alg, int limit) +{ + return ds_select_dst_limit(msg, set, alg, limit /* limit number of dst*/, + 0 /*set dst uri*/); +} + +/** + * + */ +static int ki_ds_select_domain(sip_msg_t *msg, int set, int alg) +{ + return ds_select_dst_limit(msg, set, alg, 0xffff /* limit number of dst*/, + 1 /*set host port*/); +} + +/** + * + */ +static int ki_ds_select_domain_limit(sip_msg_t *msg, int set, int alg, int limit) +{ + return ds_select_dst_limit(msg, set, alg, limit /* limit number of dst*/, + 1 /*set host port*/); +} + +/** + * + */ +static int ki_ds_next_dst(sip_msg_t *msg) +{ + return ds_next_dst(msg, 0 /*set dst uri*/); +} + +/** + * + */ +static int ki_ds_next_domain(sip_msg_t *msg) +{ + return ds_next_dst(msg, 1 /*set host port*/); +} + + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_dispatcher_exports[] = { + { str_init("dispatcher"), str_init("ds_select"), + SR_KEMIP_INT, ki_ds_select, + { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("dispatcher"), str_init("ds_select_limit"), + SR_KEMIP_INT, ki_ds_select_limit, + { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_INT, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("dispatcher"), str_init("ds_select_domain"), + SR_KEMIP_INT, ki_ds_select_domain, + { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("dispatcher"), str_init("ds_select_domain_limit"), + SR_KEMIP_INT, ki_ds_select_domain_limit, + { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_INT, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("dispatcher"), str_init("ds_next_domain"), + SR_KEMIP_INT, ki_ds_next_domain, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("dispatcher"), str_init("ds_select_dst"), + SR_KEMIP_INT, ki_ds_select_dst, + { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("dispatcher"), str_init("ds_select_dst_limit"), + SR_KEMIP_INT, ki_ds_select_dst_limit, + { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_INT, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("dispatcher"), str_init("ds_next_dst"), + SR_KEMIP_INT, ki_ds_next_dst, + { SR_KEMIP_NONE, 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_dispatcher_exports); + return 0; +} + /*** RPC implementation ***/ static const char *dispatcher_rpc_reload_doc[2] = { [View Less]

1 0

git:5.0:b971ff4d: pkg/rpm: version set to 5.0.1 in spec files
by Daniel-Constantin Mierla 05 Apr '17

05 Apr '17

Module: kamailio Branch: 5.0 Commit: b971ff4d5efd7debe43c6433056060c2b2f7824b URL: https://github.com/kamailio/kamailio/commit/b971ff4d5efd7debe43c6433056060c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-05T13:05:39+02:00 pkg/rpm: version set to 5.0.1 in spec files --- Modified: pkg/kamailio/centos/6/kamailio.spec Modified: pkg/kamailio/centos/7/kamailio.spec Modified: pkg/kamailio/fedora/17/… [View More]kamailio.spec Modified: pkg/kamailio/oracle/el6/kamailio.spec Modified: pkg/kamailio/oracle/el7/kamailio.spec Modified: pkg/kamailio/rpm/kamailio.spec-4.1 Modified: pkg/kamailio/rpm/kamailio.spec.CenOS Modified: pkg/kamailio/rpm/kamailio.spec.SuSE --- Diff: https://github.com/kamailio/kamailio/commit/b971ff4d5efd7debe43c6433056060c… Patch: https://github.com/kamailio/kamailio/commit/b971ff4d5efd7debe43c6433056060c… --- diff --git a/pkg/kamailio/centos/6/kamailio.spec b/pkg/kamailio/centos/6/kamailio.spec index 439bf22..57839d2 100644 --- a/pkg/kamailio/centos/6/kamailio.spec +++ b/pkg/kamailio/centos/6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.0 +%define ver 5.0.1 %define rel dev0.0%{dist} diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index bb5c414..db3d6b6 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.0 +%define ver 5.0.1 %define rel dev0.0%{dist} %bcond_with dnssec %bcond_with kazoo diff --git a/pkg/kamailio/fedora/17/kamailio.spec b/pkg/kamailio/fedora/17/kamailio.spec index c33952c..7b6f46f 100644 --- a/pkg/kamailio/fedora/17/kamailio.spec +++ b/pkg/kamailio/fedora/17/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.0 +%define ver 5.0.1 %define rel dev7.2%{dist} diff --git a/pkg/kamailio/oracle/el6/kamailio.spec b/pkg/kamailio/oracle/el6/kamailio.spec index e5a48dd..78cbcd1 100644 --- a/pkg/kamailio/oracle/el6/kamailio.spec +++ b/pkg/kamailio/oracle/el6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.0 +%define ver 5.0.1 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/oracle/el7/kamailio.spec b/pkg/kamailio/oracle/el7/kamailio.spec index d027c46..025e039 100644 --- a/pkg/kamailio/oracle/el7/kamailio.spec +++ b/pkg/kamailio/oracle/el7/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.0 +%define ver 5.0.1 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec-4.1 b/pkg/kamailio/rpm/kamailio.spec-4.1 index 2ef5631..f074108 100644 --- a/pkg/kamailio/rpm/kamailio.spec-4.1 +++ b/pkg/kamailio/rpm/kamailio.spec-4.1 @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.0 +%define ver 5.0.1 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c avp_radius auth_radius group_radius uri_radius pa postgres osp tlsops unixodbc diff --git a/pkg/kamailio/rpm/kamailio.spec.CenOS b/pkg/kamailio/rpm/kamailio.spec.CenOS index e0ba2d2..31176b4 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.0 +%define ver 5.0.1 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec.SuSE b/pkg/kamailio/rpm/kamailio.spec.SuSE index 31ec997..5dc393c 100644 --- a/pkg/kamailio/rpm/kamailio.spec.SuSE +++ b/pkg/kamailio/rpm/kamailio.spec.SuSE @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.0.0 +%define ver 5.0.1 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c auth_radius misc_radius peering postgress pa unixodbc osp tlsops [View Less]

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2017