sr-dev September 2015

sr-dev@lists.kamailio.org

37 participants
388 discussions

git:master:00e8c10a: modules/cdp: fix lifetime and session timeout logic
by jaybeepee 11 Sep '15

11 Sep '15

Module: kamailio Branch: master Commit: 00e8c10a5f96b7e8fbf8193885d1dc8450df3e45 URL: https://github.com/kamailio/kamailio/commit/00e8c10a5f96b7e8fbf8193885d1dc8… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-09-11T12:11:58+02:00 modules/cdp: fix lifetime and session timeout logic --- Modified: modules/cdp/authstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/00e8c10a5f96b7e8fbf8193885d1dc8… Patch: https://github.com/kamailio/kamailio/commit/00e8c10a5f96b7e8fbf8193885d1dc8…

1 0

git:master:1093fc3b: modules/cdp: changed load balancing timer from second resolution to millisecond resolution
by jaybeepee 11 Sep '15

11 Sep '15

Module: kamailio Branch: master Commit: 1093fc3b84e42197701dc50198902ff18b6f9a2e URL: https://github.com/kamailio/kamailio/commit/1093fc3b84e42197701dc50198902ff… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-09-11T12:10:56+02:00 modules/cdp: changed load balancing timer from second resolution to millisecond resolution --- Modified: modules/cdp/routing.c Modified: modules/cdp/session.c --- Diff: https://github.com/kamailio/kamailio/commit/1093fc3b84e42197701dc50198902ff… Patch: https://github.com/kamailio/kamailio/commit/1093fc3b84e42197701dc50198902ff… --- diff --git a/modules/cdp/routing.c b/modules/cdp/routing.c index 81db889..5bd494d 100644 --- a/modules/cdp/routing.c +++ b/modules/cdp/routing.c @@ -47,6 +47,7 @@ #include "config.h" #include "peermanager.h" #include "diameter_api.h" +#include "math.h" #define LB_MAX_PEERS 20 /**< maximum peers that can be loadbalanced accross i.e. same metric */ @@ -82,6 +83,7 @@ peer* get_first_connected_route(cdp_session_t* cdp_session, routing_entry *r, in peer *p; int j; time_t least_recent_time; + struct timespec time_spec; if (cdp_session) { /*try and find an already used peer for this session - sticky*/ @@ -125,13 +127,20 @@ peer* get_first_connected_route(cdp_session_t* cdp_session, routing_entry *r, in } least_recent_time = peers[0]->last_selected; + LM_DBG("peer [%.*s] was last used @ %ld\n", peers[0]->fqdn.len, peers[0]->fqdn.s, peers[0]->last_selected); p = peers[0]; for (j = 1; j < peer_count; j++) { + LM_DBG("Peer [%.*s] was last used at [%ld]\n", peers[j]->fqdn.len, peers[j]->fqdn.s, peers[j]->last_selected); if (peers[j]->last_selected < least_recent_time) { least_recent_time = peers[j]->last_selected; p = peers[j]; } } + + clock_gettime(CLOCK_REALTIME, &time_spec); + + p->last_selected = (time_spec.tv_sec*1000000) + round(time_spec.tv_nsec / 1.0e3); // Convert nanoseconds to microseconds + LM_DBG("chosen peer [%.*s]\n", p->fqdn.len, p->fqdn.s); if (cdp_session) { if (cdp_session->sticky_peer_fqdn_buflen <= p->fqdn.len) { @@ -150,7 +159,7 @@ peer* get_first_connected_route(cdp_session_t* cdp_session, routing_entry *r, in cdp_session->sticky_peer_fqdn.len = p->fqdn.len; memcpy(cdp_session->sticky_peer_fqdn.s, p->fqdn.s, p->fqdn.len); } - p->last_selected = time(NULL); + return p; } diff --git a/modules/cdp/session.c b/modules/cdp/session.c index c048a05..716048f 100644 --- a/modules/cdp/session.c +++ b/modules/cdp/session.c @@ -587,6 +587,7 @@ AAASession* cdp_new_auth_session(str id,int is_client,int is_statefull) s->u.auth.lifetime=0; s->u.auth.grace_period=0; s->u.auth.class = AUTH_CLASS_UNKNOWN; + s->u.auth.last_requested_grace = s->u.auth.last_requested_lifetime = s->u.auth.last_requested_timeout = 0; cdp_add_session(s); } return s;

