sr-dev October 2018

sr-dev@lists.kamailio.org

23 participants
274 discussions

git:master:b5f2aabb: core: remove a code block related to hash functions, deactivated with #ifdef since 2002

by Henning Westerholt

Module: kamailio Branch: master Commit: b5f2aabbc692dedff4788e4470ea534d90c7cab4 URL: https://github.com/kamailio/kamailio/commit/b5f2aabbc692dedff4788e4470ea534… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-10-07T09:48:05+02:00 core: remove a code block related to hash functions, deactivated with #ifdef since 2002 --- Modified: src/core/hash_func.c --- Diff: https://github.com/kamailio/kamailio/commit/b5f2aabbc692dedff4788e4470ea534… Patch: https://github.com/kamailio/kamailio/commit/b5f2aabbc692dedff4788e4470ea534… --- diff --git a/src/core/hash_func.c b/src/core/hash_func.c index 939361a4aa..71d12f0d25 100644 --- a/src/core/hash_func.c +++ b/src/core/hash_func.c @@ -79,18 +79,6 @@ unsigned int new_hash( str call_id, str cseq_nr ) hash_code+=ccitt_tab[(unsigned char)*(cs+i)+123]; /* hash_code conditioning */ -#ifdef _BUG - /* not flat ... % 111b has shorter period than - & 111b by one and results in different distribution; - ( 7 % 7 == 0, 7 %7 == 1 ) - % is used as a part of the hash function too, not only - for rounding; & is not flat; whoever comes up with - a nicer flat hash function which does not take - costly division is welcome; feel free to verify - distribution using hashtest() - */ - hash_code &= (TABLE_ENTRIES-1); /* TABLE_ENTRIES = 2^k */ -#endif hash_code=hash_code%(TABLE_ENTRIES-1)+1; return hash_code; }

6 years, 2 months

git:master:a9a47c22: core: remove old and not working function, deactivated with an #ifdef since 2003

by Henning Westerholt

Module: kamailio Branch: master Commit: a9a47c2295f55fbb9928e7798994e9aad0590055 URL: https://github.com/kamailio/kamailio/commit/a9a47c2295f55fbb9928e7798994e9a… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-10-07T09:38:24+02:00 core: remove old and not working function, deactivated with an #ifdef since 2003 --- Modified: src/core/flags.c --- Diff: https://github.com/kamailio/kamailio/commit/a9a47c2295f55fbb9928e7798994e9a… Patch: https://github.com/kamailio/kamailio/commit/a9a47c2295f55fbb9928e7798994e9a… --- diff --git a/src/core/flags.c b/src/core/flags.c index ae2d32486b..5b603706e3 100644 --- a/src/core/flags.c +++ b/src/core/flags.c @@ -249,77 +249,6 @@ int register_flag(char* name, int pos) -#ifdef _GET_AWAY - -/* wrapping functions for flag processing */ -static int fixup_t_flag(void** param, int param_no) -{ - unsigned int *code; - char *c; - int token; - - LM_DBG("fixing flag: %s\n", (char *) (*param)); - - if (param_no!=1) { - LM_ERR("TM module: only parameter #1 for flags can be fixed\n"); - return E_BUG; - }; - - if ( !(code =pkg_malloc( sizeof( unsigned int) )) ) return E_OUT_OF_MEM; - - *code = 0; - c = *param; - while ( *c && (*c==' ' || *c=='\t')) c++; /* initial whitespaces */ - - token=1; - if (strcasecmp(c, "white")==0) *code=FL_WHITE; - else if (strcasecmp(c, "yellow")==0) *code=FL_YELLOW; - else if (strcasecmp(c, "green")==0) *code=FL_GREEN; - else if (strcasecmp(c, "red")==0) *code=FL_RED; - else if (strcasecmp(c, "blue")==0) *code=FL_BLUE; - else if (strcasecmp(c, "magenta")==0) *code=FL_MAGENTA; - else if (strcasecmp(c, "brown")==0) *code=FL_BROWN; - else if (strcasecmp(c, "black")==0) *code=FL_BLACK; - else if (strcasecmp(c, "acc")==0) *code=FL_ACC; - else { - token=0; - while ( *c && *c>='0' && *c<='9' ) { - *code = *code*10+ *c-'0'; - if (*code > (sizeof( flag_t ) * CHAR_BIT - 1 )) { - LM_ERR("TM module: too big flag number: %s; MAX=%d\n", - (char *) (*param), sizeof( flag_t ) * CHAR_BIT - 1 ); - goto error; - } - c++; - } - } - while ( *c && (*c==' ' || *c=='\t')) c++; /* terminating whitespaces */ - - if ( *code == 0 ) { - LM_ERR("TM module: bad flag number: %s\n", (char *) (*param)); - goto error; - } - - if (*code < FL_MAX && token==0) { - LM_ERR("TM module: too high flag number: %s (%d)\n; lower number" - " below %d reserved\n", (char *) (*param), *code, FL_MAX ); - goto error; - } - - /* free string */ - pkg_free( *param ); - /* fix now */ - *param = code; - - return 0; - -error: - pkg_free( code ); - return E_CFG; -} - -#endif - /** * */

