sr-dev February 2015

sr-dev@lists.kamailio.org

39 participants
341 discussions

git:master:265a38a0: presence : add min_expires_action parameter

by Luis Azedo

Module: kamailio Branch: master Commit: 265a38a08a21dbeab2b9d310bd521e9c25f5d24a URL: https://github.com/kamailio/kamailio/commit/265a38a08a21dbeab2b9d310bd521e9… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2015-02-11T17:39:27Z presence : add min_expires_action parameter action to take when min_expires > 0 possible values are 1 - RC compliant, return "423 Interval Too Brief" 2 - force min_expires in the subscription --- Modified: modules/presence/doc/presence_admin.xml Modified: modules/presence/presence.c Modified: modules/presence/presence.h Modified: modules/presence/subscribe.c Modified: modules/presence/subscribe.h Modified: modules/presence/utils_func.c Modified: modules/presence/utils_func.h --- Diff: https://github.com/kamailio/kamailio/commit/265a38a08a21dbeab2b9d310bd521e9… Patch: https://github.com/kamailio/kamailio/commit/265a38a08a21dbeab2b9d310bd521e9…

9 years, 9 months

git:master:bba3e53d: presence : add min_expires param

by Luis Azedo

Module: kamailio Branch: master Commit: bba3e53de1f79d51505273519bc6c358be1f42e2 URL: https://github.com/kamailio/kamailio/commit/bba3e53de1f79d51505273519bc6c35… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2015-02-11T05:39:47Z presence : add min_expires param some UAs send very low values for subscriptions causing unwanted flooding of the server with subscribe/notify messages this new parameter allows to set a minimum value for the subscription. default value is 0 to preserve existing behaviour --- Modified: modules/presence/presence.c Modified: modules/presence/presence.h Modified: modules/presence/subscribe.c Modified: modules/presence/subscribe.h --- Diff: https://github.com/kamailio/kamailio/commit/bba3e53de1f79d51505273519bc6c35… Patch: https://github.com/kamailio/kamailio/commit/bba3e53de1f79d51505273519bc6c35… --- diff --git a/modules/presence/presence.c b/modules/presence/presence.c index 5175665..dd6277c 100644 --- a/modules/presence/presence.c +++ b/modules/presence/presence.c @@ -139,6 +139,7 @@ char prefix='a'; int startup_time=0; str db_url = {0, 0}; int expires_offset = 0; +int min_expires= 0; int max_expires= 3600; int shtable_size= 9; shtable_t subs_htable= NULL; @@ -195,6 +196,7 @@ static param_export_t params[]={ { "to_tag_pref", PARAM_STRING, &to_tag_pref }, { "expires_offset", INT_PARAM, &expires_offset }, { "max_expires", INT_PARAM, &max_expires }, + { "min_expires", INT_PARAM, &min_expires }, { "server_address", PARAM_STR, &server_address}, { "subs_htable_size", INT_PARAM, &shtable_size}, { "pres_htable_size", INT_PARAM, &phtable_size}, @@ -274,6 +276,12 @@ static int mod_init(void) if(max_expires<= 0) max_expires = 3600; + if(min_expires < 0) + min_expires = 0; + + if(min_expires > max_expires) + min_expires = max_expires; + if(server_address.s== NULL) LM_DBG("server_address parameter not set in configuration file\n"); diff --git a/modules/presence/presence.h b/modules/presence/presence.h index c1bd288..4f3962e 100644 --- a/modules/presence/presence.h +++ b/modules/presence/presence.h @@ -76,6 +76,7 @@ extern int startup_time; extern char *to_tag_pref; extern int expires_offset; extern str server_address; +extern int min_expires; extern int max_expires; extern int subs_dbmode; extern int publ_cache_enabled; diff --git a/modules/presence/subscribe.c b/modules/presence/subscribe.c index 334dc32..7bb48c5 100644 --- a/modules/presence/subscribe.c +++ b/modules/presence/subscribe.c @@ -863,7 +863,7 @@ int handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_domain) ev_param= ev_param->next; } - if(extract_sdialog_info(&subs, msg, max_expires, &to_tag_gen, + if(extract_sdialog_info(&subs, msg, min_expires, max_expires, &to_tag_gen, server_address, watcher_user, watcher_domain)< 0) { LM_ERR("failed to extract dialog information\n"); @@ -1088,9 +1088,9 @@ int handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_domain) } -int extract_sdialog_info(subs_t* subs,struct sip_msg* msg, int mexp, - int* to_tag_gen, str scontact, str watcher_user, - str watcher_domain) +int extract_sdialog_info(subs_t* subs,struct sip_msg* msg, int miexp, + int mexp, int* to_tag_gen, str scontact, + str watcher_user, str watcher_domain) { str rec_route= {0, 0}; int rt = 0; @@ -1119,7 +1119,8 @@ int extract_sdialog_info(subs_t* subs,struct sip_msg* msg, int mexp, } if(lexpire > mexp) lexpire = mexp; - + if (lexpire && miexp && lexpire < miexp) + lexpire = miexp; subs->expires = lexpire; if( msg->to==NULL || msg->to->body.s==NULL) diff --git a/modules/presence/subscribe.h b/modules/presence/subscribe.h index 00c02a3..550b840 100644 --- a/modules/presence/subscribe.h +++ b/modules/presence/subscribe.h @@ -113,10 +113,10 @@ void update_db_subs_timer(db1_con_t *db,db_func_t dbf, shtable_t hash_table, typedef void (*update_db_subs_t)(db1_con_t * ,db_func_t ,shtable_t ,int ,int , handle_expired_func_t); -int extract_sdialog_info(subs_t* subs,struct sip_msg* msg, int max_expire, +int extract_sdialog_info(subs_t* subs,struct sip_msg* msg, int min_expire, int max_expire, int* to_tag_gen, str scontact, str watcher_user, str watcher_domain); typedef int (*extract_sdialog_info_t)(subs_t* subs, struct sip_msg* msg, - int max_expire, int* to_tag_gen, str scontact, str watcher_user, + int min_expire, int max_expire, int* to_tag_gen, str scontact, str watcher_user, str watcher_domain); void delete_subs(str* pres_uri, str* ev_name, str* to_tag, str* from_tag, str* callid);

