sr-dev October 2011

sr-dev@lists.kamailio.org

37 participants
284 discussions

git:mariuszbihlei/ipv6_fix: core: added parameter to enable/ disable automatic binding of ipv6 interfaces
by Marius Zbihlei 11 Oct '11

11 Oct '11

Module: sip-router Branch: mariuszbihlei/ipv6_fix Commit: 4107cdd4a2e1c33617e3c1bb4551664b6668900c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4107cdd… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Oct 11 11:35:56 2011 +0300 core: added parameter to enable/disable automatic binding of ipv6 interfaces TODO: documentation --- cfg.lex | 4 ++++ cfg.y | 11 +++++++++++ cfg_core.c | 8 ++++++++ cfg_core.h | 5 +++++ socket_info.c | 18 +++++++++--------- 5 files changed, 37 insertions(+), 9 deletions(-) diff --git a/cfg.lex b/cfg.lex index ff35a8a..4a19fe1 100644 --- a/cfg.lex +++ b/cfg.lex @@ -370,6 +370,8 @@ DNS_CACHE_MAX_TTL dns_cache_max_ttl DNS_CACHE_MEM dns_cache_mem DNS_CACHE_GC_INT dns_cache_gc_interval DNS_CACHE_DEL_NONEXP dns_cache_del_nonexp|dns_cache_delete_nonexpired +/* ipv6 auto bind */ +AUTO_BIND_IPV6 auto_bind_ipv6 /* blacklist */ DST_BLST_INIT dst_blacklist_init USE_DST_BLST use_dst_blacklist @@ -751,6 +753,8 @@ IMPORTFILE "import_file" return DNS_CACHE_GC_INT; } <INITIAL>{DNS_CACHE_DEL_NONEXP} { count(); yylval.strval=yytext; return DNS_CACHE_DEL_NONEXP; } +<INITIAL>{AUTO_BIND_IPV6} { count(); yylval.strval=yytext; + return AUTO_BIND_IPV6; } <INITIAL>{DST_BLST_INIT} { count(); yylval.strval=yytext; return DST_BLST_INIT; } <INITIAL>{USE_DST_BLST} { count(); yylval.strval=yytext; diff --git a/cfg.y b/cfg.y index 4290e41..ab9b126 100644 --- a/cfg.y +++ b/cfg.y @@ -164,6 +164,11 @@ if (rt!=ONSEND_ROUTE) yyerror( s " allowed only in onsend_routes");\ }while(0) +#ifdef USE_IPV6 + #define IF_AUTO_BIND_IPV6(x) x +#else + #define IF_AUTO_BIND_IPV6(x) warn("IPV6 support not compiled"); +#endif #ifdef USE_DNS_CACHE #define IF_DNS_CACHE(x) x @@ -419,6 +424,10 @@ extern char *finame; %token DNS_CACHE_MEM %token DNS_CACHE_GC_INT %token DNS_CACHE_DEL_NONEXP + +/* ipv6 auto bind */ +%token AUTO_BIND_IPV6 + /*blacklist*/ %token DST_BLST_INIT %token USE_DST_BLST @@ -877,6 +886,8 @@ assign_stm: | DNS_CACHE_GC_INT error { yyerror("boolean value expected"); } | DNS_CACHE_DEL_NONEXP EQUAL NUMBER { IF_DNS_CACHE(default_core_cfg.dns_cache_del_nonexp=$3); } | DNS_CACHE_DEL_NONEXP error { yyerror("boolean value expected"); } + | AUTO_BIND_IPV6 EQUAL NUMBER {IF_AUTO_BIND_IPV6(default_core_cfg.auto_bind_ipv6 = $3);} + | AUTO_BIND_IPV6 error { yyerror("boolean value expected"); } | DST_BLST_INIT EQUAL NUMBER { IF_DST_BLACKLIST(dst_blacklist_init=$3); } | DST_BLST_INIT error { yyerror("boolean value expected"); } | USE_DST_BLST EQUAL NUMBER { diff --git a/cfg_core.c b/cfg_core.c index 27a55b3..bd5a00d 100644 --- a/cfg_core.c +++ b/cfg_core.c @@ -105,6 +105,9 @@ struct cfg_group_core default_core_cfg = { 0, /*!< dns_cache_del_nonexp -- delete only expired entries by default */ 0, /*!< dns_cache_rec_pref -- 0 by default, do not check the existing entries. */ #endif +#ifdef USE_IPV6 + 0, /*!< auto_bind_ipv6 -- off by default */ +#endif #ifdef PKG_MALLOC 0, /*!< mem_dump_pkg */ #endif @@ -272,6 +275,11 @@ cfg_def_t core_cfg_def[] = { " 2 - prefer new records" " 3 - prefer records with longer lifetime"}, #endif +#ifdef USE_IPV6 + {"auto_bind_ipv6", CFG_VAR_INT, 0, 1, 0, 0, 0, + "enable/disable auto binding of proxy to IPV6 interfaces." + "default is disabled 0"}, +#endif #ifdef PKG_MALLOC {"mem_dump_pkg", CFG_VAR_INT, 0, 0, 0, mem_dump_pkg_cb, "dump process memory status, parameter: pid_number"}, diff --git a/cfg_core.h b/cfg_core.h index 25f69ae..ada5b89 100644 --- a/cfg_core.h +++ b/cfg_core.h @@ -93,6 +93,11 @@ struct cfg_group_core { int dns_cache_del_nonexp; int dns_cache_rec_pref; #endif + +#ifdef USE_IPV6 + int auto_bind_ipv6; +#endif + #ifdef PKG_MALLOC int mem_dump_pkg; #endif diff --git a/socket_info.c b/socket_info.c index 73a5cf3..4e7d27e 100644 --- a/socket_info.c +++ b/socket_info.c @@ -1712,9 +1712,9 @@ int fix_all_socket_lists() if ( ( (add_interfaces(0, AF_INET, 0, PROTO_UDP, &ai_lst)==0) #ifdef USE_IPV6 #ifdef __OS_linux - && (add_interfaces_via_netlink(0, AF_INET6, 0, PROTO_UDP, &ai_lst) == 0) + && (!(cfg_get(core, core_cfg, auto_bind_ipv6)) || add_interfaces_via_netlink(0, AF_INET6, 0, PROTO_UDP, &ai_lst) == 0) #else - && (add_interfaces(0, AF_INET6, 0, PROTO_UDP, &ai_lst)==0) /* add_interface does not work for IPv6 on Linux */ + && ( !(cfg_get(core, core_cfg, auto_bind_ipv6)) || add_interfaces(0, AF_INET6, 0, PROTO_UDP, &ai_lst) !=0 ) /* add_interface does not work for IPv6 on Linux */ #endif /* __OS_linux */ #endif /* USE_IPV6 */ ) && (addr_info_to_si_lst(ai_lst, 0, PROTO_UDP, 0, &udp_listen)==0)){ @@ -1726,12 +1726,12 @@ int fix_all_socket_lists() if ( ((add_interfaces(0, AF_INET, 0, PROTO_TCP, &ai_lst)!=0) #ifdef USE_IPV6 #ifdef __OS_linux - || (add_interfaces_via_netlink(0, AF_INET6, 0, PROTO_TCP, &ai_lst) != 0) + || (cfg_get(core, core_cfg, auto_bind_ipv6) && add_interfaces_via_netlink(0, AF_INET6, 0, PROTO_TCP, &ai_lst) != 0) #else - || (add_interfaces(0, AF_INET6, 0, PROTO_TCP, &ai_lst)!=0) + || (cfg_get(core, core_cfg, auto_bind_ipv6) && add_interfaces(0, AF_INET6, 0, PROTO_TCP, &ai_lst) !=0 ) #endif /* __OS_linux */ #endif /* USE_IPV6 */ - )|| (addr_info_to_si_lst(ai_lst, 0, PROTO_TCP, 0, + ) || (addr_info_to_si_lst(ai_lst, 0, PROTO_TCP, 0, &tcp_listen)!=0)) goto error; free_addr_info_lst(&ai_lst); @@ -1742,9 +1742,9 @@ int fix_all_socket_lists() &ai_lst)!=0) #ifdef USE_IPV6 #ifdef __OS_linux - || (add_interfaces_via_netlink(0, AF_INET6, 0, PROTO_TLS, &ai_lst) != 0) + || (cfg_get(core, core_cfg, auto_bind_ipv6) && add_interfaces_via_netlink(0, AF_INET6, 0, PROTO_TLS, &ai_lst) != 0) #else - || (add_interfaces(0, AF_INET6, 0, PROTO_TLS, &ai_lst)!=0) + || (cfg_get(core, core_cfg, auto_bind_ipv6) && add_interfaces(0, AF_INET6, 0, PROTO_TLS, &ai_lst)!=0) #endif /* __OS_linux */ #endif /* USE_IPV6 */ ) || (addr_info_to_si_lst(ai_lst, 0, PROTO_TLS, 0, @@ -1761,9 +1761,9 @@ int fix_all_socket_lists() if (((add_interfaces(0, AF_INET, 0, PROTO_SCTP, &ai_lst)!=0) #ifdef USE_IPV6 #ifdef __OS_linux - || (add_interfaces_via_netlink(0, AF_INET6, 0, PROTO_SCTP, &ai_lst) != 0) + || (cfg_get(core, core_cfg, auto_bind_ipv6) && add_interfaces_via_netlink(0, AF_INET6, 0, PROTO_SCTP, &ai_lst) != 0) #else - || (add_interfaces(0, AF_INET6, 0, PROTO_SCTP, &ai_lst)!=0) + || (cfg_get(core, core_cfg, auto_bind_ipv6) && add_interfaces(0, AF_INET6, 0, PROTO_SCTP, &ai_lst) != 0) #endif /* __OS_linux */ #endif /* USE_IPV6 */ ) || (addr_info_to_si_lst(ai_lst, 0, PROTO_SCTP, 0,