6 years, 2 months

git:master:aae3dcec: core: MOD_KAMAILIO/MOD_SER DB URL defines, cleanup after commit #1f70d062b0b9cf1e

by Henning Westerholt

Module: kamailio Branch: master Commit: aae3dcec8d755c5da601a515be1725abe5e4cc3c URL: https://github.com/kamailio/kamailio/commit/aae3dcec8d755c5da601a515be1725a… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-10-07T09:28:39+02:00 core: MOD_KAMAILIO/MOD_SER DB URL defines, cleanup after commit #1f70d062b0b9cf1e --- Modified: src/core/config.h --- Diff: https://github.com/kamailio/kamailio/commit/aae3dcec8d755c5da601a515be1725a… Patch: https://github.com/kamailio/kamailio/commit/aae3dcec8d755c5da601a515be1725a… --- diff --git a/src/core/config.h b/src/core/config.h index e87288f730..bdc7657365 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -186,18 +186,10 @@ #define PATH_MAX_GUESS 1024 /*!< maximum path length */ -#if defined KAMAILIO_MOD_INTERFACE || defined OPENSER_MOD_INTERFACE || \ - defined MOD_INTERFACE_V1 - #define DEFAULT_DB_URL "mysql://kamailio:kamailiorw@localhost/kamailio" - #define DEFAULT_DB_URL_LEN (sizeof(DEFAULT_DB_URL) - 1) - #define DEFAULT_RODB_URL "mysql://kamailioro:kamailioro@localhost/kamailio" - #define DEFAULT_RODB_URL_LEN (sizeof(DEFAULT_RODB_URL) - 1) -#else - #define DEFAULT_DB_URL "mysql://ser:heslo@localhost/ser" - #define DEFAULT_DB_URL_LEN (sizeof(DEFAULT_DB_URL) - 1) - #define DEFAULT_RODB_URL "mysql://serro:47serro11@localhost/ser" - #define DEFAULT_RODB_URL_LEN (sizeof(DEFAULT_RODB_URL) - 1) -#endif +#define DEFAULT_DB_URL "mysql://kamailio:kamailiorw@localhost/kamailio" +#define DEFAULT_DB_URL_LEN (sizeof(DEFAULT_DB_URL) - 1) +#define DEFAULT_RODB_URL "mysql://kamailioro:kamailioro@localhost/kamailio" +#define DEFAULT_RODB_URL_LEN (sizeof(DEFAULT_RODB_URL) - 1) #define VERSION_TABLE "version" /*!< table holding versions of other ser tables */ #define VERSION_TABLE_LEN (sizeof(VERSION_TABLE) - 1)

6 years, 2 months

git:master:2b8c4f1d: Makefile.modules: SER_MOD_INTERFACE/KAMAILIO_MOD_INTERFACE cleanup after commit #1f70d062b0b9cf1e

by Henning Westerholt

Module: kamailio Branch: master Commit: 2b8c4f1d4f5e5110ad1ed15b2a228a76122eb8f7 URL: https://github.com/kamailio/kamailio/commit/2b8c4f1d4f5e5110ad1ed15b2a228a7… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-10-07T09:27:30+02:00 Makefile.modules: SER_MOD_INTERFACE/KAMAILIO_MOD_INTERFACE cleanup after commit #1f70d062b0b9cf1e --- Modified: src/Makefile.modules --- Diff: https://github.com/kamailio/kamailio/commit/2b8c4f1d4f5e5110ad1ed15b2a228a7… Patch: https://github.com/kamailio/kamailio/commit/2b8c4f1d4f5e5110ad1ed15b2a228a7… --- diff --git a/src/Makefile.modules b/src/Makefile.modules index 8649db2756..7c3722d03e 100644 --- a/src/Makefile.modules +++ b/src/Makefile.modules @@ -61,13 +61,6 @@ override static_modules_path= DEFS += -DMOD_NAME='"$(MOD_NAME)"' -ifeq (,$(findstring -DSER_MOD_INTERFACE, $(DEFS))) - MODIFACE=-DKAMAILIO_MOD_INTERFACE -else - MODIFACE=-DSER_MOD_INTERFACE -endif - - ifneq ($(makefile_defs_included),1) $(error "the local makefile does not include Makefile.defs!") endif