9 years, 9 months

[kamailio] presence : add min_expires param (#78)

by lazedo

some UAs send very low values for subscriptions causing unwanted flooding of the server with subscribe/notify messages this new parameter allows to set a minimum value for the subscription. default value is 0 to preserve existing behaviour You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/78 -- Commit Summary -- * presence : add min_expires param -- File Changes -- M modules/presence/presence.c (8) M modules/presence/presence.h (1) M modules/presence/subscribe.c (11) M modules/presence/subscribe.h (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/78.patch https://github.com/kamailio/kamailio/pull/78.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/78

9 years, 9 months

[kamailio] search_boundary() fails for binary content like SIP-I or SIP-T if in multipart mode (#83)

by jamesabravo

I've been playing about with SIP-T and the sipt module and it looks like search_boundary() in parser/parse_body.c fails for binary content like SIP-I or SIP-T if the content is split in multipart mode as in the case of a INVITE which contains SDP content and ISUP (binary) content. I commented out the following lines in search_boundary() and it seems to work ok now // /* go to the next line */ // while ((c < buf_end) && (*c != '\n')) c++; --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/83

9 years, 9 months

git:master:c3a7a4fc: Makefile: print run dir details in uninstall target

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c3a7a4fc929f82fe997cbcc6893bdd2f2679d85f URL: https://github.com/kamailio/kamailio/commit/c3a7a4fc929f82fe997cbcc6893bdd2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-02-12T13:40:00+01:00 Makefile: print run dir details in uninstall target - exporte the runbasedir to config.mak --- Modified: Makefile Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/c3a7a4fc929f82fe997cbcc6893bdd2… Patch: https://github.com/kamailio/kamailio/commit/c3a7a4fc929f82fe997cbcc6893bdd2… --- diff --git a/Makefile b/Makefile index f46e520..2892624 100644 --- a/Makefile +++ b/Makefile @@ -795,7 +795,7 @@ install-every-module-doc: $(foreach mods,$(modules_dirs),install-$(mods)-doc) install-every-module-man: $(foreach mods,$(modules_dirs),install-$(mods)-man) -install-utils: utils $(bin_prefix)/$(bin_dir) +install-utils: utils $(bin_prefix)/$(bin_dir) $(run_prefix)/$(run_dir) @for r in $(C_INSTALL_BIN) "" ; do \ if [ -n "$$r" ]; then \ if [ -f "$$r" ]; then \ @@ -1027,6 +1027,7 @@ uninstall: @echo " *LIBDIR Path is: ${lib_prefix}/${lib_dir}" @echo " *MANDIR Path is: ${man_prefix}/${man_dir}" @echo " *SHRDIR Path is: ${share_prefix}/${share_dir}" + @echo " *RUNDIR Path is: $(run_prefix)/$(run_dir)" @if [ "${PREFIX}" != "/usr/local" ] ; then \ echo "-Custom PREFIX Path" ; \ if [ "${PREFIX}" = "/" -o "${PREFIX}" = "/usr" ] ; then \ @@ -1057,6 +1058,7 @@ uninstall: echo "rm -rf ${doc_prefix}/${doc_dir}" ; \ echo "rm -rf ${lib_prefix}/${lib_dir}" ; \ echo "rm -rf ${share_prefix}/${share_dir}" ; \ + echo "rm -rf $(run_prefix)/$(run_dir)" ; \ echo ; \ echo "-WARNING: before running the commands, be sure they don't delete any system directory or file" ; \ fi ; diff --git a/Makefile.defs b/Makefile.defs index 37dedcd..545ffea 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -467,7 +467,7 @@ cfg_target = $(prefix)/$(cfg_dir) bin_target = $(prefix)/$(bin_dir) #modules_target = $(prefix)/$(modules_dir) lib_target = $(prefix)/$(lib_dir) -run_target = $(runbasedir)/$(run_dir) +run_target = $(run_prefix)/$(run_dir) doc_target = $(prefix)/$(doc_dir) data_target = $(prefix)/$(data_dir) @@ -2018,8 +2018,8 @@ saved_fixed_vars:= MAIN_NAME CFG_NAME SCR_NAME FLAVOUR INSTALL_FLAVOUR \ # extra: prefix DESTDIR BASEDIR basedirt saved_chg_vars:=\ CC_EXTRA_OPTS CPU CFLAGS_RM CFLAGS MOD_CFLAGS LIB_CFLAGS UTILS_CFLAGS \ - BASEDIR basedir DESTDIR LIBDIR \ - PREFIX prefix\ + BASEDIR basedir DESTDIR LIBDIR RUNBASEDIR runbasedir \ + PREFIX prefix \ cfg_prefix cfg_dir bin_prefix bin_dir modules_prefix modules_dir \ doc_prefix doc_dir man_prefix man_dir ut_prefix ut_dir \ share_prefix share_dir lib_prefix lib_dir data_prefix data_dir \

9 years, 9 months

git:master:47359a91: kamctl: use /tmp if $(basedir) is not set

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 47359a915b7d59e8ce88504e868ada5943d9fc9f URL: https://github.com/kamailio/kamailio/commit/47359a915b7d59e8ce88504e868ada5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-02-12T13:23:46+01:00 kamctl: use /tmp if $(basedir) is not set - it is used for temporary operations at install - without it fails to install, trying to use / for these operations --- Modified: utils/kamctl/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/47359a915b7d59e8ce88504e868ada5… Patch: https://github.com/kamailio/kamailio/commit/47359a915b7d59e8ce88504e868ada5…

9 years, 9 months

git:master:8c2b9ae3: Makefile: define RUN_DIR at compile time

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8c2b9ae30b6adb22a6777b7493bf1e50e86e6c8d URL: https://github.com/kamailio/kamailio/commit/8c2b9ae30b6adb22a6777b7493bf1e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-02-12T13:02:07+01:00 Makefile: define RUN_DIR at compile time - default to /var/run/kamailio - obeys the PREFIX, becomeing $(PREFIX)/var/run/kamailio - based on GH issue #80 --- Modified: Makefile Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/8c2b9ae30b6adb22a6777b7493bf1e5… Patch: https://github.com/kamailio/kamailio/commit/8c2b9ae30b6adb22a6777b7493bf1e5… --- diff --git a/Makefile b/Makefile index a949fbd..f46e520 100644 --- a/Makefile +++ b/Makefile @@ -663,7 +663,7 @@ man: $(foreach mods,$(modules_dirs),$(mods)-man) mk-install_dirs: $(cfg_prefix)/$(cfg_dir) $(bin_prefix)/$(bin_dir) \ $(modules_prefix)/$(modules_dir) $(doc_prefix)/$(doc_dir) \ $(man_prefix)/$(man_dir)/man8 $(man_prefix)/$(man_dir)/man5 \ - $(share_prefix)/$(share_dir) \ + $(share_prefix)/$(share_dir) $(run_prefix)/$(run_dir) \ $(foreach mods,$(modules_dirs),\ $(modules_prefix)/$(modules_dir)$(mods) \ $(doc_prefix)/$(doc_dir)$(mods) ) @@ -671,6 +671,9 @@ mk-install_dirs: $(cfg_prefix)/$(cfg_dir) $(bin_prefix)/$(bin_dir) \ $(cfg_prefix)/$(cfg_dir): mkdir -p $(cfg_prefix)/$(cfg_dir) +$(run_prefix)/$(run_dir): + mkdir -p $(run_prefix)/$(run_dir) + $(bin_prefix)/$(bin_dir): mkdir -p $(bin_prefix)/$(bin_dir) diff --git a/Makefile.defs b/Makefile.defs index b0a3e57..37dedcd 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -377,7 +377,7 @@ share_dir = share/$(MAIN_NAME)/ # lib/$(MAIN_NAME)/modules , lib/$(MAIN_NAME)/modules-s, lib/$(MAIN_NAME)/modules-k modules_dir = $(LIBDIR)/$(MAIN_NAME)/ lib_dir = $(LIBDIR)/$(MAIN_NAME)/ - +run_dir = var/run/$(MAIN_NAME)/ doc_dir = doc/$(MAIN_NAME)/ man_dir = man/ data_dir = $(MAIN_NAME)/ @@ -429,6 +429,17 @@ LOCALBASE ?= /usr/local # Doxygen directory doxygen_dir=doc/doxygen +BASEDIR ?= $(DESTDIR) +basedir = $(BASEDIR) + +ifeq ($(BASEDIR),) +RUNBASEDIR ?= $(PREFIX) +else +RUNBASEDIR ?= $(BASEDIR)/$(PREFIX) +endif + +runbasedir = $(RUNBASEDIR) + # install location PREFIX ?= $(LOCALBASE) prefix = $(PREFIX) @@ -438,13 +449,12 @@ prefix = $(PREFIX) # basedir=/tmp # prefix=/usr/local -BASEDIR ?= $(DESTDIR) -basedir = $(BASEDIR) # install prefixes for various stuff cfg_prefix = $(basedir)$(prefix) bin_prefix = $(basedir)$(prefix) modules_prefix = $(basedir)$(prefix) lib_prefix = $(basedir)$(prefix) +run_prefix = $(runbasedir) doc_prefix = $(basedir)$(prefix) man_prefix = $(basedir)$(prefix) ut_prefix = $(basedir)$(prefix) @@ -457,6 +467,7 @@ cfg_target = $(prefix)/$(cfg_dir) bin_target = $(prefix)/$(bin_dir) #modules_target = $(prefix)/$(modules_dir) lib_target = $(prefix)/$(lib_dir) +run_target = $(runbasedir)/$(run_dir) doc_target = $(prefix)/$(doc_dir) data_target = $(prefix)/$(data_dir) @@ -613,6 +624,7 @@ C_DEFS= $(extra_defs) \ -D__CPU_$(ARCH) $(os_defs) \ -DSER_VER=$(SER_VER) \ -DCFG_DIR='"$(cfg_target)"'\ + -DRUN_DIR='"$(run_target)"'\ -DPKG_MALLOC \ -DSHM_MEM -DSHM_MMAP \ -DDNS_IP_HACK \ @@ -2011,7 +2023,7 @@ saved_chg_vars:=\ cfg_prefix cfg_dir bin_prefix bin_dir modules_prefix modules_dir \ doc_prefix doc_dir man_prefix man_dir ut_prefix ut_dir \ share_prefix share_dir lib_prefix lib_dir data_prefix data_dir \ - cfg_target lib_target data_target + cfg_target lib_target data_target run_prefix run_dir run_target #export relevant variables to the sub-makes

9 years, 9 months

Developer visibility on Github poject

by Daniel-Constantin Mierla

Hello, short note for developers about membership visibility to a GitHub project - by default the membership is not visible, if you want to turn it on, see the guidelines at: - https://help.github.com/articles/publicizing-or-concealing-organization-mem… This is for the case when you are not logged in (or for people not part of the project) -- in other words, turn it on if you want your github public profile to show you are developer of Kamailio project. Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio World Conference, May 27-29, 2015 Berlin, Germany - http://www.kamailioworld.com

9 years, 9 months

Roadmap to next major release 4.3.0

by Daniel-Constantin Mierla

Hello, being discussed yesterday during the IRC devel meeting, the proposed planning for next major release (v4.3.0) is: - freeze the development sometime in April - after mid of March decide the exact date when the development is going to be frozen - testing during last part of April and May - based on testing results, release in the time frame: end of May till mid of June >From git activity, there are already several new modules and plenty of new features -- don't forget to add them to: - http://www.kamailio.org/wiki/features/new-in-devel Also, any detail that is relevant for upgrading has to added to: - https://www.kamailio.org/wiki/install/upgrade/stable-to-devel Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio World Conference, May 27-29, 2015 Berlin, Germany - http://www.kamailioworld.com

9 years, 9 months

git:4.2:458e8ba0: sqlops: regenereated the readme file

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: 458e8ba0ff7a7453050734c47f71a7b9bcaa03a6 URL: https://github.com/kamailio/kamailio/commit/458e8ba0ff7a7453050734c47f71a7b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-02-12T09:52:40+01:00 sqlops: regenereated the readme file (cherry picked from commit 61d6b119398a87c4a877de3fba0dc9c6ec2830a7) --- Modified: modules/sqlops/README --- Diff: https://github.com/kamailio/kamailio/commit/458e8ba0ff7a7453050734c47f71a7b… Patch: https://github.com/kamailio/kamailio/commit/458e8ba0ff7a7453050734c47f71a7b… --- diff --git a/modules/sqlops/README b/modules/sqlops/README index 1ad1be6..ccf03b3 100644 --- a/modules/sqlops/README +++ b/modules/sqlops/README @@ -280,7 +280,8 @@ sql_result_free("ra"); module (e.g., db_mysql). The query is executed in another process and result is not available back to config, thus it should be used only for sql statements that don't return values (e.g., insert, delete, - update...). + update...). Note that async_workers core parameter must be set in order + to enable the asyncronous framework needed by this function. * connection - the name of the connection to be used for the query (defined via "sqlcon" parameter). * query - SQL query string or pseudo-variables containing SQL query.

9 years, 9 months

← Newer
1
...
14
15
16
17
18
19
20
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2015