sr-dev July 2011

sr-dev@lists.kamailio.org

28 participants
198 discussions

[tracker] Task closed: db_mysql fails to load on centos 5 due to bad simbol ref

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#118 - db_mysql fails to load on centos 5 due to bad simbol ref User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: Using mysql_config fixed the issue. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=118 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

12 years, 10 months

Compiling db_mysql on Solaris

by Jason Penton

Hi All, I've seen someone else had a similar problem but there were no responses. On Solaris, compiling db_mysql results in the following: CC (gcc) [M db_mysql.so] my_cmd.o In file included from ../../globals.h:37:0, from ../../pt.h:42, from ../../counters.h:43, from mysql_mod.h:39, from my_cmd.c:40: ../../ip_addr.h:85:23: error: field 'sin6' has incomplete type ../../ip_addr.h: In function 'ip_addr_loopback': ../../ip_addr.h:281:3: warning: implicit declaration of function 'htonl' ../../ip_addr.h:284:3: warning: implicit declaration of function 'IN6_IS_ADDR_LOOPBACK' ../../ip_addr.h: In function 'sockaddr2ip_addr': ../../ip_addr.h:351:50: error: dereferencing pointer to incomplete type ../../ip_addr.h: In function 'su_getport': ../../ip_addr.h:397:4: warning: implicit declaration of function 'ntohs' ../../ip_addr.h: In function 'su_setport': ../../ip_addr.h:416:4: warning: implicit declaration of function 'htons' whats puzzling me is that ip_addr.h is included in other modules which compile perfectly, however in db_mysql, not feel like I'm missing something really silly? any ideas?

12 years, 10 months

git:master: db_mysql: fixed build on Solaris

by Jason Penton

Module: sip-router Branch: master Commit: 3298a44890f62191eb46251cf93579b366331c6b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3298a44… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Sat Jul 16 10:13:14 2011 +0200 db_mysql: fixed build on Solaris - Added preporcessor defs to avoid adding macro which breaks compile on Solaris --- modules/db_mysql/my_cmd.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/modules/db_mysql/my_cmd.c b/modules/db_mysql/my_cmd.c index 00a75ce..2e71131 100644 --- a/modules/db_mysql/my_cmd.c +++ b/modules/db_mysql/my_cmd.c @@ -30,7 +30,10 @@ * @{ */ -#define _XOPEN_SOURCE 4 /* bsd */ +/* the following macro will break the compile on solaris */ +#if !defined (__SVR4) && !defined (__sun) + #define _XOPEN_SOURCE 4 /* bsd */ +#endif #define _XOPEN_SOURCE_EXTENDED 1 /* solaris */ #define _SVID_SOURCE 1 /* timegm */

12 years, 10 months

git:master: core: reinit PV buffer after config parsing

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 8d666c30b712b75b00b281e225beb4783f964683 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8d666c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 15 16:55:45 2011 +0200 core: reinit PV buffer after config parsing - the size of the buffer may have been updated by parameters --- main.c | 4 ++++ pvapi.h | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/main.c b/main.c index a35faf3..8ba3cf8 100644 --- a/main.c +++ b/main.c @@ -2184,6 +2184,10 @@ try_again: } } + /* reinit if pv buffer size has been set in config */ + if (pv_reinit_buffer()<0) + goto error; + if (dont_fork_cnt) dont_fork = dont_fork_cnt; /* override by command line */ diff --git a/pvapi.h b/pvapi.h index f3fd261..855e92b 100644 --- a/pvapi.h +++ b/pvapi.h @@ -26,7 +26,7 @@ int pv_init_api(void); void pv_destroy_api(void); int pv_init_buffer(void); -int pv_resize_buffer(void); +int pv_reinit_buffer(void); void pv_destroy_buffer(void); char* pv_get_buffer(void); int pv_get_buffer_size(void);

12 years, 10 months