1 0

git:master:f9aa4a21: modules/cdp: changed load balancing timer from second resolution to millisecond resolution
by jaybeepee 11 Sep '15

11 Sep '15

Module: kamailio Branch: master Commit: f9aa4a219bc0e5a44b167772d6e3b86d99a59932 URL: https://github.com/kamailio/kamailio/commit/f9aa4a219bc0e5a44b167772d6e3b86… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-09-11T12:01:10+02:00 modules/cdp: changed load balancing timer from second resolution to millisecond resolution --- Modified: modules/cdp/session.h --- Diff: https://github.com/kamailio/kamailio/commit/f9aa4a219bc0e5a44b167772d6e3b86… Patch: https://github.com/kamailio/kamailio/commit/f9aa4a219bc0e5a44b167772d6e3b86… --- diff --git a/modules/cdp/session.h b/modules/cdp/session.h index 11adc86..8758081 100644 --- a/modules/cdp/session.h +++ b/modules/cdp/session.h @@ -124,6 +124,10 @@ typedef struct _cdp_auth_session_t { time_t timeout; /**< absolute time for session timeout -1 means forever */ time_t lifetime; /**< absolute time for auth lifetime -1 means forever */ time_t grace_period; /**< grace_period in seconds */ + unsigned int last_requested_lifetime; /**< the following 3 timers are used to store what we are */ + unsigned int last_requested_timeout; /**<requesitng in a request, if the answer does not have anything */ + unsigned int last_requested_grace; /**<different then we will use these values */ + void* generic_data; } cdp_auth_session_t;

1 0

git:master:d613b328: modules/cdp: changed load balancing timer from second resolution to millisecond resolution (reverted from commit 64054ac9506d45171ee8f607fc9bff5763c144dc)
by jaybeepee 11 Sep '15

11 Sep '15

Module: kamailio Branch: master Commit: d613b328b9f99f7cf739c082deede5d4d48b00de URL: https://github.com/kamailio/kamailio/commit/d613b328b9f99f7cf739c082deede5d… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-09-11T12:00:30+02:00 modules/cdp: changed load balancing timer from second resolution to millisecond resolution (reverted from commit 64054ac9506d45171ee8f607fc9bff5763c144dc) --- Modified: modules/cdp/routing.c Modified: modules/cdp/session.c --- Diff: https://github.com/kamailio/kamailio/commit/d613b328b9f99f7cf739c082deede5d… Patch: https://github.com/kamailio/kamailio/commit/d613b328b9f99f7cf739c082deede5d… --- diff --git a/modules/cdp/routing.c b/modules/cdp/routing.c index 5bd494d..81db889 100644 --- a/modules/cdp/routing.c +++ b/modules/cdp/routing.c @@ -47,7 +47,6 @@ #include "config.h" #include "peermanager.h" #include "diameter_api.h" -#include "math.h" #define LB_MAX_PEERS 20 /**< maximum peers that can be loadbalanced accross i.e. same metric */ @@ -83,7 +82,6 @@ peer* get_first_connected_route(cdp_session_t* cdp_session, routing_entry *r, in peer *p; int j; time_t least_recent_time; - struct timespec time_spec; if (cdp_session) { /*try and find an already used peer for this session - sticky*/ @@ -127,20 +125,13 @@ peer* get_first_connected_route(cdp_session_t* cdp_session, routing_entry *r, in } least_recent_time = peers[0]->last_selected; - LM_DBG("peer [%.*s] was last used @ %ld\n", peers[0]->fqdn.len, peers[0]->fqdn.s, peers[0]->last_selected); p = peers[0]; for (j = 1; j < peer_count; j++) { - LM_DBG("Peer [%.*s] was last used at [%ld]\n", peers[j]->fqdn.len, peers[j]->fqdn.s, peers[j]->last_selected); if (peers[j]->last_selected < least_recent_time) { least_recent_time = peers[j]->last_selected; p = peers[j]; } } - - clock_gettime(CLOCK_REALTIME, &time_spec); - - p->last_selected = (time_spec.tv_sec*1000000) + round(time_spec.tv_nsec / 1.0e3); // Convert nanoseconds to microseconds - LM_DBG("chosen peer [%.*s]\n", p->fqdn.len, p->fqdn.s); if (cdp_session) { if (cdp_session->sticky_peer_fqdn_buflen <= p->fqdn.len) { @@ -159,7 +150,7 @@ peer* get_first_connected_route(cdp_session_t* cdp_session, routing_entry *r, in cdp_session->sticky_peer_fqdn.len = p->fqdn.len; memcpy(cdp_session->sticky_peer_fqdn.s, p->fqdn.s, p->fqdn.len); } - + p->last_selected = time(NULL); return p; } diff --git a/modules/cdp/session.c b/modules/cdp/session.c index 716048f..c048a05 100644 --- a/modules/cdp/session.c +++ b/modules/cdp/session.c @@ -587,7 +587,6 @@ AAASession* cdp_new_auth_session(str id,int is_client,int is_statefull) s->u.auth.lifetime=0; s->u.auth.grace_period=0; s->u.auth.class = AUTH_CLASS_UNKNOWN; - s->u.auth.last_requested_grace = s->u.auth.last_requested_lifetime = s->u.auth.last_requested_timeout = 0; cdp_add_session(s); } return s;

