sr-dev February 2015

sr-dev@lists.kamailio.org

39 participants
341 discussions

git:master:351bcf21: modules/ims_charging: changed stats to use counters instead
by Jason Penton 25 Feb '15

25 Feb '15

Module: kamailio Branch: master Commit: 351bcf21428bbb7e12f47a7f57a738e1263482fa URL: https://github.com/kamailio/kamailio/commit/351bcf21428bbb7e12f47a7f57a738e… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: 2015-02-25T11:05:08+02:00 modules/ims_charging: changed stats to use counters instead --- Added: modules/ims_charging/ims_charging_stats.c Added: modules/ims_charging/ims_charging_stats.h Modified: modules/ims_charging/ims_ro.c Modified: modules/ims_charging/mod.c Modified: modules/ims_charging/ro_timer.c Removed: modules/ims_charging/stats.c Removed: modules/ims_charging/stats.h --- Diff: https://github.com/kamailio/kamailio/commit/351bcf21428bbb7e12f47a7f57a738e… Patch: https://github.com/kamailio/kamailio/commit/351bcf21428bbb7e12f47a7f57a738e…

1 0

git:master:4c4e5766: mem Remove SVN ID, remove history
by Olle E. Johansson 25 Feb '15

25 Feb '15

Module: kamailio Branch: master Commit: 4c4e57664848c2b22d7fcfb40c072722affb0a46 URL: https://github.com/kamailio/kamailio/commit/4c4e57664848c2b22d7fcfb40c07272… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-02-25T09:12:38+01:00 mem Remove SVN ID, remove history --- Modified: mem/f_malloc.c Modified: mem/f_malloc.h Modified: mem/ll_malloc.c Modified: mem/ll_malloc.h Modified: mem/mem.c Modified: mem/mem.h Modified: mem/memdbg.h Modified: mem/meminfo.h Modified: mem/memtest.c Modified: mem/q_malloc.c Modified: mem/q_malloc.h Modified: mem/sf_malloc.c Modified: mem/sf_malloc.h Modified: mem/shm_mem.c Modified: mem/shm_mem.h Modified: mem/src_loc.h --- Diff: https://github.com/kamailio/kamailio/commit/4c4e57664848c2b22d7fcfb40c07272… Patch: https://github.com/kamailio/kamailio/commit/4c4e57664848c2b22d7fcfb40c07272…

1 0

git:master:e164aed5: Merge pull request #98 from tsearle/master
by tsearle 25 Feb '15

25 Feb '15

Module: kamailio Branch: master Commit: e164aed586d4adef92e62350e30024560c19101c URL: https://github.com/kamailio/kamailio/commit/e164aed586d4adef92e62350e300245… Author: tsearle <tsearle(a)gmail.com> Committer: tsearle <tsearle(a)gmail.com> Date: 2015-02-25T08:37:02+01:00 Merge pull request #98 from tsearle/master modules/sipt: fix bounds check on ACM --- Modified: modules/sipt/ss7_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/e164aed586d4adef92e62350e300245… Patch: https://github.com/kamailio/kamailio/commit/e164aed586d4adef92e62350e300245… --- diff --git a/modules/sipt/ss7_parser.c b/modules/sipt/ss7_parser.c index 9315e43..e7554f8 100644 --- a/modules/sipt/ss7_parser.c +++ b/modules/sipt/ss7_parser.c @@ -316,13 +316,14 @@ int isup_update_bci_1(struct sdp_mangler * mangle, int charge_indicator, int cal return 1; } - if (len < sizeof(struct isup_acm_fixed)) + // add minus 1 because the optinal pointer is optional + if (len < sizeof(struct isup_acm_fixed) -1 ) return -1; bci = (charge_indicator & 0x3) | ((called_status & 0x3)<<2) | ((called_category & 0x3)<<4) | ((e2e_indicator & 0x3)<<6); - add_body_segment(mangle, offsetof(struct isup_acm_fixed, backwards_call_ind), &bci, 1); + replace_body_segment(mangle, offsetof(struct isup_acm_fixed, backwards_call_ind), 1, &bci, 1); return sizeof(struct isup_acm_fixed); }

1 0

git:master:8c2f3ab2: Merge remote-tracking branch 'origin'
by Torrey Searle 25 Feb '15