git:master: core: use PV api buffers for mod fixup

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 2f29210763f7587c5e3bb7df2bc2c4f36be727f1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2f29210… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 15 16:42:21 2011 +0200 core: use PV api buffers for mod fixup - functions to get the values from mod fixup structures use now the buffers from PV api --- pvapi.c | 6 +++--- sr_module.c | 10 +++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/pvapi.c b/pvapi.c index 8f87d58..8577bf1 100644 --- a/pvapi.c +++ b/pvapi.c @@ -1608,6 +1608,7 @@ static int _pv_print_buffer_size = PV_DEFAULT_PRINT_BUFFER_SIZE; /* 6 mod params + 4 direct usage from mods */ #define PV_DEFAULT_PRINT_BUFFER_SLOTS 10 static int _pv_print_buffer_slots = PV_DEFAULT_PRINT_BUFFER_SLOTS; +static int _pv_print_buffer_index = 0; /** * @@ -1677,10 +1678,9 @@ int pv_reinit_buffer(void) char* pv_get_buffer(void) { char *p; - static int _pv_print_buffer_itr = 0; - p = _pv_print_buffer[_pv_print_buffer_itr]; - _pv_print_buffer_itr = (_pv_print_buffer_itr+1)%_pv_print_buffer_slots; + p = _pv_print_buffer[_pv_print_buffer_index]; + _pv_print_buffer_index = (_pv_print_buffer_index+1)%_pv_print_buffer_slots; return p; } diff --git a/sr_module.c b/sr_module.c index 3fc0788..c77b761 100644 --- a/sr_module.c +++ b/sr_module.c @@ -57,6 +57,7 @@ #include "route_struct.h" #include "flags.h" #include "trim.h" +#include "pvapi.h" #include "globals.h" #include "rpc_lookup.h" #include "sr_compat.h" @@ -1501,8 +1502,6 @@ int fixup_str_2(void** param, int param_no) -#define PV_PRINT_BUF_SIZE 1024 -#define PV_PRINT_BUF_NO 6 /** Get the function parameter value as string. * @return 0 - Success * -1 - Cannot get value @@ -1513,8 +1512,6 @@ int get_str_fparam(str* dst, struct sip_msg* msg, fparam_t* param) int ret; avp_t* avp; pv_value_t pv_val; - static int buf_itr = 0; /* ugly hack needed for PVE */ - static char pve_buf[PV_PRINT_BUF_NO][PV_PRINT_BUF_SIZE]; switch(param->type) { case FPARAM_REGEX: @@ -1559,9 +1556,8 @@ int get_str_fparam(str* dst, struct sip_msg* msg, fparam_t* param) } break; case FPARAM_PVE: - dst->s=pve_buf[buf_itr]; - dst->len=PV_PRINT_BUF_SIZE; - buf_itr = (buf_itr+1)%PV_PRINT_BUF_NO; + dst->s=pv_get_buffer(); + dst->len=pv_get_buffer_size(); if (unlikely(pv_printf(msg, param->v.pve, dst->s, &dst->len)!=0)){ ERR("Could not convert the PV-formated string to str\n"); dst->len=0;

12 years, 10 months

