sr-dev December 2016

sr-dev@lists.kamailio.org

25 participants
332 discussions

git:master:22b040c9: ratelimit module not working properly when FEEDBACK algorithm is used - deleting unused lines

by Guilherme C Pilon

Module: kamailio Branch: master Commit: 22b040c944228cfc7795f4481465dd230bff6f99 URL: https://github.com/kamailio/kamailio/commit/22b040c944228cfc7795f4481465dd2… Author: Guilherme C Pilon <gpilon(a)daitangroup.com> Committer: Guilherme C Pilon <gpilon(a)daitangroup.com> Date: 2016-11-30T13:41:12-02:00 ratelimit module not working properly when FEEDBACK algorithm is used - deleting unused lines --- Modified: modules/ratelimit/ratelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/22b040c944228cfc7795f4481465dd2… Patch: https://github.com/kamailio/kamailio/commit/22b040c944228cfc7795f4481465dd2… --- diff --git a/modules/ratelimit/ratelimit.c b/modules/ratelimit/ratelimit.c index 72619fa..b8a053e 100644 --- a/modules/ratelimit/ratelimit.c +++ b/modules/ratelimit/ratelimit.c @@ -359,8 +359,6 @@ static int get_cpuload(double * load) vload = ((double)d_idle) / (double)d_total; - /* divide by numbers of cpu */ - ncpu = get_num_cpus(); vload = 1.0 - vload; if(vload<0.0) vload = 0.0; else if (vload>1.0) vload = 1.0;

8 years

git:master:bb768faa: ratelimit module not working properly when FEEDBACK algorithm is used

by Guilherme C Pilon

Module: kamailio Branch: master Commit: bb768faae3367c1209e735de71ab9fdcd5d068d5 URL: https://github.com/kamailio/kamailio/commit/bb768faae3367c1209e735de71ab9fd… Author: Guilherme C Pilon <gpilon(a)daitangroup.com> Committer: Guilherme C Pilon <gpilon(a)daitangroup.com> Date: 2016-11-30T13:33:44-02:00 ratelimit module not working properly when FEEDBACK algorithm is used --- Modified: modules/ratelimit/ratelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/bb768faae3367c1209e735de71ab9fd… Patch: https://github.com/kamailio/kamailio/commit/bb768faae3367c1209e735de71ab9fd… --- diff --git a/modules/ratelimit/ratelimit.c b/modules/ratelimit/ratelimit.c index 69fcd74..72619fa 100644 --- a/modules/ratelimit/ratelimit.c +++ b/modules/ratelimit/ratelimit.c @@ -361,7 +361,6 @@ static int get_cpuload(double * load) /* divide by numbers of cpu */ ncpu = get_num_cpus(); - vload = vload/ncpu; vload = 1.0 - vload; if(vload<0.0) vload = 0.0; else if (vload>1.0) vload = 1.0;

8 years