1 0

[tracker] User took ownership: CDR generation from acc module doesn't show label
by sip-router 11 Oct '11

11 Oct '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Sven Knoblich has taken ownership of the following task: FS#166 - CDR generation from acc module doesn't show label More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=166 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.

1 0

[tracker] Comment added: crash/segfault on shutdown since commit 7b3a6ec
by sip-router 10 Oct '11

10 Oct '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#165 - crash/segfault on shutdown since commit 7b3a6ec User who did this - Daniel-Constantin Mierla (miconda) ---------- In a syslog manual I found that it should be avoided using syslog() (function behind LOG define) in signal handlers. So I moved the exit message before killing the children that may jump context in another signal handler. Here is snippet from man page. syslog_r() and the other reentrant functions should only be used where reentrancy is required (for instance, in a signal handler). syslog() being not reentrant, only syslog_r() should be used here. For more information about reentrancy and signal handlers, see signal(3). See if it works now. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=165#comment302 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.

2 1

git:3.1: acc(k): Remove double #define.
by Timo Reimann 10 Oct '11

10 Oct '11

Module: sip-router Branch: 3.1 Commit: 917c5653c33f3033f561691ca065e40003e3679a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=917c565… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Mon Oct 10 14:55:40 2011 +0200 acc(k): Remove double #define. Remove definition of ACC_CORE_LEN in acc.h, it's part of acc_api.h nowadays. (cherry picked from commit 49f44b0f415011d0d3b62fca179021fdf18b5fad) --- modules_k/acc/acc.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/modules_k/acc/acc.h b/modules_k/acc/acc.h index 14e2db2..6a341a0 100644 --- a/modules_k/acc/acc.h +++ b/modules_k/acc/acc.h @@ -41,8 +41,6 @@ #ifndef _ACC_ACC_H_ #define _ACC_ACC_H_ -#define ACC_CORE_LEN 6 - /* leading text for a request accounted from a script */ #define ACC "ACC: " #define ACC_REQUEST ACC"request accounted: "