1 0

git:master:64054ac9: modules/cdp: changed load balancing timer from second resolution to millisecond resolution
by jaybeepee 11 Sep '15

11 Sep '15

Module: kamailio Branch: master Commit: 64054ac9506d45171ee8f607fc9bff5763c144dc URL: https://github.com/kamailio/kamailio/commit/64054ac9506d45171ee8f607fc9bff5… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-09-11T11:51:37+02:00 modules/cdp: changed load balancing timer from second resolution to millisecond resolution --- Modified: modules/cdp/routing.c Modified: modules/cdp/session.c --- Diff: https://github.com/kamailio/kamailio/commit/64054ac9506d45171ee8f607fc9bff5… Patch: https://github.com/kamailio/kamailio/commit/64054ac9506d45171ee8f607fc9bff5… --- diff --git a/modules/cdp/routing.c b/modules/cdp/routing.c index 81db889..5bd494d 100644 --- a/modules/cdp/routing.c +++ b/modules/cdp/routing.c @@ -47,6 +47,7 @@ #include "config.h" #include "peermanager.h" #include "diameter_api.h" +#include "math.h" #define LB_MAX_PEERS 20 /**< maximum peers that can be loadbalanced accross i.e. same metric */ @@ -82,6 +83,7 @@ peer* get_first_connected_route(cdp_session_t* cdp_session, routing_entry *r, in peer *p; int j; time_t least_recent_time; + struct timespec time_spec; if (cdp_session) { /*try and find an already used peer for this session - sticky*/ @@ -125,13 +127,20 @@ peer* get_first_connected_route(cdp_session_t* cdp_session, routing_entry *r, in } least_recent_time = peers[0]->last_selected; + LM_DBG("peer [%.*s] was last used @ %ld\n", peers[0]->fqdn.len, peers[0]->fqdn.s, peers[0]->last_selected); p = peers[0]; for (j = 1; j < peer_count; j++) { + LM_DBG("Peer [%.*s] was last used at [%ld]\n", peers[j]->fqdn.len, peers[j]->fqdn.s, peers[j]->last_selected); if (peers[j]->last_selected < least_recent_time) { least_recent_time = peers[j]->last_selected; p = peers[j]; } } + + clock_gettime(CLOCK_REALTIME, &time_spec); + + p->last_selected = (time_spec.tv_sec*1000000) + round(time_spec.tv_nsec / 1.0e3); // Convert nanoseconds to microseconds + LM_DBG("chosen peer [%.*s]\n", p->fqdn.len, p->fqdn.s); if (cdp_session) { if (cdp_session->sticky_peer_fqdn_buflen <= p->fqdn.len) { @@ -150,7 +159,7 @@ peer* get_first_connected_route(cdp_session_t* cdp_session, routing_entry *r, in cdp_session->sticky_peer_fqdn.len = p->fqdn.len; memcpy(cdp_session->sticky_peer_fqdn.s, p->fqdn.s, p->fqdn.len); } - p->last_selected = time(NULL); + return p; } diff --git a/modules/cdp/session.c b/modules/cdp/session.c index c048a05..716048f 100644 --- a/modules/cdp/session.c +++ b/modules/cdp/session.c @@ -587,6 +587,7 @@ AAASession* cdp_new_auth_session(str id,int is_client,int is_statefull) s->u.auth.lifetime=0; s->u.auth.grace_period=0; s->u.auth.class = AUTH_CLASS_UNKNOWN; + s->u.auth.last_requested_grace = s->u.auth.last_requested_lifetime = s->u.auth.last_requested_timeout = 0; cdp_add_session(s); } return s;