git:master: core: exported internal static buffer through PV API

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 7e7d939980f147c2e473fd7f58dee7b15def37c9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7e7d939… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 15 16:35:15 2011 +0200 core: exported internal static buffer through PV API - access to the static buffers used to print dynamic strings with PVs can be accessed via PV api --- main.c | 4 +- pvapi.c | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----- pvapi.h | 15 +++++- 3 files changed, 143 insertions(+), 15 deletions(-) diff --git a/main.c b/main.c index f69b394..a35faf3 100644 --- a/main.c +++ b/main.c @@ -555,7 +555,7 @@ void cleanup(show_status) destroy_sctp(); #endif destroy_timer(); - destroy_pv_api(); + pv_destroy_api(); destroy_script_cb(); destroy_nonsip_hooks(); destroy_routes(); @@ -1975,7 +1975,7 @@ int main(int argc, char** argv) if (init_routes()<0) goto error; if (init_nonsip_hooks()<0) goto error; if (init_script_cb()<0) goto error; - if (init_pv_api()<0) goto error; + if (pv_init_api()<0) goto error; if (pv_register_core_vars()!=0) goto error; if (init_rpcs()<0) goto error; if (register_core_rpcs()!=0) goto error; diff --git a/pvapi.c b/pvapi.c index 7149bfb..8f87d58 100644 --- a/pvapi.c +++ b/pvapi.c @@ -1195,16 +1195,10 @@ void pv_value_destroy(pv_value_t *val) memset(val, 0, sizeof(pv_value_t)); } -#define PV_PRINT_BUF_SIZE 1024 -#define PV_PRINT_BUF_NO 3 int pv_printf_s(struct sip_msg* msg, pv_elem_p list, str *s) { - static int buf_itr = 0; - static char buf[PV_PRINT_BUF_NO][PV_PRINT_BUF_SIZE]; - - s->s = buf[buf_itr]; - s->len = PV_PRINT_BUF_SIZE; - buf_itr = (buf_itr+1)%PV_PRINT_BUF_NO; + s->s = pv_get_buffer(); + s->len = pv_get_buffer_size(); return pv_printf( msg, list, s->s, &s->len); } @@ -1583,10 +1577,12 @@ static pv_export_t _core_pvs[] = { /** init pv api (optional). * @return 0 on success, -1 on error */ -int init_pv_api(void) +int pv_init_api(void) { pv_init_table(); tr_init_table(); + if(pv_init_buffer()<0) + return -1; if(register_pvars_mod("core", _core_pvs)<0) return -1; return 0; @@ -1594,10 +1590,133 @@ int init_pv_api(void) /** destroy pv api. */ -void destroy_pv_api(void) +void pv_destroy_api(void) { /* free PV and TR hash tables */ pv_table_free(); tr_table_free(); + pv_destroy_buffer(); return; } + +/** + * - buffer to print PVs + */ +static char **_pv_print_buffer = NULL; +#define PV_DEFAULT_PRINT_BUFFER_SIZE 1024 +static int _pv_print_buffer_size = PV_DEFAULT_PRINT_BUFFER_SIZE; +/* 6 mod params + 4 direct usage from mods */ +#define PV_DEFAULT_PRINT_BUFFER_SLOTS 10 +static int _pv_print_buffer_slots = PV_DEFAULT_PRINT_BUFFER_SLOTS; + +/** + * + */ +int pv_init_buffer(void) +{ + int i; + + /* already initialized ?!? */ + if(_pv_print_buffer!=NULL) + return 0; + + _pv_print_buffer = + (char**)pkg_malloc(_pv_print_buffer_slots*sizeof(char*)); + if(_pv_print_buffer==NULL) + { + LM_ERR("cannot init PV print buffer slots\n"); + return -1; + } + memset(_pv_print_buffer, 0, _pv_print_buffer_slots); + for(i=0; i<_pv_print_buffer_slots; i++) + { + _pv_print_buffer[i] = + (char*)pkg_malloc(_pv_print_buffer_size*sizeof(char)); + if(_pv_print_buffer[i]==NULL) + { + LM_ERR("cannot init PV print buffer slot[%d]\n", i); + return -1; + } + } + return 0; +} + +/** + * + */ +void pv_destroy_buffer(void) +{ + int i; + + if(_pv_print_buffer==NULL) + return; + for(i=0; i<_pv_print_buffer_slots; i++) + { + if(_pv_print_buffer[i]!=NULL) + pkg_free(_pv_print_buffer[i]); + } + pkg_free(_pv_print_buffer); + _pv_print_buffer = NULL; +} + +/** + * + */ +int pv_reinit_buffer(void) +{ + if(_pv_print_buffer_size==PV_DEFAULT_PRINT_BUFFER_SIZE + && _pv_print_buffer_slots==PV_DEFAULT_PRINT_BUFFER_SLOTS) + return 0; + pv_destroy_buffer(); + return pv_init_buffer(); +} + +/** + * + */ +char* pv_get_buffer(void) +{ + char *p; + static int _pv_print_buffer_itr = 0; + + p = _pv_print_buffer[_pv_print_buffer_itr]; + _pv_print_buffer_itr = (_pv_print_buffer_itr+1)%_pv_print_buffer_slots; + + return p; +} + +/** + * + */ +int pv_get_buffer_size(void) +{ + return _pv_print_buffer_size; +} + +/** + * + */ +int pv_get_buffer_slots(void) +{ + return _pv_print_buffer_slots; +} + +/** + * + */ +void pv_set_buffer_size(int n) +{ + _pv_print_buffer_size = n; + if(_pv_print_buffer_size<=0) + _pv_print_buffer_size = PV_DEFAULT_PRINT_BUFFER_SIZE; +} + +/** + * + */ +void pv_set_buffer_slots(int n) +{ + _pv_print_buffer_slots = n; + if(_pv_print_buffer_slots<=0) + _pv_print_buffer_slots = PV_DEFAULT_PRINT_BUFFER_SLOTS; +} diff --git a/pvapi.h b/pvapi.h index 26de06b..f3fd261 100644 --- a/pvapi.h +++ b/pvapi.h @@ -22,9 +22,18 @@ #ifndef __pvapi_h__ #define __pvapi_h__ -int init_pv_api(void); -void destroy_pv_api(void); +int pv_init_api(void); +void pv_destroy_api(void); -#endif /*__pvapi_h_*/ +int pv_init_buffer(void); +int pv_resize_buffer(void); +void pv_destroy_buffer(void); +char* pv_get_buffer(void); +int pv_get_buffer_size(void); +int pv_get_buffer_slots(void); +void pv_set_buffer_size(int n); +void pv_set_buffer_slots(int n); + +#endif /*__pvapi_h__*/ /* vi: set ts=4 sw=4 tw=79:ai:cindent: */