6 years, 2 months

git:master:a94a7e03: cdp: remove a SER_MOD_INTERFACE usage, cleanup after commit #1f70d062b0b9cf1e

by Henning Westerholt

Module: kamailio Branch: master Commit: a94a7e0360b30d05f48720d81b7ba4268b6384f6 URL: https://github.com/kamailio/kamailio/commit/a94a7e0360b30d05f48720d81b7ba42… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-10-07T09:25:44+02:00 cdp: remove a SER_MOD_INTERFACE usage, cleanup after commit #1f70d062b0b9cf1e --- Modified: src/modules/cdp/globals.c --- Diff: https://github.com/kamailio/kamailio/commit/a94a7e0360b30d05f48720d81b7ba42… Patch: https://github.com/kamailio/kamailio/commit/a94a7e0360b30d05f48720d81b7ba42… --- diff --git a/src/modules/cdp/globals.c b/src/modules/cdp/globals.c index 70efb4ece7..5eaf4c2a77 100644 --- a/src/modules/cdp/globals.c +++ b/src/modules/cdp/globals.c @@ -63,11 +63,7 @@ // //#ifdef SHM_MEM // -// if (init_shm_mallocs( -//#ifdef SER_MOD_INTERFACE -// 1 -//#endif -// )==-1) +// if (init_shm_mallocs()==-1) // goto error; // if (show_status){ // LM_DBG( "Memory status (shm):\n");

6 years, 2 months

git:master:9dcab6fc: kam_to_sr.sh: add a note that this script is now obselete

by Henning Westerholt

Module: kamailio Branch: master Commit: 9dcab6fcc9e40253e3f9b451af533fe02b96a7c3 URL: https://github.com/kamailio/kamailio/commit/9dcab6fcc9e40253e3f9b451af533fe… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-10-07T09:16:20+02:00 kam_to_sr.sh: add a note that this script is now obselete --- Modified: misc/scripts/kam_to_sr.sh --- Diff: https://github.com/kamailio/kamailio/commit/9dcab6fcc9e40253e3f9b451af533fe… Patch: https://github.com/kamailio/kamailio/commit/9dcab6fcc9e40253e3f9b451af533fe… --- diff --git a/misc/scripts/kam_to_sr.sh b/misc/scripts/kam_to_sr.sh index 32f1e037f7..212c0ba7e0 100755 --- a/misc/scripts/kam_to_sr.sh +++ b/misc/scripts/kam_to_sr.sh @@ -1,5 +1,8 @@ #!/usr/bin/env sh # +# Note: This script is obselete, especially after the changes in commit +# 1f70d062b0b9cf1e, the module interface unification. +# # This is a simple script which attempts to convert kamailio modules so that # they can be used with the sip-router core. Most of the changes done by the # script deal with the changes in the database abstraction layer in the

6 years, 2 months