1 0

git:master:956be0ed: modules/cdp: fixed race condition between CCR update and CCR terminate - lean priority towards T
by jaybeepee 11 Sep '15

11 Sep '15

Module: kamailio Branch: master Commit: 956be0edcd816134650c5efccb7965fccb4d5916 URL: https://github.com/kamailio/kamailio/commit/956be0edcd816134650c5efccb7965f… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-09-11T11:44:31+02:00 modules/cdp: fixed race condition between CCR update and CCR terminate - lean priority towards T --- Modified: modules/cdp/acctstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/956be0edcd816134650c5efccb7965f… Patch: https://github.com/kamailio/kamailio/commit/956be0edcd816134650c5efccb7965f… --- diff --git a/modules/cdp/acctstatemachine.c b/modules/cdp/acctstatemachine.c index d4e524d..31304d2 100644 --- a/modules/cdp/acctstatemachine.c +++ b/modules/cdp/acctstatemachine.c @@ -210,29 +210,41 @@ inline int cc_acc_client_stateful_sm_process(cdp_session_t* s, int event, AAAMes } break; case ACC_CC_ST_PENDING_U: - if (event == ACC_CC_EV_RECV_ANS && msg && !is_req(msg)) { - rc = get_result_code(msg); - if (rc >= 2000 && rc < 3000) { - event = ACC_CC_EV_RECV_ANS_SUCCESS; - } else { - event = ACC_CC_EV_RECV_ANS_UNSUCCESS; - } - } - switch (event) { - case ACC_CC_EV_RECV_ANS_SUCCESS: - x->state = ACC_CC_ST_OPEN; - LM_DBG("success CCA for UPDATE\n"); - update_gsu_response_timers(x, msg); - break; - case ACC_CC_EV_RECV_ANS_UNSUCCESS: - //TODO: check whether we grant or terminate service to callback clients - x->state = ACC_CC_ST_DISCON; - LM_ERR("update failed... going back to IDLE/DISCON\n"); - break; - default: - LM_ERR("Received unknown event [%d] in state [%d]\n", event, x->state); - break; - } + + /**Richard added Aug 5 - there is a potential race condition where you may send a CCR-U immediately followed by CCR-T + * and then receive a CCA-T while in state ACC_CC_ST_PENDING_U (e.g. if update timer and dialog termination at same time) + * In this event you would incorrectly ignore the CCR-T + * Solution is to change state to change state to ACC_CC_ST_PENDING_T if CCR-T is sent while in this state */ + if (event == ACC_CC_EV_SEND_REQ && msg && get_accounting_record_type(msg) == 4 /*TERMINATE RECORD*/) { + LM_ERR("Received CCR-T while in state ACC_CC_ST_PENDING_U, just going to change to ACC_CC_ST_PENDING_T\n"); + s->u.cc_acc.state = ACC_CC_ST_PENDING_T; + //update our reservation and its timers... + update_gsu_request_timers(x, msg); + } else { + if (event == ACC_CC_EV_RECV_ANS && msg && !is_req(msg)) { + rc = get_result_code(msg); + if (rc >= 2000 && rc < 3000) { + event = ACC_CC_EV_RECV_ANS_SUCCESS; + } else { + event = ACC_CC_EV_RECV_ANS_UNSUCCESS; + } + } + switch (event) { + case ACC_CC_EV_RECV_ANS_SUCCESS: + x->state = ACC_CC_ST_OPEN; + LM_DBG("success CCA for UPDATE\n"); + update_gsu_response_timers(x, msg); + break; + case ACC_CC_EV_RECV_ANS_UNSUCCESS: + //TODO: check whether we grant or terminate service to callback clients + x->state = ACC_CC_ST_DISCON; + LM_ERR("update failed... going back to IDLE/DISCON\n"); + break; + default: + LM_ERR("Received unknown event [%d] in state [%d]\n", event, x->state); + break; + } + } break; case ACC_CC_ST_DISCON: switch (event) {

1 0

git:master:6e2f4d7d: rtpengine: fix segfault when bad mi params
by Stefan Mititelu 11 Sep '15