12 years, 10 months

git:master: core: control pv buffer size by core parameters

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 7614a1d0322c930b81009675e78c2439b76a29d1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7614a1d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 15 21:55:33 2011 +0200 core: control pv buffer size by core parameters - pv_buffer_size - size in bytes for internal PV buffer (default 1024) - pv_buffer_slots - home many internal PV buffers (default 10) --- cfg.lex | 6 ++++++ cfg.y | 7 +++++++ pvapi.c | 4 +++- 3 files changed, 16 insertions(+), 1 deletions(-) diff --git a/cfg.lex b/cfg.lex index dd67ea8..e800696 100644 --- a/cfg.lex +++ b/cfg.lex @@ -483,6 +483,8 @@ TOS "tos" PMTU_DISCOVERY "pmtu_discovery" KILL_TIMEOUT "exit_timeout"|"ser_kill_timeout" MAX_WLOOPS "max_while_loops" +PVBUFSIZE "pv_buffer_size" +PVBUFSLOTS "pv_buffer_slots" /* stun config variables */ STUN_REFRESH_INTERVAL "stun_refresh_interval" @@ -933,6 +935,10 @@ IMPORTFILE "import_file" return KILL_TIMEOUT; } <INITIAL>{MAX_WLOOPS} { count(); yylval.strval=yytext; return MAX_WLOOPS; } +<INITIAL>{PVBUFSIZE} { count(); yylval.strval=yytext; + return PVBUFSIZE; } +<INITIAL>{PVBUFSLOTS} { count(); yylval.strval=yytext; + return PVBUFSLOTS; } <INITIAL>{SERVER_ID} { count(); yylval.strval=yytext; return SERVER_ID;} <INITIAL>{CFG_DESCRIPTION} { count(); yylval.strval=yytext; return CFG_DESCRIPTION; } <INITIAL>{LOADMODULE} { count(); yylval.strval=yytext; return LOADMODULE; } diff --git a/cfg.y b/cfg.y index b0e18bc..49bce54 100644 --- a/cfg.y +++ b/cfg.y @@ -142,6 +142,7 @@ #include "msg_translator.h" #include "ppcfg.h" +#include "pvapi.h" #include "config.h" #include "cfg_core.h" #include "cfg/cfg.h" @@ -536,6 +537,8 @@ extern char *finame; %token PMTU_DISCOVERY %token KILL_TIMEOUT %token MAX_WLOOPS +%token PVBUFSIZE +%token PVBUFSLOTS %token CFG_DESCRIPTION %token SERVER_ID @@ -1586,6 +1589,10 @@ assign_stm: | KILL_TIMEOUT EQUAL error { yyerror("number expected"); } | MAX_WLOOPS EQUAL NUMBER { default_core_cfg.max_while_loops=$3; } | MAX_WLOOPS EQUAL error { yyerror("number expected"); } + | PVBUFSIZE EQUAL NUMBER { pv_set_buffer_size($3); } + | PVBUFSIZE EQUAL error { yyerror("number expected"); } + | PVBUFSLOTS EQUAL NUMBER { pv_set_buffer_slots($3); } + | PVBUFSLOTS EQUAL error { yyerror("number expected"); } | STUN_REFRESH_INTERVAL EQUAL NUMBER { IF_STUN(stun_refresh_interval=$3); } | STUN_REFRESH_INTERVAL EQUAL error{ yyerror("number expected"); } | STUN_ALLOW_STUN EQUAL NUMBER { IF_STUN(stun_allow_stun=$3); } diff --git a/pvapi.c b/pvapi.c index 8577bf1..76601a9 100644 --- a/pvapi.c +++ b/pvapi.c @@ -1628,7 +1628,7 @@ int pv_init_buffer(void) LM_ERR("cannot init PV print buffer slots\n"); return -1; } - memset(_pv_print_buffer, 0, _pv_print_buffer_slots); + memset(_pv_print_buffer, 0, _pv_print_buffer_slots*sizeof(char*)); for(i=0; i<_pv_print_buffer_slots; i++) { _pv_print_buffer[i] = @@ -1639,6 +1639,8 @@ int pv_init_buffer(void) return -1; } } + LM_DBG("PV print buffer initialized to [%d][%d]\n", + _pv_print_buffer_slots, _pv_print_buffer_size); return 0; }