git:master:e4a40838: siputils: use spve fixup instead of pvar

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e4a408385c6b56c2f623a131d92246484cfb2720 URL: https://github.com/kamailio/kamailio/commit/e4a408385c6b56c2f623a131d922464… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-06T22:35:55+02:00 siputils: use spve fixup instead of pvar - it includes the later, plus more flexibility to allow static or dynamic strings --- Modified: src/modules/siputils/checks.c Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/e4a408385c6b56c2f623a131d922464… Patch: https://github.com/kamailio/kamailio/commit/e4a408385c6b56c2f623a131d922464… --- diff --git a/src/modules/siputils/checks.c b/src/modules/siputils/checks.c index b700c620c0..ee60595e3a 100644 --- a/src/modules/siputils/checks.c +++ b/src/modules/siputils/checks.c @@ -134,30 +134,17 @@ int w_has_totag(struct sip_msg* _m, char* _foo, char* _bar) */ int is_uri(struct sip_msg* _m, char* _sp, char* _s2) { - pv_spec_t *sp; - pv_value_t pv_val; sip_uri_t turi; + str uval; - sp = (pv_spec_t *)_sp; - - if (sp && (pv_get_spec_value(_m, sp, &pv_val) == 0)) { - if (pv_val.flags & PV_VAL_STR) { - if (pv_val.rs.len == 0 || pv_val.rs.s == NULL) { - LM_DBG("missing argument\n"); - return -1; - } - if(parse_uri(pv_val.rs.s, pv_val.rs.len, &turi)!=0) { - return -1; - } - return 1; - } else { - LM_ERR("pseudo variable value is not string\n"); - return -1; - } - } else { - LM_ERR("failed to get pseudo variable value\n"); + if(fixup_get_svalue(_m, (gparam_t*)_sp, &uval)!=0) { + LM_ERR("cannot get parameter value\n"); return -1; } + if(parse_uri(uval.s, uval.len, &turi)!=0) { + return -1; + } + return 1; } /* diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index 50cd7425aa..bfd90d020a 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -137,8 +137,8 @@ static cmd_export_t cmds[]={ free_fixup_get_uri_param, REQUEST_ROUTE|LOCAL_ROUTE}, {"tel2sip", (cmd_function)tel2sip, 3, fixup_tel2sip, 0, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE}, - {"is_uri", (cmd_function)is_uri, 1, fixup_pvar_null, - fixup_free_pvar_null, ANY_ROUTE}, + {"is_uri", (cmd_function)is_uri, 1, fixup_spve_null, + fixup_free_spve_null, ANY_ROUTE}, {"is_e164", (cmd_function)is_e164, 1, fixup_pvar_null, fixup_free_pvar_null, REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, {"is_uri_user_e164", (cmd_function)w_is_uri_user_e164, 1, fixup_pvar_null,

6 years, 2 months

git:master:1f99806f: Makefile.defs: cleanup the CPUTYPE/mtune definitions for i386 and x86_64

by Henning Westerholt

Module: kamailio Branch: master Commit: 1f99806fa2db09b9ac6da7fbeb388a93c7638f13 URL: https://github.com/kamailio/kamailio/commit/1f99806fa2db09b9ac6da7fbeb388a9… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-10-06T18:04:00+02:00 Makefile.defs: cleanup the CPUTYPE/mtune definitions for i386 and x86_64 - Makefile.defs: cleanup the CPUTYPE/mtune definitions for i386 and x86_64 - revert change c925278b8ee3492f71a from 2011 for gcc SUSE 4.5.x, now not needed - use for current gcc (>= gcc 4.2) the generic mtune, which is now available - From the gcc manual: "Produce code optimized for the most common IA32/AMD64/EM64T processors. If you know the CPU on which your code will run, then you should use the corresponding -mtune or -march option instead of -mtune=generic. But, if you do not know exactly what CPU users of your application will have, then you should use this option. As new processors are deployed in the marketplace, the behavior of this option will change. Therefore, if you upgrade to a newer version of GCC, code generation controlled by this option will change to reflect the processors that are most common at the time that version of GCC is released. - unify opteron usage, use equivalent athlon64 mtune for old compilers instead - simplify x86_64 gcc logic, remove now redundant 4.2.x if case - there should be no performance implications, as we compile without debugging - we prefer right now to have proper debugging, this would break with agressive optimization --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/1f99806fa2db09b9ac6da7fbeb388a9… Patch: https://github.com/kamailio/kamailio/commit/1f99806fa2db09b9ac6da7fbeb388a9… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index ee5fffa209..fe4dc4ce2f 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -888,7 +888,7 @@ ifeq ($(CC_NAME), gcc) CFLAGS=-g $(CC_OPT) -funroll-loops -Wcast-align $(PROFILE) #if gcc 8.0+, 7.0+, 6.0+, 5.0+, 4.5+ or 4.2+ ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+,$(CC_SHORTVER)))) -$(call set_if_empty,CPUTYPE,athlon64) +$(call set_if_empty,CPUTYPE,generic) CFLAGS+=-m32 -minline-all-stringops \ -falign-loops \ -ftree-vectorize \ @@ -969,18 +969,8 @@ ifeq ($(CC_NAME), gcc) #common stuff CFLAGS=-g $(CC_OPT) -funroll-loops -Wcast-align $(PROFILE) #if gcc 4.5+ - # don't add '-mtune=$(CPUTYPE)' - gcc failure -ifeq ($(CC_SHORTVER),$(filter $(CC_SHORTVER),4.5+ 5.0+ 6.0+ 7.0+ 8.0+)) -$(call set_if_empty,CPUTYPE,opteron) - CFLAGS+=-m64 -minline-all-stringops \ - -falign-loops \ - -ftree-vectorize \ - -fno-strict-overflow - LDFLAGS+=-m64 -else - #if gcc 4.2+ -ifeq ($(CC_SHORTVER), 4.2+) -$(call set_if_empty,CPUTYPE,opteron) +ifeq ($(CC_SHORTVER),$(filter $(CC_SHORTVER),4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+)) +$(call set_if_empty,CPUTYPE,generic) CFLAGS+=-m64 -minline-all-stringops \ -falign-loops \ -ftree-vectorize \ @@ -990,7 +980,7 @@ $(call set_if_empty,CPUTYPE,opteron) else #if gcc 4.0+ ifeq ($(CC_SHORTVER), 4.x) -$(call set_if_empty,CPUTYPE,opteron) +$(call set_if_empty,CPUTYPE,athlon64) CFLAGS+=-m64 -minline-all-stringops \ -falign-loops \ -ftree-vectorize \ @@ -1028,7 +1018,6 @@ endif # CC_SHORTVER, 2.9x endif # CC_SHORTVER, 3.0 endif # CC_SHORTVER, 3.4 endif # CC_SHORTVER, 4.x -endif # CC_SHORTVER, 4.2+ endif # CC_SHORTVER, 8.0+, 7.0+, 6.0+, 5.0+, 4.5+ else # CC_NAME, gcc