11 Sep '15

Module: kamailio Branch: master Commit: 6e2f4d7d249f155ce43cfd6c58a8707deac175e0 URL: https://github.com/kamailio/kamailio/commit/6e2f4d7d249f155ce43cfd6c58a8707… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-09-11T10:39:33+03:00 rtpengine: fix segfault when bad mi params Default root pointer to NULL in order to avoid segfaults due to bad mi params (e.g string instead of int). The segfaults happened because in the above cases, free_mi_tree(root) tries to free a random, invalid address. --- Modified: modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/6e2f4d7d249f155ce43cfd6c58a8707… Patch: https://github.com/kamailio/kamailio/commit/6e2f4d7d249f155ce43cfd6c58a8707… --- diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c index c67ac5a..3dbd0cf 100644 --- a/modules/rtpengine/rtpengine.c +++ b/modules/rtpengine/rtpengine.c @@ -854,7 +854,7 @@ static struct mi_root* mi_enable_rtp_proxy(struct mi_root *cmd_tree, struct mi_node *node, *crt_node; struct rtpp_set *rtpp_list; struct rtpp_node *crt_rtpp, *found_rtpp; - struct mi_root *root; + struct mi_root *root = NULL; struct mi_attr *attr; unsigned int enable; int found, found_rtpp_disabled; @@ -1099,7 +1099,7 @@ static struct mi_root* mi_show_rtp_proxy(struct mi_root* cmd_tree, void* param) { struct mi_node *node; - struct mi_root *root; + struct mi_root *root = NULL; struct rtpp_set *rtpp_list; struct rtpp_node *crt_rtpp; int found; @@ -1190,7 +1190,7 @@ static struct mi_root* mi_ping_rtp_proxy(struct mi_root* cmd_tree, { struct mi_node *node, *crt_node; struct mi_attr *attr; - struct mi_root *root; + struct mi_root *root = NULL; struct rtpp_set *rtpp_list; struct rtpp_node *crt_rtpp, *found_rtpp; int found, found_rtpp_disabled;

1 0

Kamailio v4.3.2 Released
by Daniel-Constantin Mierla 10 Sep '15

10 Sep '15

Hello, Kamailio SIP Server v4.3.2 stable release is out. This is a maintenance release of the latest stable branch, 4.3, that includes fixes since release of v4.3.1. There is no change to database schema or configuration language structure that you have to do on previous installations of v4.3.x. Deployments running previous v4.x.x versions are strongly recommended to be upgraded to v4.3.2. For more details about version 4.3.2 (including links and guidelines to download the tarball or from GIT repository), visit: * http://www.kamailio.org/w/2015/09/kamailio-v4-3-2-released/ RPM, Debian/Ubuntu packages will be available soon as well. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

1 0

git:4.3:07690f19: ChangeLog: content updated for v4.3.2
by Daniel-Constantin Mierla 10 Sep '15

10 Sep '15

Module: kamailio Branch: 4.3 Commit: 07690f19d4e570d6869cb55626309e8576b029fe URL: https://github.com/kamailio/kamailio/commit/07690f19d4e570d6869cb55626309e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-10T15:34:43+02:00 ChangeLog: content updated for v4.3.2 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/07690f19d4e570d6869cb55626309e8… Patch: https://github.com/kamailio/kamailio/commit/07690f19d4e570d6869cb55626309e8…

1 0

git:4.3:d1ca777a: Makefile.defs: version set to 4.3.2
by Daniel-Constantin Mierla 10 Sep '15

10 Sep '15

Module: kamailio Branch: 4.3 Commit: d1ca777a23c09965be7cbe3b9f686a4329c077ab URL: https://github.com/kamailio/kamailio/commit/d1ca777a23c09965be7cbe3b9f686a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-10T15:31:26+02:00 Makefile.defs: version set to 4.3.2 --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/d1ca777a23c09965be7cbe3b9f686a4… Patch: https://github.com/kamailio/kamailio/commit/d1ca777a23c09965be7cbe3b9f686a4… --- diff --git a/Makefile.defs b/Makefile.defs index 6d6a04f..9d68c4b 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -96,7 +96,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 4 PATCHLEVEL = 3 -SUBLEVEL = 1 +SUBLEVEL = 2 EXTRAVERSION = # memory manager switcher

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2015