12 years, 10 months

git:master: core: adjusted debug message for #!define

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 04ff37eec6e271b978d785bfc0c1491e29c8b07d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=04ff37e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 15 22:55:06 2011 +0200 core: adjusted debug message for #!define --- cfg.lex | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cfg.lex b/cfg.lex index e800696..83a5879 100644 --- a/cfg.lex +++ b/cfg.lex @@ -1714,7 +1714,7 @@ int pp_define(int len, const char * text) { int ppos; - LOG(L_DBG, "++++++ attempting to define: %.*s\n", len, text); + LM_DBG("defining id: %.*s\n", len, text); if (pp_num_defines == MAX_DEFINES) { LOG(L_CRIT, "ERROR: too many defines -- adjust MAX_DEFINES\n");

12 years, 10 months

git:master: core: renamed pvapi_init.h to pvapi.h

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 1f14e6ed5cafa94e74a5fb49401c53da57a57ca1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1f14e6e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 15 15:43:35 2011 +0200 core: renamed pvapi_init.h to pvapi.h --- main.c | 2 +- pvapi.c | 2 +- pvapi_init.h => pvapi.h | 9 ++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/main.c b/main.c index 0ca144f..f69b394 100644 --- a/main.c +++ b/main.c @@ -186,7 +186,7 @@ #include "cfg_core.h" #include "endianness.h" /* init */ #include "basex.h" /* init */ -#include "pvapi_init.h" /* init */ +#include "pvapi.h" /* init PV api */ #include "pv_core.h" /* register core pvars */ #include "ppcfg.h" #include "sock_ut.h" diff --git a/pvapi.c b/pvapi.c index b75f231..7149bfb 100644 --- a/pvapi.c +++ b/pvapi.c @@ -39,7 +39,7 @@ #include "dprint.h" #include "hashes.h" #include "route.h" -#include "pvapi_init.h" +#include "pvapi.h" #include "pvar.h" #define is_in_str(p, in) (p<in->s+in->len && *p) diff --git a/pvapi_init.h b/pvapi.h similarity index 87% rename from pvapi_init.h rename to pvapi.h index 1d4ccd6..26de06b 100644 --- a/pvapi_init.h +++ b/pvapi.h @@ -16,16 +16,15 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ /* - * pvapi_init.h - pvapi init and destroy functions. + * pvapi.h - pvapi init and destroy functions. */ -#ifndef __pvapi_init_h -#define __pvapi_init_h +#ifndef __pvapi_h__ +#define __pvapi_h__ int init_pv_api(void); void destroy_pv_api(void); - -#endif /*__pvapi_init_h*/ +#endif /*__pvapi_h_*/ /* vi: set ts=4 sw=4 tw=79:ai:cindent: */

12 years, 10 months

git:master: Makefile: added ndb_redis in excluded_modules

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 0a609fdaf8ce764e7d4e6741cffb8d23883a8600 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0a609fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 15 15:06:30 2011 +0200 Makefile: added ndb_redis in excluded_modules --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index fa404bc..e24b846 100644 --- a/Makefile +++ b/Makefile @@ -292,7 +292,7 @@ else unixsock dbg print_lib auth_identity ldap \ db_berkeley db_mysql db_postgres db_oracle \ db_sqlite db_unixodbc memcached mi_xmlrpc \ - perl perlvdb purple \ + ndb_redis perl perlvdb purple \ snmpstats xmpp \ carrierroute peering \ dialplan lcr utils presence presence_mwi \

12 years, 10 months

← Newer
1
...
11
12
13
14
15
16
17
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2011