6 years, 2 months

git:master:13ea0ae7: modules: readme files regenerated - dispatcher ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 13ea0ae72b0213125e8797dbfc143eb1e774726d URL: https://github.com/kamailio/kamailio/commit/13ea0ae72b0213125e8797dbfc143eb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-10-05T21:46:30+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README Modified: src/modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/13ea0ae72b0213125e8797dbfc143eb… Patch: https://github.com/kamailio/kamailio/commit/13ea0ae72b0213125e8797dbfc143eb… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 90faef20ac..c90e631a94 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -993,7 +993,7 @@ modparam("dispatcher", "ds_db_extra_attrs", "socket=socket;pref=prefix") tolerance. When facing congestion the weight of a gateway is lowered by 1 for every ms of estimated congestion, a 'rweight' value of 50 is recommended. See the example "configuring load - balancing with congestion detection" bellow. + balancing with congestion detection" below. The congestion estimation is done using an EWMA (see ds_latency_estimator_alpha). If all the gateways in a set are above their congestion threshold(weight), the load diff --git a/src/modules/presence/README b/src/modules/presence/README index f40ff9ecd6..74f1a8f337 100644 --- a/src/modules/presence/README +++ b/src/modules/presence/README @@ -1272,7 +1272,7 @@ typedef int (get_rules_doc_t)(str* user, str* domain, str** rules_doc); used in obtaining the status of the subscription and processing the notified body. A reference to the document should be put in the auth_rules_doc of the subs_t structure given as a parameter to the - functions described bellow. + functions described below. 4. get_auth_status

6 years, 2 months

git:master:d753fc32: presence: small spelling fix (bellow -> below)

by Henning Westerholt

Module: kamailio Branch: master Commit: d753fc32b8aaa70990ec764be33cd9b0bd5f044a URL: https://github.com/kamailio/kamailio/commit/d753fc32b8aaa70990ec764be33cd9b… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-10-05T21:41:33+02:00 presence: small spelling fix (bellow -> below) --- Modified: src/modules/presence/doc/presence_devel.xml --- Diff: https://github.com/kamailio/kamailio/commit/d753fc32b8aaa70990ec764be33cd9b… Patch: https://github.com/kamailio/kamailio/commit/d753fc32b8aaa70990ec764be33cd9b… --- diff --git a/src/modules/presence/doc/presence_devel.xml b/src/modules/presence/doc/presence_devel.xml index 8b2426d4ac..608fa6eeb5 100644 --- a/src/modules/presence/doc/presence_devel.xml +++ b/src/modules/presence/doc/presence_devel.xml @@ -149,7 +149,7 @@ typedef int (get_rules_doc_t)(str* user, str* domain, str** rules_doc); used in obtaining the status of the subscription and processing the notified body. A reference to the document should be put in the auth_rules_doc of the subs_t structure given as a parameter to the - functions described bellow. + functions described below. </para> </section>

6 years, 2 months

← Newer
1
...
16
17
18
19
20
21
22
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2018