1 0

git:master: acc(k): Remove double #define.
by Timo Reimann 10 Oct '11

10 Oct '11

Module: sip-router Branch: master Commit: 49f44b0f415011d0d3b62fca179021fdf18b5fad URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=49f44b0… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Mon Oct 10 14:55:40 2011 +0200 acc(k): Remove double #define. Remove definition of ACC_CORE_LEN in acc.h, it's part of acc_api.h nowadays. --- modules_k/acc/acc.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/modules_k/acc/acc.h b/modules_k/acc/acc.h index cd0f642..ef9a922 100644 --- a/modules_k/acc/acc.h +++ b/modules_k/acc/acc.h @@ -41,8 +41,6 @@ #ifndef _ACC_ACC_H_ #define _ACC_ACC_H_ -#define ACC_CORE_LEN 6 - /* leading text for a request accounted from a script */ #define ACC "ACC: " #define ACC_REQUEST ACC"request accounted: "

1 0

git:master: modules:sipcapture: fixed len of SIP message for hep callback function
by Alexandr Dubovikov 10 Oct '11

10 Oct '11

Module: sip-router Branch: master Commit: c51bc346dee05d47b53ba150dc681e9ed779574a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c51bc34… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Mon Oct 10 11:55:35 2011 +0200 modules:sipcapture: fixed len of SIP message for hep callback function --- modules/sipcapture/sipcapture.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index a71ad2e..5e5fe22 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -611,7 +611,7 @@ int hep_msg_received(void *data) void **srevp; char *buf; - unsigned len; + unsigned *len; struct receive_info *ri; int offset = 0, hl; @@ -632,14 +632,14 @@ int hep_msg_received(void *data) srevp = (void**)data; buf = (char *)srevp[0]; - len = *((unsigned *)srevp[1]); + len = (unsigned *)srevp[1]; ri = (struct receive_info *)srevp[2]; hl = offset = sizeof(struct hep_hdr); - end = buf + len; - if (unlikely(len<offset)) { - LOG(L_ERR, "ERROR: sipcapture:hep_msg_received len less than offset [%i] vs [%i]\n", len, offset); + end = buf + *len; + if (unlikely(*len<offset)) { + LOG(L_ERR, "ERROR: sipcapture:hep_msg_received len less than offset [%i] vs [%i]\n", *len, offset); return -1; } @@ -737,7 +737,7 @@ int hep_msg_received(void *data) ri->dst_port = ntohs(heph->hp_dport); /* cut off the offset */ - len -= offset; + *len -= offset; p = buf + offset; memmove(buf, p, BUF_SIZE+1);

1 0

git:master: kamutil: Add README describing the naming schema.
by Timo Reimann 10 Oct '11

10 Oct '11

Module: sip-router Branch: master Commit: ad30fed3e34904b3c8857aacf0925ee4d50fed1b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ad30fed… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Fri Oct 7 10:34:35 2011 +0200 kamutil: Add README describing the naming schema. --- utils/kamctl/README | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/utils/kamctl/README b/utils/kamctl/README new file mode 100644 index 0000000..5fb4605 --- /dev/null +++ b/utils/kamctl/README @@ -0,0 +1,6 @@ +SQL creation *must* follow the naming pattern + + <tablename>-create.sql + +Note that dashes ("-") in <tablename> must be replaced by underscores +("_").

2 2

git:master: kamutil: Improve README.
by Timo Reimann 10 Oct '11

10 Oct '11

Module: sip-router Branch: master Commit: a67ba5f07b433e677b65a329e22c97fbef957dc4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a67ba5f… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Mon Oct 10 11:43:46 2011 +0200 kamutil: Improve README. - Remark that <tablename> and database table name must match. - Brand evilness of dashes as opposed to underscores. --- utils/kamctl/README | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/utils/kamctl/README b/utils/kamctl/README index 5fb4605..e10d3fc 100644 --- a/utils/kamctl/README +++ b/utils/kamctl/README @@ -2,5 +2,6 @@ SQL creation *must* follow the naming pattern <tablename>-create.sql -Note that dashes ("-") in <tablename> must be replaced by underscores -("_"). +where <tablename> corresponds to the name of the database table. Please use +underscores ("_") instead of dashes ("-") in database table names to ensure +compatibility with all types of databases.

1 0

[tracker] Task opened: CDR generation from acc module doesn't show label
by sip-router 10 Oct '11

10 Oct '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Timo Reimann (tr) Attached to Project - sip-router Summary - CDR generation from acc module doesn't show label Task Type - Bug Report Category - Module Status - New Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - If you use the acc module to generate CDRs but do not configure anything except for setting the modparam "cdr_enable" to 1, the resulting CDR lines lack labels. That is, they look like this: =<start-time>, =<end-time>, =<duration-time> Instead, they should be looking something like this: st=<start-time>, et=<end-time>, d=<duration-time> More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=166 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.

1 0

git:master: dmq: removed libxml2 from Makefile deps
by Daniel-Constantin Mierla 09 Oct '11

09 Oct '11

Module: sip-router Branch: master Commit: 509763109abfe3e6e10da5a6974ee29e9630a409 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5097631… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Oct 9 19:33:26 2011 +0200 dmq: removed libxml2 from Makefile deps - the lib is not used in sources --- modules_k/dmq/Makefile | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/modules_k/dmq/Makefile b/modules_k/dmq/Makefile index a361bed..b7dc6bd 100644 --- a/modules_k/dmq/Makefile +++ b/modules_k/dmq/Makefile @@ -10,14 +10,10 @@ auto_gen= NAME=dmq.so LIBS= -DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ - -I$(LOCALBASE)/include -LIBS+=-L/usr/include/lib -L$(LOCALBASE)/lib -lxml2 - DEFS+=-DOPENSER_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/kmi/kmi SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 SER_LIBS+=$(SERLIBPATH)/kcore/kcore -include ../../Makefile.modules \ No newline at end of file +include ../../Makefile.modules

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2011