sr-dev April 2009

sr-dev@lists.kamailio.org

13 participants
230 discussions

implicit declaration of function ??syscall???=
by jh＠tutpro.com 20 Apr '09

20 Apr '09

i tried to move presence modules to modules directory, but got this kind of error message a few times: gcc -fPIC -DPIC -g -O9 -funroll-loops -Wcast-align -minline-all-stringops -falign-loops -ftree-vectorize -mtune=athlon64 -Wall -DNAME='"ser"' -DVERSION='"2.1.0-dev23-make"' -DARCH='"i386"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 4.3.2"' -D__CPU_i386 -D__OS_linux -DSER_VER=2001000 -DCFG_DIR='"/usr/local/etc/ser/"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_IPV6 -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DDBG_QM_MALLOC -DUSE_TLS -DTLS_HOOKS -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT -DUSE_SCTP -I/usr/include/libxml2 -I/usr/local/include/libxml2 -I/usr/local/include -DOPENSER_MOD_INTERFACE -DMOD_NAME='"presence_dialoginfo"' -c pidf.c -o pidf.o In file included from ../../parser/../mem/../lock_ops.h:85, from ../../parser/../mem/shm_mem.h:76, from ../../parser/../ut.h:67, from ../../parser/../ip_addr.h:49, from ../../parser/msg_parser.h:57, from ../../sr_module.h:63, from pidf.c:54: ../../parser/../mem/../futexlock.h: In function ??futex_get??: ../../parser/../mem/../futexlock.h:94: warning: implicit declaration of function ??syscall?? any idea how to make the declaration explicit? -- juha

2 1

git:master: presence_dialoginfo(k): futex warning fix
by Andrei Pelinescu-Onciul 20 Apr '09

20 Apr '09

Module: sip-router Branch: master Commit: aa416e89057be4112fe0ba40aa24c14e9a5d9f82 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aa416e8… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Apr 20 10:47:34 2009 +0200 presence_dialoginfo(k): futex warning fix - added _BSD_SOURCE define if _XOPEN_SOURCE is manually defined (the _XOPEN_SOURCE define in pidf.c caused _BSD_SOURCE to be no longer defined in features.h => _USE_MISC not defined => syscall() not declared in unistd.h.) --- modules_k/presence_dialoginfo/pidf.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules_k/presence_dialoginfo/pidf.c b/modules_k/presence_dialoginfo/pidf.c index e2b3222..9285d2b 100644 --- a/modules_k/presence_dialoginfo/pidf.c +++ b/modules_k/presence_dialoginfo/pidf.c @@ -38,6 +38,9 @@ */ #ifndef __OS_solaris #define _XOPEN_SOURCE 600 /* glibc2 on linux, bsd */ + #define _BSD_SOURCE 1 /* needed on linux to "fix" the effect + of the above define on + features.h/unistd.h syscall() */ #else #define _XOPEN_SOURCE_EXTENDED 1 /* solaris */ #endif

1 0

git:master: * Fixed reference to TXT record string value.
by Juha Heinanen 20 Apr '09

20 Apr '09