25 Feb '15

Module: kamailio Branch: master Commit: 8c2f3ab244e147b8159fb6669cbc2cd3098c9a79 URL: https://github.com/kamailio/kamailio/commit/8c2f3ab244e147b8159fb6669cbc2cd… Author: Torrey Searle <tsearle(a)gmail.com> Committer: Torrey Searle <tsearle(a)gmail.com> Date: 2015-02-24T17:40:39+01:00 Merge remote-tracking branch 'origin' * origin: modules/sipt: fix size check for optional pointer --- --- Diff: https://github.com/kamailio/kamailio/commit/8c2f3ab244e147b8159fb6669cbc2cd… Patch: https://github.com/kamailio/kamailio/commit/8c2f3ab244e147b8159fb6669cbc2cd…

1 0

git:master:198969bb: modules/sipt: fix size check for optional pointer
by Torrey Searle 25 Feb '15

25 Feb '15

Module: kamailio Branch: master Commit: 198969bb4b2883530c6865f0c6f2afb574cead56 URL: https://github.com/kamailio/kamailio/commit/198969bb4b2883530c6865f0c6f2afb… Author: Torrey Searle <tsearle(a)gmail.com> Committer: Torrey Searle <tsearle(a)gmail.com> Date: 2015-02-24T17:36:14+01:00 modules/sipt: fix size check for optional pointer --- Modified: modules/sipt/ss7_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/198969bb4b2883530c6865f0c6f2afb… Patch: https://github.com/kamailio/kamailio/commit/198969bb4b2883530c6865f0c6f2afb… --- diff --git a/modules/sipt/ss7_parser.c b/modules/sipt/ss7_parser.c index 9315e43..e7554f8 100644 --- a/modules/sipt/ss7_parser.c +++ b/modules/sipt/ss7_parser.c @@ -316,13 +316,14 @@ int isup_update_bci_1(struct sdp_mangler * mangle, int charge_indicator, int cal return 1; } - if (len < sizeof(struct isup_acm_fixed)) + // add minus 1 because the optinal pointer is optional + if (len < sizeof(struct isup_acm_fixed) -1 ) return -1; bci = (charge_indicator & 0x3) | ((called_status & 0x3)<<2) | ((called_category & 0x3)<<4) | ((e2e_indicator & 0x3)<<6); - add_body_segment(mangle, offsetof(struct isup_acm_fixed, backwards_call_ind), &bci, 1); + replace_body_segment(mangle, offsetof(struct isup_acm_fixed, backwards_call_ind), 1, &bci, 1); return sizeof(struct isup_acm_fixed); }

1 0

git:master:c3131445: modules/sipt: fix size check for optional pointer
by Torrey Searle 25 Feb '15

25 Feb '15

Module: kamailio Branch: master Commit: c3131445da9d1eefbed22db529f428e67824d856 URL: https://github.com/kamailio/kamailio/commit/c3131445da9d1eefbed22db529f428e… Author: Torrey Searle <tsearle(a)gmail.com> Committer: Torrey Searle <tsearle(a)gmail.com> Date: 2015-02-24T16:52:20+01:00 modules/sipt: fix size check for optional pointer --- Modified: modules/sipt/ss7_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/c3131445da9d1eefbed22db529f428e… Patch: https://github.com/kamailio/kamailio/commit/c3131445da9d1eefbed22db529f428e… --- diff --git a/modules/sipt/ss7_parser.c b/modules/sipt/ss7_parser.c index 9315e43..e7554f8 100644 --- a/modules/sipt/ss7_parser.c +++ b/modules/sipt/ss7_parser.c @@ -316,13 +316,14 @@ int isup_update_bci_1(struct sdp_mangler * mangle, int charge_indicator, int cal return 1; } - if (len < sizeof(struct isup_acm_fixed)) + // add minus 1 because the optinal pointer is optional + if (len < sizeof(struct isup_acm_fixed) -1 ) return -1; bci = (charge_indicator & 0x3) | ((called_status & 0x3)<<2) | ((called_category & 0x3)<<4) | ((e2e_indicator & 0x3)<<6); - add_body_segment(mangle, offsetof(struct isup_acm_fixed, backwards_call_ind), &bci, 1); + replace_body_segment(mangle, offsetof(struct isup_acm_fixed, backwards_call_ind), 1, &bci, 1); return sizeof(struct isup_acm_fixed); }

