sr-dev August 2017

sr-dev@lists.kamailio.org

24 participants
306 discussions

[kamailio/kamailio] drouting: pull out unavailable destinations for sort_order 1 and 2 (#1212)
by Guillaume Bour 14 Aug '17

14 Aug '17

#### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description When destinations monitoring is enabled with option 'enable_keepalive' set to 1, unavailable destinations will be ignored when calling do_routing() function It was already implemented for sort_order 0 in a previous commit. This one adds the support for sor_order 1 & 2 also You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1212 -- Commit Summary -- * drouting: pull out unavailable destinations for sort_order 1 and 2 -- File Changes -- M src/modules/drouting/doc/drouting_admin.xml (9) M src/modules/drouting/drouting.c (62) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1212.patch https://github.com/kamailio/kamailio/pull/1212.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/1212

2 2

git:master:00b2d6a1: Merge pull request #1214 from sergey-safarov/spec_update10
by GitHub 14 Aug '17

14 Aug '17

Module: kamailio Branch: master Commit: 00b2d6a170848e9e354252f9f1c3d049619efcd6 URL: https://github.com/kamailio/kamailio/commit/00b2d6a170848e9e354252f9f1c3d04… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-08-14T08:43:35+02:00 Merge pull request #1214 from sergey-safarov/spec_update10 pkg/kamailio/centos/7: Update CentOS spec file --- Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/00b2d6a170848e9e354252f9f1c3d04… Patch: https://github.com/kamailio/kamailio/commit/00b2d6a170848e9e354252f9f1c3d04… --- diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index d6410c7e99..2d0099b901 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -1,6 +1,6 @@ %define name kamailio %define ver 5.1.0 -%define rel dev1%{dist} +%define rel dev6%{dist} %bcond_with dnssec @@ -191,7 +191,6 @@ This module implements protocol functions that use the libcurl to communicate wi %package http_client Summary: HTTP client module for Kamailio. Group: System Environment/Daemons -Requires: libcrypto %description http_client This module implements protocol functions that use the libcurl to communicate with HTTP servers. @@ -668,6 +667,7 @@ fi %dir %{_docdir}/kamailio/modules %doc %{_docdir}/kamailio/modules/README.acc +%doc %{_docdir}/kamailio/modules/README.acc_diameter %doc %{_docdir}/kamailio/modules/README.alias_db %doc %{_docdir}/kamailio/modules/README.app_jsdt %doc %{_docdir}/kamailio/modules/README.async @@ -810,6 +810,7 @@ fi %dir %{_libdir}/kamailio/modules %{_libdir}/kamailio/modules/acc.so +%{_libdir}/kamailio/modules/acc_diameter.so %{_libdir}/kamailio/modules/alias_db.so %{_libdir}/kamailio/modules/app_jsdt.so %{_libdir}/kamailio/modules/async.so

1 0

git:master:363cc61d: pkg/kamailio/centos/7: Update CentOS spec file
by Sergey Safarov 14 Aug '17

14 Aug '17

Module: kamailio Branch: master Commit: 363cc61d63fac8e4a9bcf4f7994de30f6a30b73d URL: https://github.com/kamailio/kamailio/commit/363cc61d63fac8e4a9bcf4f7994de30… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2017-08-13T12:05:34-04:00 pkg/kamailio/centos/7: Update CentOS spec file --- Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/363cc61d63fac8e4a9bcf4f7994de30… Patch: https://github.com/kamailio/kamailio/commit/363cc61d63fac8e4a9bcf4f7994de30… --- diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index d6410c7e99..2d0099b901 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -1,6 +1,6 @@ %define name kamailio %define ver 5.1.0 -%define rel dev1%{dist} +%define rel dev6%{dist} %bcond_with dnssec @@ -191,7 +191,6 @@ This module implements protocol functions that use the libcurl to communicate wi %package http_client Summary: HTTP client module for Kamailio. Group: System Environment/Daemons -Requires: libcrypto %description http_client This module implements protocol functions that use the libcurl to communicate with HTTP servers. @@ -668,6 +667,7 @@ fi %dir %{_docdir}/kamailio/modules %doc %{_docdir}/kamailio/modules/README.acc +%doc %{_docdir}/kamailio/modules/README.acc_diameter %doc %{_docdir}/kamailio/modules/README.alias_db %doc %{_docdir}/kamailio/modules/README.app_jsdt %doc %{_docdir}/kamailio/modules/README.async @@ -810,6 +810,7 @@ fi %dir %{_libdir}/kamailio/modules %{_libdir}/kamailio/modules/acc.so +%{_libdir}/kamailio/modules/acc_diameter.so %{_libdir}/kamailio/modules/alias_db.so %{_libdir}/kamailio/modules/app_jsdt.so %{_libdir}/kamailio/modules/async.so

1 0

[kamailio/kamailio] pkg/kamailio/centos/7: Update CentOS spec file (#1214)
by sergey-safarov 14 Aug '17

14 Aug '17

update version suffix added unpackaged `acc_diameter` files removed dependency to not existed package `libcrypto ` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1214 -- Commit Summary -- * pkg/kamailio/centos/7: Update CentOS spec file -- File Changes -- M pkg/kamailio/centos/7/kamailio.spec (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1214.patch https://github.com/kamailio/kamailio/pull/1214.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/1214

2 2

[kamailio/kamailio] `advertise` keyword not take effect when `listen` is bounded NIC name (#1209)
by sergey-safarov 13 Aug '17

13 Aug '17

Tested on e5b8066e1e0f4a69a5d1161dd75aea67014314b5 commit -- 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/1209

2 10

git:master:97d8ebc9: sipcapture: safety checks for values inside w_float2int()
by Daniel-Constantin Mierla 13 Aug '17

13 Aug '17

Module: kamailio Branch: master Commit: 97d8ebc966aba71efb3a964e71b00736db51401b URL: https://github.com/kamailio/kamailio/commit/97d8ebc966aba71efb3a964e71b0073… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-13T11:07:42+02:00 sipcapture: safety checks for values inside w_float2int() --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/97d8ebc966aba71efb3a964e71b0073… Patch: https://github.com/kamailio/kamailio/commit/97d8ebc966aba71efb3a964e71b0073… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 8fb9deb16b..fdd736e7f9 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -1039,6 +1039,9 @@ static int w_float2int(struct sip_msg* _m, char* _val, char* _coof, char* s2) return -1; } + if(value.s==NULL || coof.s==NULL) + return -1; + ret = (int) (atof (value.s) * atoi(coof.s)); return ret ? ret : -1;

1 0

git:master:3d2359b5: rls: replace sprintf with safer snprintf
by Daniel-Constantin Mierla 12 Aug '17

12 Aug '17

Module: kamailio Branch: master Commit: 3d2359b5a349efe4d6571ec0953e5c4aae54a165 URL: https://github.com/kamailio/kamailio/commit/3d2359b5a349efe4d6571ec0953e5c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-12T08:59:06+02:00 rls: replace sprintf with safer snprintf - compact printing headers in 200ok function by doing it once in a snprintf, instead of combination of many sprintf and strncpy --- Modified: src/modules/rls/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/3d2359b5a349efe4d6571ec0953e5c4… Patch: https://github.com/kamailio/kamailio/commit/3d2359b5a349efe4d6571ec0953e5c4… --- diff --git a/src/modules/rls/subscribe.c b/src/modules/rls/subscribe.c index b08e55e6f2..dc76e4fdba 100644 --- a/src/modules/rls/subscribe.c +++ b/src/modules/rls/subscribe.c @@ -339,35 +339,24 @@ int reply_200(struct sip_msg* msg, str* contact, int expires) str hdr_append; int len; - hdr_append.s = (char *)pkg_malloc( sizeof(char)*(contact->len+ 70)); + hdr_append.s = (char *)pkg_malloc( sizeof(char)*(contact->len+70)); if(hdr_append.s == NULL) { LM_ERR("no more pkg memory\n"); return -1; } - hdr_append.len = sprintf(hdr_append.s, "Expires: %d\r\n", expires); - if(hdr_append.len< 0) + hdr_append.len = snprintf(hdr_append.s, contact->len+70, + "Expires: %d" CRLF + "Contact: <%.*s>" CRLF + "Require: eventlist" CRLF, + expires, + contact->len, contact->s + ); + if(hdr_append.len<0 || hdr_append.len>=contact->len+70) { - LM_ERR("unsuccessful sprintf\n"); + LM_ERR("unsuccessful snprintf\n"); goto error; } - strncpy(hdr_append.s+hdr_append.len ,"Contact: <", 10); - hdr_append.len += 10; - strncpy(hdr_append.s+hdr_append.len, contact->s, contact->len); - hdr_append.len+= contact->len; - strncpy(hdr_append.s+hdr_append.len, ">", 1); - hdr_append.len += 1; - strncpy(hdr_append.s+hdr_append.len, CRLF, CRLF_LEN); - hdr_append.len += CRLF_LEN; - - len = sprintf(hdr_append.s+ hdr_append.len, "Require: eventlist\r\n"); - if(len < 0) - { - LM_ERR("unsuccessful sprintf\n"); - goto error; - } - hdr_append.len+= len; - hdr_append.s[hdr_append.len]= '\0'; if (add_lump_rpl( msg, hdr_append.s, hdr_append.len, LUMP_RPL_HDR)==0 ) {

1 0

git:master:bb536c3d: rls: proper handling of return code for parse from/to uri
by Daniel-Constantin Mierla 12 Aug '17

12 Aug '17

Module: kamailio Branch: master Commit: bb536c3dae01865c42e556989e8aca5be85b20fe URL: https://github.com/kamailio/kamailio/commit/bb536c3dae01865c42e556989e8aca5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-12T08:48:21+02:00 rls: proper handling of return code for parse from/to uri --- Modified: src/modules/rls/rls.c Modified: src/modules/rls/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/bb536c3dae01865c42e556989e8aca5… Patch: https://github.com/kamailio/kamailio/commit/bb536c3dae01865c42e556989e8aca5… --- diff --git a/src/modules/rls/rls.c b/src/modules/rls/rls.c index 86f9bf3c9f..d16d3a24a4 100644 --- a/src/modules/rls/rls.c +++ b/src/modules/rls/rls.c @@ -1023,8 +1023,7 @@ int rls_restore_db_subs(void) return 0; error: - if(res) - rls_dbf.free_result(rls_db, res); + rls_dbf.free_result(rls_db, res); return -1; } diff --git a/src/modules/rls/subscribe.c b/src/modules/rls/subscribe.c index 6ce59d58e3..b08e55e6f2 100644 --- a/src/modules/rls/subscribe.c +++ b/src/modules/rls/subscribe.c @@ -440,7 +440,7 @@ int rls_handle_subscribe0(struct sip_msg* msg) { struct to_body *pfrom; - if (parse_from_uri(msg) < 0) + if (parse_from_uri(msg) == NULL) { LM_ERR("failed to find From header\n"); if (slb.freply(msg, 400, &pu_400_rpl) < 0) @@ -507,7 +507,7 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma return 0; } /* check for To and From headesr */ - if(parse_to_uri(msg)<0 || parse_from_uri(msg)<0) + if(parse_to_uri(msg)==NULL || parse_from_uri(msg)==NULL) { LM_ERR("failed to find To or From headers\n"); if (slb.freply(msg, 400, &pu_400_rpl) < 0)

1 0

git:master:5be6d11e: topos_redis: removed unused variables
by Daniel-Constantin Mierla 12 Aug '17

12 Aug '17

Module: kamailio Branch: master Commit: 5be6d11ecd99670cf85cece3a534e10f3f015c52 URL: https://github.com/kamailio/kamailio/commit/5be6d11ecd99670cf85cece3a534e10… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-12T08:27:15+02:00 topos_redis: removed unused variables --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/5be6d11ecd99670cf85cece3a534e10… Patch: https://github.com/kamailio/kamailio/commit/5be6d11ecd99670cf85cece3a534e10… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 7753cd89c8..51c839487d 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -825,10 +825,8 @@ int tps_redis_update_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, str rcmd = str_init("HMSET"); str rkey = STR_NULL; char *rp; - str rval = STR_NULL; redisc_server_t *rsrv = NULL; redisReply *rrpl = NULL; - int32_t liflags; if(sd->a_uuid.len<=0 && sd->b_uuid.len<=0) { LM_INFO("no uuid for this message\n");

1 0

git:master:92daa0bb: evapi: removed unused variable
by Daniel-Constantin Mierla 12 Aug '17

12 Aug '17

Module: kamailio Branch: master Commit: 92daa0bb98e9d7c997e9f6ca4994d48134e07acc URL: https://github.com/kamailio/kamailio/commit/92daa0bb98e9d7c997e9f6ca4994d48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-12T08:26:55+02:00 evapi: removed unused variable --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/92daa0bb98e9d7c997e9f6ca4994d48… Patch: https://github.com/kamailio/kamailio/commit/92daa0bb98e9d7c997e9f6ca4994d48… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index 04eab30e50..2aaaf1e6c9 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -138,8 +138,6 @@ int evapi_run_cfg_route(evapi_env_t *evenv, int rt, str *rtname) sip_msg_t *fmsg; sip_msg_t tmsg; sr_kemi_eng_t *keng = NULL; - str evname; - if(evenv==0 || evenv->eset==0) { LM_ERR("evapi env not set\n");

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
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 August 2017