Module: sip-router Branch: master Commit: ab40d3447b6e0501e3882a04d533f550e8a54453 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ab40d34… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon Apr 20 09:36:55 2009 +0300 * Fixed reference to TXT record string value. --- modules/enum/enum.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/enum/enum.c b/modules/enum/enum.c index c8bbd7f..1477a4f 100644 --- a/modules/enum/enum.c +++ b/modules/enum/enum.c @@ -880,7 +880,7 @@ int i_enum_query_2(struct sip_msg* _msg, char* _suffix, char* _service) LM_DBG("TXT found for %s. Defaulting to %d\n", name, cc_len); } else { - sdl = atoi(((struct txt_rdata*)head->rdata)->txt); + sdl = atoi(((struct txt_rdata*)head->rdata)->txt[0].cstr); LM_DBG("TXT record for %s is %d.\n", name, sdl); if ((sdl < 0) || (sdl > 10)) {

1 0

git:master: * Modules: auth_radius, mediaproxy
by Juha Heinanen 20 Apr '09

20 Apr '09

Module: sip-router Branch: master Commit: 5a311129d392f9ac90690306b20cd5af32c356c2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5a31112… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon Apr 20 08:58:44 2009 +0300 * Modules: auth_radius, mediaproxy Changed auth and dialog module includes to point to corresponding k modules. TODO: Integrate k and s auth and dialog modules. --- modules/auth_radius/authorize.c | 2 +- modules/auth_radius/authrad_mod.h | 2 +- modules/auth_radius/sterman.c | 2 +- modules/mediaproxy/mediaproxy.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/auth_radius/authorize.c b/modules/auth_radius/authorize.c index df03f4e..7389c47 100644 --- a/modules/auth_radius/authorize.c +++ b/modules/auth_radius/authorize.c @@ -41,7 +41,7 @@ #include "../../dprint.h" #include "../../ut.h" #include "../../pvar.h" -#include "../auth/api.h" +#include "../../modules_k/auth/api.h" #include "authorize.h" #include "sterman.h" #include "authrad_mod.h" diff --git a/modules/auth_radius/authrad_mod.h b/modules/auth_radius/authrad_mod.h index 39727d8..50b9940 100644 --- a/modules/auth_radius/authrad_mod.h +++ b/modules/auth_radius/authrad_mod.h @@ -30,7 +30,7 @@ #ifndef AUTHRAD_MOD_H #define AUTHRAD_MOD_H -#include "../auth/api.h" +#include "../../modules_k/auth/api.h" #include "../../lib/kcore/radius.h" extern struct attr attrs[]; diff --git a/modules/auth_radius/sterman.c b/modules/auth_radius/sterman.c index e8c78cf..cd4a958 100644 --- a/modules/auth_radius/sterman.c +++ b/modules/auth_radius/sterman.c @@ -35,7 +35,7 @@ #include "../../usr_avp.h" #include "../../lib/kcore/radius.h" #include "../../ut.h" -#include "../auth/api.h" +#include "../../modules_k/auth/api.h" #include "sterman.h" #include "authrad_mod.h" #include "extra.h" diff --git a/modules/mediaproxy/mediaproxy.c b/modules/mediaproxy/mediaproxy.c index c7fa9a3..37e0353 100644 --- a/modules/mediaproxy/mediaproxy.c +++ b/modules/mediaproxy/mediaproxy.c @@ -46,8 +46,8 @@ #include "../../parser/parse_from.h" #include "../../parser/parse_to.h" #include "../../msg_translator.h" -#include "../dialog/dlg_load.h" -#include "../dialog/dlg_hash.h" +#include "../../modules_k/dialog/dlg_load.h" +#include "../../modules_k/dialog/dlg_hash.h" MODULE_VERSION

1 0

git:master: * Module: mediaproxy
by Juha Heinanen 20 Apr '09

20 Apr '09

Module: sip-router Branch: master Commit: ee7c37af07d920486dd958ca30f06510239e983c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ee7c37a… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon Apr 20 08:42:45 2009 +0300 * Module: mediaproxy Moved modules_k/mediaproxy to modules and removed modules_s/mediaproxy. --- {modules_k => modules}/mediaproxy/Makefile | 0 {modules_k => modules}/mediaproxy/README | 0 .../mediaproxy/doc/mediaproxy.xml | 0 .../mediaproxy/doc/mediaproxy_admin.xml | 0 {modules_k => modules}/mediaproxy/mediaproxy.c | 0 modules_s/mediaproxy/Makefile | 16 - modules_s/mediaproxy/Readme | 259 ---- modules_s/mediaproxy/config/Readme | 8 - modules_s/mediaproxy/config/rtp-asymmetric-clients | 12 - modules_s/mediaproxy/config/ser.cfg | 118 -- modules_s/mediaproxy/config/sip-asymmetric-clients | 14 - modules_s/mediaproxy/functions.h | 194 --- modules_s/mediaproxy/mediaproxy.c | 1604 -------------------- 13 files changed, 0 insertions(+), 2225 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ee7…

1 0

git:master: * Modules: enum
by Juha Heinanen 20 Apr '09

20 Apr '09

Module: sip-router Branch: master Commit: 81198ed38e7271f9298650f90ed1776c64e924fe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=81198ed… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon Apr 20 08:39:53 2009 +0300 * Modules: enum Moved modules_k/enum to modules and removed modules_s/enum. --- {modules_k => modules}/enum/Makefile | 0 {modules_k => modules}/enum/README | 0 {modules_k => modules}/enum/doc/enum.xml | 0 {modules_k => modules}/enum/doc/enum_admin.xml | 0 {modules_k => modules}/enum/enum.c | 0 {modules_k => modules}/enum/enum.h | 0 {modules_k => modules}/enum/enum_mod.c | 0 {modules_k => modules}/enum/enum_mod.h | 0 modules_s/enum/Makefile | 15 - modules_s/enum/README | 159 -------- modules_s/enum/doc/Makefile | 29 -- modules_s/enum/doc/enum.xml | 95 ----- modules_s/enum/doc/functions.xml | 83 ---- modules_s/enum/doc/params.xml | 58 --- modules_s/enum/enum.c | 476 ------------------------ modules_s/enum/enum.h | 54 --- modules_s/enum/enum_mod.c | 87 ----- modules_s/enum/enum_mod.h | 42 -- modules_s/enum/regexp.c | 123 ------ modules_s/enum/regexp.h | 41 -- 20 files changed, 0 insertions(+), 1262 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=811…

1 0

s enum module
by jh＠tutpro.com 19 Apr '09

19 Apr '09

k enum module has evolved quite a bit from s module. is it ok that i replace s emum module with k one. -- juha

2 1

s mediaproxy module
by jh＠tutpro.com 19 Apr '09

19 Apr '09

s mediaproxy module is obsolate. is it ok to that i replace it with k one? -- juha

2 1

git:master: htable: new pv counting items matching key by a regexp
by Elena-Ramona Modroiu 19 Apr '09

19 Apr '09

Module: sip-router Branch: master Commit: d78800223909dd0c458defbb304f7c56821d1bc0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d788002… Author: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Committer: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Date: Sat Apr 18 22:53:08 2009 +0300 htable: new pv counting items matching key by a regexp - $shtcn(ht->regexp) to return number of items that match the key by regexp --- modules_k/htable/ht_api.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ modules_k/htable/ht_api.h | 1 + modules_k/htable/ht_var.c | 28 ++++++++++++++++++++++++++++ modules_k/htable/ht_var.h | 2 ++ modules_k/htable/htable.c | 2 ++ 5 files changed, 77 insertions(+), 0 deletions(-) diff --git a/modules_k/htable/ht_api.c b/modules_k/htable/ht_api.c index 0cf755e..5932f52 100644 --- a/modules_k/htable/ht_api.c +++ b/modules_k/htable/ht_api.c @@ -855,3 +855,47 @@ int ht_rm_cell_re(str *sre, ht_t *ht, int mode) return 0; } +int ht_count_cells_re(str *sre, ht_t *ht, int mode) +{ + ht_cell_t *it; + ht_cell_t *it0; + int i; + regex_t re; + regmatch_t pmatch; + int cnt = 0; + + if(sre==NULL || sre->len<=0 || ht==NULL) + return 0; + + if (regcomp(&re, sre->s, REG_EXTENDED|REG_ICASE|REG_NEWLINE)) + { + LM_ERR("bad re %s\n", sre->s); + return 0; + } + + for(i=0; i<ht->htsize; i++) + { + /* free entries */ + lock_get(&ht->entries[i].lock); + it = ht->entries[i].first; + while(it) + { + it0 = it->next; + if(mode==0) + { + /* match by name */ + if (regexec(&re, it->name.s, 1, &pmatch, 0)==0) + cnt++; + } else { + if(it->flags&AVP_VAL_STR) + if (regexec(&re, it->value.s.s, 1, &pmatch, 0)==0) + cnt++; + } + it = it0; + } + lock_release(&ht->entries[i].lock); + } + regfree(&re); + return cnt; +} + diff --git a/modules_k/htable/ht_api.h b/modules_k/htable/ht_api.h index c47fbff..99ff84a 100644 --- a/modules_k/htable/ht_api.h +++ b/modules_k/htable/ht_api.h @@ -86,5 +86,6 @@ int ht_set_cell_expire(ht_t *ht, str *name, int type, int_str *val); int ht_get_cell_expire(ht_t *ht, str *name, unsigned int *val); int ht_rm_cell_re(str *sre, ht_t *ht, int mode); +int ht_count_cells_re(str *sre, ht_t *ht, int mode); #endif diff --git a/modules_k/htable/ht_var.c b/modules_k/htable/ht_var.c index 8019719..fae9fc5 100644 --- a/modules_k/htable/ht_var.c +++ b/modules_k/htable/ht_var.c @@ -235,3 +235,31 @@ int pv_set_ht_cell_expire(struct sip_msg* msg, pv_param_t *param, return 0; } +int pv_get_ht_cn(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + str htname; + ht_pv_t *hpv; + int cnt = 0; + + hpv = (ht_pv_t*)param->pvn.u.dname; + + if(hpv->ht==NULL) + { + hpv->ht = ht_get_table(&hpv->htname); + if(hpv->ht==NULL) + return pv_get_null(msg, param, res); + } + if(pv_printf_s(msg, hpv->pve, &htname)!=0) + { + LM_ERR("cannot get $ht name\n"); + return -1; + } + + cnt = ht_count_cells_re(&htname, hpv->ht, 0); + + /* integer */ + return pv_get_sintval(msg, param, res, cnt); +} + + diff --git a/modules_k/htable/ht_var.h b/modules_k/htable/ht_var.h index 472e813..4f4f021 100644 --- a/modules_k/htable/ht_var.h +++ b/modules_k/htable/ht_var.h @@ -34,5 +34,7 @@ int pv_get_ht_cell_expire(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); int pv_set_ht_cell_expire(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val); +int pv_get_ht_cn(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); #endif diff --git a/modules_k/htable/htable.c b/modules_k/htable/htable.c index 796038e..d4e52e6 100644 --- a/modules_k/htable/htable.c +++ b/modules_k/htable/htable.c @@ -62,6 +62,8 @@ static pv_export_t mod_pvs[] = { { {"shtex", sizeof("shtex")-1}, PVT_OTHER, pv_get_ht_cell_expire, pv_set_ht_cell_expire, pv_parse_ht_name, 0, 0, 0 }, + { {"shtcn", sizeof("shtcn")-1}, PVT_OTHER, pv_get_ht_cn, 0, + pv_parse_ht_name, 0, 0, 0 }, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } };

2 1

git:master: core: pvapi uses get_hash1_raw()
by Daniel-Constantin Mierla 18 Apr '09

18 Apr '09

Module: sip-router Branch: master Commit: 75b58438e024da69d41712e7eb05062214b09614 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=75b5843… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Apr 18 19:23:05 2009 +0200 core: pvapi uses get_hash1_raw() - removed core_hash define to get_hash1_raw() --- pvapi.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pvapi.c b/pvapi.c index fa304a5..ed6a239 100644 --- a/pvapi.c +++ b/pvapi.c @@ -34,11 +34,10 @@ #include "mem/shm_mem.h" #include "ut.h" #include "dprint.h" -#include "hash_func.h" +#include "hashes.h" #include "pvar.h" #define is_in_str(p, in) (p<in->s+in->len && *p) -#define core_hash(in, a, b) get_hash1_raw((in)->s, (in)->len) #define PV_TABLE_SIZE 16 #define TR_TABLE_SIZE 4 @@ -113,7 +112,7 @@ int pv_table_add(pv_export_t *e) } found = 0; //pvid = get_hash1_raw(in->s, in->len); - pvid = core_hash(in, 0, 0); + pvid = get_hash1_raw(in->s, in->len); pvi = _pv_table[pvid%PV_TABLE_SIZE]; while(pvi) @@ -325,7 +324,7 @@ pv_export_t* pv_lookup_spec_name(str *pvname, pv_spec_p e) /* search in PV table */ // pvid = get_hash1_raw(pvname->s, pvname->len); - pvid = core_hash(pvname, 0, 0); + pvid = get_hash1_raw(pvname->s, pvname->len); pvi = _pv_table[pvid%PV_TABLE_SIZE]; while(pvi) { @@ -1357,7 +1356,7 @@ int tr_table_add(tr_export_t *e) found = 0; // trid = get_hash1_raw(e->tclass.s, e->tclass.len); - trid = core_hash(&e->tclass, 0, 0); + trid = get_hash1_raw(e->tclass.s, e->tclass.len); tri = _tr_table[trid%TR_TABLE_SIZE]; while(tri) @@ -1460,7 +1459,7 @@ tr_export_t* tr_lookup_class(str *tclass) /* search in TR table */ // trid = get_hash1_raw(tclass->s, tclass->len); - trid = core_hash(tclass, 0, 0); + trid = get_hash1_raw(tclass->s, tclass->len); tri = _tr_table[trid%TR_TABLE_SIZE]; while(tri) {

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2009