1 0

[kamailio] modules/sipt: fix bounds check on ACM (#98)
by tsearle 25 Feb '15

25 Feb '15

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/98 -- Commit Summary -- * modules/sipt: fix size check for optional pointer * modules/sipt: fix size check for optional pointer * Merge remote-tracking branch 'origin' -- File Changes -- M modules/sipt/ss7_parser.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/98.patch https://github.com/kamailio/kamailio/pull/98.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/98

3 3

git:master:12af51df: kazoo - fix compilation
by Luis Azedo 24 Feb '15

24 Feb '15

Module: kamailio Branch: master Commit: 12af51df76e779c70470c57ef0b992831441f275 URL: https://github.com/kamailio/kamailio/commit/12af51df76e779c70470c57ef0b9928… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2015-02-24T22:37:32Z kazoo - fix compilation --- Modified: modules/kazoo/kazoo.c --- Diff: https://github.com/kamailio/kamailio/commit/12af51df76e779c70470c57ef0b9928… Patch: https://github.com/kamailio/kamailio/commit/12af51df76e779c70470c57ef0b9928… --- diff --git a/modules/kazoo/kazoo.c b/modules/kazoo/kazoo.c index c3f6a00..89484d1 100644 --- a/modules/kazoo/kazoo.c +++ b/modules/kazoo/kazoo.c @@ -240,7 +240,7 @@ static int mod_init(void) { } if(kz_timer_ms > 0) { - kz_timer_tv.tv_usec = (kz_timer_ms 1000) * 1000; + kz_timer_tv.tv_usec = (kz_timer_ms % 1000) * 1000; kz_timer_tv.tv_sec = kz_timer_ms / 1000; }

1 0

git:master:7ae9f669: kazoo - fix timer interval
by Luis Azedo 24 Feb '15

24 Feb '15

Module: kamailio Branch: master Commit: 7ae9f6693406c76d7d58389d5cf4ccaa44958a02 URL: https://github.com/kamailio/kamailio/commit/7ae9f6693406c76d7d58389d5cf4cca… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2015-02-24T22:22:32Z kazoo - fix timer interval amqp timer and publish proc take all cpu new param amqp_timmer_process_interval in MS and removed the timeout on select from tcp workers --- Modified: modules/kazoo/kazoo.c Modified: modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/7ae9f6693406c76d7d58389d5cf4cca… Patch: https://github.com/kamailio/kamailio/commit/7ae9f6693406c76d7d58389d5cf4cca… --- diff --git a/modules/kazoo/kazoo.c b/modules/kazoo/kazoo.c index d110131..c3f6a00 100644 --- a/modules/kazoo/kazoo.c +++ b/modules/kazoo/kazoo.c @@ -70,6 +70,8 @@ struct timeval kz_sock_tv = (struct timeval){0,100000}; struct timeval kz_amqp_tv = (struct timeval){0,100000}; struct timeval kz_qtimeout_tv = (struct timeval){2,0}; struct timeval kz_ack_tv = (struct timeval){0,100000}; +struct timeval kz_timer_tv = (struct timeval){0,200000}; +int kz_timer_ms = 200; str dbk_consumer_event_key = str_init("Event-Category"); @@ -148,6 +150,7 @@ static param_export_t params[] = { // {"mwi_expires", INT_PARAM, &dbk_mwi_expires}, {"amqp_connection", STR_PARAM|USE_FUNC_PARAM,(void*)kz_amqp_add_connection}, {"amqp_max_channels", INT_PARAM, &dbk_channels}, + {"amqp_timmer_process_interval", INT_PARAM, &kz_timer_ms}, {"amqp_consumer_ack_timeout_micro", INT_PARAM, &kz_ack_tv.tv_usec}, {"amqp_consumer_ack_timeout_sec", INT_PARAM, &kz_ack_tv.tv_sec}, {"amqp_interprocess_timeout_micro", INT_PARAM, &kz_sock_tv.tv_usec}, @@ -235,6 +238,11 @@ static int mod_init(void) { if(!kz_amqp_init()) { return -1; } + + if(kz_timer_ms > 0) { + kz_timer_tv.tv_usec = (kz_timer_ms 1000) * 1000; + kz_timer_tv.tv_sec = kz_timer_ms / 1000; + } if(dbk_pua_mode == 1) { kz_db_url.len = kz_db_url.s ? strlen(kz_db_url.s) : 0; diff --git a/modules/kazoo/kz_amqp.c b/modules/kazoo/kz_amqp.c index 498347e..f1534d8 100644 --- a/modules/kazoo/kz_amqp.c +++ b/modules/kazoo/kz_amqp.c @@ -35,6 +35,7 @@ extern struct timeval kz_sock_tv; extern struct timeval kz_amqp_tv; extern struct timeval kz_qtimeout_tv; extern struct timeval kz_ack_tv; +extern struct timeval kz_timer_tv; extern int dbk_internal_loop_count; extern int dbk_consumer_loop_count; @@ -1909,6 +1910,7 @@ void kz_amqp_timeout_proc(int child_no) int i; while(1) { struct timeval now; + usleep(kz_timer_tv.tv_usec); for(i=0; i < dbk_channels; i++) { gettimeofday(&now, NULL); if(channels[i].state == KZ_AMQP_CALLING @@ -1972,7 +1974,7 @@ void kz_amqp_publisher_proc(int child_no) while(OK) { FD_ZERO(&fdset); FD_SET(data_pipe, &fdset); - selret = select(FD_SETSIZE, &fdset, NULL, NULL, &kz_sock_tv); + selret = select(FD_SETSIZE, &fdset, NULL, NULL, NULL); if (selret < 0) { LM_ERR("select() failed: %s\n", strerror(errno)); continue;

1 0

git:master:766208cb: userblacklist remove svn ID
by Olle E. Johansson 24 Feb '15

24 Feb '15

Module: kamailio Branch: master Commit: 766208cbb8c59a1bc15aefb253f13992d87a122a URL: https://github.com/kamailio/kamailio/commit/766208cbb8c59a1bc15aefb253f1399… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-02-24T22:06:05+01:00 userblacklist remove svn ID --- Modified: modules/userblacklist/db.c Modified: modules/userblacklist/db.h Modified: modules/userblacklist/db_userblacklist.c Modified: modules/userblacklist/db_userblacklist.h Modified: modules/userblacklist/userblacklist.c --- Diff: https://github.com/kamailio/kamailio/commit/766208cbb8c59a1bc15aefb253f1399… Patch: https://github.com/kamailio/kamailio/commit/766208cbb8c59a1bc15aefb253f1399… --- diff --git a/modules/userblacklist/db.c b/modules/userblacklist/db.c index b4d8d42..bebb574 100644 --- a/modules/userblacklist/db.c +++ b/modules/userblacklist/db.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2007 1&1 Internet AG * * This file is part of Kamailio, a free SIP server. diff --git a/modules/userblacklist/db.h b/modules/userblacklist/db.h index 26a3ab7..bc463e3 100644 --- a/modules/userblacklist/db.h +++ b/modules/userblacklist/db.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2007 1&1 Internet AG * * This file is part of Kamailio, a free SIP server. diff --git a/modules/userblacklist/db_userblacklist.c b/modules/userblacklist/db_userblacklist.c index 09f5143..cb8fcd5 100644 --- a/modules/userblacklist/db_userblacklist.c +++ b/modules/userblacklist/db_userblacklist.c @@ -1,4 +1,3 @@ - /*! * \file * \ingroup db diff --git a/modules/userblacklist/db_userblacklist.h b/modules/userblacklist/db_userblacklist.h index ccf1475..87b31c9 100644 --- a/modules/userblacklist/db_userblacklist.h +++ b/modules/userblacklist/db_userblacklist.h @@ -1,4 +1,3 @@ - /*! * \file * \ingroup db diff --git a/modules/userblacklist/userblacklist.c b/modules/userblacklist/userblacklist.c index 73bcd0c..494c92a 100644 --- a/modules/userblacklist/userblacklist.c +++ b/modules/userblacklist/userblacklist.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2007 1&1 Internet AG * * This file is part of Kamailio, a free SIP server.

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2015