[kamailio/kamailio] ratelimit module not working properly when FEEDBACK algorithm is used (#873)

by GUILHERME CESAR PILON

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/873 -- Commit Summary -- * ratelimit module not working properly when FEEDBACK algorithm is used -- File Changes -- M modules/ratelimit/ratelimit.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/873.patch https://github.com/kamailio/kamailio/pull/873.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/873

8 years

git:master:cc41e2ce: Merge pull request #880 from mslehto/faked_msg.h

by GitHub

Module: kamailio Branch: master Commit: cc41e2ce00186216423b1d30db8bb63f87ff31d0 URL: https://github.com/kamailio/kamailio/commit/cc41e2ce00186216423b1d30db8bb63… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-12-04T09:54:16+01:00 Merge pull request #880 from mslehto/faked_msg.h remove lib/kcore/faked_msg.h --- Modified: fmsg.h Modified: modules/cnxcc/cnxcc_mod.c Modified: modules/dialog/dialog.c Modified: modules/dialog/dlg_handlers.c Modified: modules/dispatcher/dispatch.c Modified: modules/erlang/handle_emsg.c Modified: modules/evapi/evapi_dispatch.c Modified: modules/evapi/evapi_mod.c Modified: modules/htable/ht_api.c Modified: modules/htable/htable.c Modified: modules/http_async_client/async_http.c Modified: modules/http_async_client/http_async_client_mod.c Modified: modules/ims_dialog/dlg_handlers.c Modified: modules/ims_dialog/ims_dialog.c Modified: modules/kazoo/kz_amqp.h Modified: modules/mqueue/mqueue_api.c Modified: modules/registrar/regpv.c Modified: modules/rtimer/rtimer_mod.c Modified: modules/uac/uac_send.c Modified: modules/websocket/ws_conn.c Removed: lib/kcore/faked_msg.h --- Diff: https://github.com/kamailio/kamailio/commit/cc41e2ce00186216423b1d30db8bb63… Patch: https://github.com/kamailio/kamailio/commit/cc41e2ce00186216423b1d30db8bb63…

8 years

git:master:0e2cb067: lib/kcore: faked_msg.h not referenced anymore

by Mikko Lehto

Module: kamailio Branch: master Commit: 0e2cb067ac01988b3693c7a40fb65071df103666 URL: https://github.com/kamailio/kamailio/commit/0e2cb067ac01988b3693c7a40fb6507… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-12-02T23:01:08+02:00 lib/kcore: faked_msg.h not referenced anymore --- Removed: lib/kcore/faked_msg.h --- Diff: https://github.com/kamailio/kamailio/commit/0e2cb067ac01988b3693c7a40fb6507… Patch: https://github.com/kamailio/kamailio/commit/0e2cb067ac01988b3693c7a40fb6507… --- diff --git a/lib/kcore/faked_msg.h b/lib/kcore/faked_msg.h deleted file mode 100644 index 65ecb3f..0000000 --- a/lib/kcore/faked_msg.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * - * Copyright (C) 2009 Daniel-Constantin Mierla (asipto.com) - * - * This file is part of kamailio, a free SIP server. - * - * kamailio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version - * - * kamailio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef _FAKED_SIP_MSG_H_ -#define _FAKED_SIP_MSG_H_ - -#include "../../fmsg.h" - -#endif

8 years

git:master:0a467bac: modules: faked message api has moved to core

by Mikko Lehto

Module: kamailio Branch: master Commit: 0a467bac35bcd6034c1a198fea569944f7707ad2 URL: https://github.com/kamailio/kamailio/commit/0a467bac35bcd6034c1a198fea56994… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-12-02T23:00:42+02:00 modules: faked message api has moved to core --- Modified: fmsg.h Modified: modules/cnxcc/cnxcc_mod.c Modified: modules/dialog/dialog.c Modified: modules/dialog/dlg_handlers.c Modified: modules/dispatcher/dispatch.c Modified: modules/erlang/handle_emsg.c Modified: modules/evapi/evapi_dispatch.c Modified: modules/evapi/evapi_mod.c Modified: modules/htable/ht_api.c Modified: modules/htable/htable.c Modified: modules/http_async_client/async_http.c Modified: modules/http_async_client/http_async_client_mod.c Modified: modules/ims_dialog/dlg_handlers.c Modified: modules/ims_dialog/ims_dialog.c Modified: modules/kazoo/kz_amqp.h Modified: modules/mqueue/mqueue_api.c Modified: modules/registrar/regpv.c Modified: modules/rtimer/rtimer_mod.c Modified: modules/uac/uac_send.c Modified: modules/websocket/ws_conn.c --- Diff: https://github.com/kamailio/kamailio/commit/0a467bac35bcd6034c1a198fea56994… Patch: https://github.com/kamailio/kamailio/commit/0a467bac35bcd6034c1a198fea56994…

8 years

[kamailio/kamailio] remove lib/kcore/faked_msg.h (#880)

by Mikko Lehto

Looks like lib/kcore/faked_msg.h is not needed anymore You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/880 -- Commit Summary -- * modules: faked message api has moved to core * lib/kcore: faked_msg.h not referenced anymore -- File Changes -- M fmsg.h (2) D lib/kcore/faked_msg.h (27) M modules/cnxcc/cnxcc_mod.c (2) M modules/dialog/dialog.c (2) M modules/dialog/dlg_handlers.c (2) M modules/dispatcher/dispatch.c (2) M modules/erlang/handle_emsg.c (2) M modules/evapi/evapi_dispatch.c (2) M modules/evapi/evapi_mod.c (2) M modules/htable/ht_api.c (2) M modules/htable/htable.c (2) M modules/http_async_client/async_http.c (2) M modules/http_async_client/http_async_client_mod.c (2) M modules/ims_dialog/dlg_handlers.c (2) M modules/ims_dialog/ims_dialog.c (2) M modules/kazoo/kz_amqp.h (2) M modules/mqueue/mqueue_api.c (2) M modules/registrar/regpv.c (2) M modules/rtimer/rtimer_mod.c (2) M modules/uac/uac_send.c (2) M modules/websocket/ws_conn.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/880.patch https://github.com/kamailio/kamailio/pull/880.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/880

8 years

git:master:938ac5e7: modules/ims_qos: added patch for flow-description bug when request originates from called party

by Richard Good

Module: kamailio Branch: master Commit: 938ac5e7223001fb9e3b748262283d323a23c539 URL: https://github.com/kamailio/kamailio/commit/938ac5e7223001fb9e3b748262283d3… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: 2016-12-02T16:30:10+02:00 modules/ims_qos: added patch for flow-description bug when request originates from called party Fix for incorrect IP swap in flow description AVP when called party originates a request that triggers Rx --- Modified: modules/ims_qos/rx_aar.c --- Diff: https://github.com/kamailio/kamailio/commit/938ac5e7223001fb9e3b748262283d3… Patch: https://github.com/kamailio/kamailio/commit/938ac5e7223001fb9e3b748262283d3… --- diff --git a/modules/ims_qos/rx_aar.c b/modules/ims_qos/rx_aar.c index 8ba6f4e..f23740b 100644 --- a/modules/ims_qos/rx_aar.c +++ b/modules/ims_qos/rx_aar.c @@ -436,8 +436,15 @@ int add_media_components(AAAMessage* aar, struct sip_msg *req, sdp_session_cell_t* req_sdp_session, *rpl_sdp_session; sdp_stream_cell_t* req_sdp_stream, *rpl_sdp_stream; int add_flow = 1; - - if (!req || !rpl) { + str ttag = {0, 0}; + str ftag = {0, 0}; + int request_originated_from_callee = 0; + str ipA, ipB; + + rx_authsessiondata_t* p_session_data = 0; + p_session_data = (rx_authsessiondata_t*) auth->u.auth.generic_data; + + if (!req || !rpl) { goto error; } @@ -497,23 +504,57 @@ int add_media_components(AAAMessage* aar, struct sip_msg *req, if(add_flow) { - str ipA = req_sdp_session->ip_addr; - str ipB = rpl_sdp_session->ip_addr; + + if (cscf_get_to_tag(rpl, &ttag) && cscf_get_from_tag(rpl, &ftag)) { + LM_DBG("Original ftag [%.*s] ttag [%.*s]. Current ftag [%.*s] ttag [%.*s]\n", + p_session_data->ftag.len, p_session_data->ftag.s, p_session_data->ttag.len, p_session_data->ttag.s, + ftag.len, ftag.s, ttag.len, ttag.s); + if (!(strncmp(p_session_data->ttag.s, ttag.s, p_session_data->ttag.len) == 0 && strncmp(p_session_data->ftag.s, ftag.s, p_session_data->ftag.len) == 0)) { + LM_DBG("ftag and ttag of this response do not match initial response so this request came from callee\n"); + request_originated_from_callee = 1; + } + } else { + LM_ERR("Couldn't retrieve ftag so assume this request originated from caller\n"); + } + + if (request_originated_from_callee) { + LM_DBG("Request originated from callee so IPs are reversed\n"); + ipA = rpl_sdp_session->ip_addr; + ipB = req_sdp_session->ip_addr; + } else { + ipA = req_sdp_session->ip_addr; + ipB = rpl_sdp_session->ip_addr; + } + if (ipA.len <= 0) { - LM_DBG("Request SDP connection IP could not be retrieved, so we use SDP 1st stream IP"); - ipA = req_sdp_stream->ip_addr; + LM_DBG("Request SDP connection IP could not be retrieved, so we use SDP 1st stream IP\n"); + if (request_originated_from_callee) { + LM_DBG("Request originated from callee so IPs are reversed\n"); + ipA = rpl_sdp_stream->ip_addr; + } else { + ipA = req_sdp_stream->ip_addr; + } + + if (ipA.len <= 0) { - LM_ERR("Requested SDP IP information could not be retrieved"); + LM_ERR("Requested SDP IP information could not be retrieved\n"); goto error; } } if (ipB.len <= 0) { - LM_DBG("Reply SDP connection IP could not be retrieved, so we use SDP 1st stream IP"); - ipB = rpl_sdp_stream->ip_addr; + LM_DBG("Reply SDP connection IP could not be retrieved, so we use SDP 1st stream IP\n"); + if (request_originated_from_callee) { + LM_DBG("Request originated from callee so IPs are reversed\n"); + ipB = req_sdp_stream->ip_addr; + } else { + ipB = rpl_sdp_stream->ip_addr; + } + + if (ipB.len <= 0) { - LM_ERR("Request SDP IP information could not be retrieved"); + LM_ERR("Request SDP IP information could not be retrieved\n"); goto error; } }

8 years

[kamailio/kamailio] sipcapture: expose pv $hep(src_ip) (#877)

by David Villasmil

- when using with Homer, on onreply_route it is not possible to get the source ip address sending the reply. This patch exposes pv $hep(src_ip), i.e.: onreply_route { ... xlog("[onreply_route] Source IP: $hep(src_ip)\n"); ... } You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/877 -- Commit Summary -- * sipcapture: expose pv $hep(src_ip) -- File Changes -- M modules/sipcapture/sipcapture.c (83) -- Patch Links -- https://github.com/kamailio/kamailio/pull/877.patch https://github.com/kamailio/kamailio/pull/877.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/877

8 years

[kamailio/kamailio] Sipcapture: When inserting a reply, this module would insert the SIP … (#876)

by David Villasmil

…Status as the reply method. I've patched sipcapture.c and sipcapture.h to insert the actual SIP Status into a 'status' field on replies, and the Method extracted from the CSEQ into the 'method' field. This means when using this version of the module, you're tables must include a 'status' varchar(5) NULL field. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/876 -- Commit Summary -- * Sipcapture: When inserting a reply, this module would insert the SIP Status as the reply method. I've patched sipcapture.c and sipcapture.h to insert the actual SIP Status into a 'status' field on replies, and the Method extracted from the CSEQ into the 'method' field. This means when using this version of the module, you're tables must include a 'status' varchar(5) NULL field. -- File Changes -- M modules/sipcapture/sipcapture.c (83) M modules/sipcapture/sipcapture.h (1) M modules/sipcapture/sql/create_sipcapture_postgress.sql (3) M modules/sipcapture/sql/schema_data.sql (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/876.patch https://github.com/kamailio/kamailio/pull/876.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/876

8 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2016