sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:andrei/counters: counters: 2nd parameter of cnt.get rpc is now optional

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/counters Commit: ec3aca49a087e796a6324345346c05bf00b879f6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ec3aca4… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 01:27:46 2010 +0200 counters: 2nd parameter of cnt.get rpc is now optional If the counter name is missing cnt.get will display the whole group (equivalent to cnt.grp_get_all). E.g.: $ sercmd cnt.get tcp { con_reset: 0 con_timeout: 0 connect_failed: 0 connect_success: 0 current_opened_connections: 0 current_write_queue_size: 0 established: 0 local_reject: 0 passive_open: 0 send_timeout: 0 sendq_full: 0 } $ sercmd cnt.get tcp current_opened_connections 0 --- modules/counters/counters.c | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 deletions(-) diff --git a/modules/counters/counters.c b/modules/counters/counters.c index 1755308..16da3c9 100644 --- a/modules/counters/counters.c +++ b/modules/counters/counters.c @@ -273,6 +273,10 @@ static int cnt_reset_f(struct sip_msg* msg, char* handle, char* bar) +static void cnt_grp_get_all(rpc_t* rpc, void* c, char* group); + + + static void cnt_get_rpc(rpc_t* rpc, void* c) { char* group; @@ -280,10 +284,11 @@ static void cnt_get_rpc(rpc_t* rpc, void* c) counter_val_t v; counter_handle_t h; - if (rpc->scan(c, "ss", &group, &name) < 2) { - /* rpc->fault(c, 400, "group and counter name required"); */ + if (rpc->scan(c, "s", &group) < 1) return; - } + if (rpc->scan(c, "*s", &name) < 1) + return cnt_grp_get_all(rpc, c, group); + /* group & name read */ if (counter_lookup(&h, group, name) < 0) { rpc->fault(c, 400, "non-existent counter %s.%s\n", group, name); return; @@ -400,16 +405,11 @@ static void cnt_var_list_rpc(rpc_t* rpc, void* c) -static void cnt_grp_get_all_rpc(rpc_t* rpc, void* c) +static void cnt_grp_get_all(rpc_t* rpc, void* c, char* group) { void* s; - char* group; struct rpc_list_params packed_params; - if (rpc->scan(c, "s", &group) < 1) { - /* rpc->fault(c, 400, "group name required"); */ - return; - } if (rpc->add(c, "{", &s) < 0) return; packed_params.rpc = rpc; packed_params.ctx = s; @@ -418,6 +418,19 @@ static void cnt_grp_get_all_rpc(rpc_t* rpc, void* c) +static void cnt_grp_get_all_rpc(rpc_t* rpc, void* c) +{ + char* group; + + if (rpc->scan(c, "s", &group) < 1) { + /* rpc->fault(c, 400, "group name required"); */ + return; + } + return cnt_grp_get_all(rpc, c, group); +} + + + static void cnt_help_rpc(rpc_t* rpc, void* ctx) { char* group;

14 years, 6 months

[tracker] Comment added: ds_reload fails (MySQL backend)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#83 - ds_reload fails (MySQL backend) User who did this - Daniel-Constantin Mierla (miconda) ---------- It should be fixed on GIT, there was an issue when executing MI commands via RPC interface, like is done by sercmd. Can you get latest git branch kamailio_3.0 and try? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=83#comment109 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.

14 years, 6 months

git:andrei/raw_sock: raw sockets: freebsd support

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/raw_sock Commit: 2542c0f30f0ce7cd11c437f19afb53a3b3e9f2a8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2542c0f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Aug 10 17:43:25 2010 +0200 raw sockets: freebsd support Support freebsd and theoretically other BSDs (other BSDs not tested): - on most BSDs the offset and length of the ip header must be filled in host byte order (when using raw sockets with IPHDR_INC). - no need for user-space fragmentation for raw sockets - use IP_RECVDSTADDR and IPSENDSRCADDR instead of IP_PKTINFO (for raw sockets without IPHDR_INC) - fix ip header length (wrongly computed, on linux it worked because linux always ignores and overwrites it) --- raw_sock.c | 133 +++++++++++++++++++++++++++++++++++++++++++++++---------- udp_server.c | 4 +- 2 files changed, 111 insertions(+), 26 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=254…

14 years, 6 months

git:andrei/raw_sock: core: compile raw socket support by default on freebsd

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/raw_sock Commit: 49e34588e967ed92903eb0825a0b1a4b57b4afd6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=49e3458… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Aug 10 17:50:47 2010 +0200 core: compile raw socket support by default on freebsd --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 4cc1ee6..53a549d 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -1747,7 +1747,7 @@ ifeq ($(OS), freebsd) C_DEFS+=-DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN \ -DHAVE_SCHED_YIELD -DHAVE_MSGHDR_MSG_CONTROL \ -DHAVE_CONNECT_ECONNRESET_BUG -DHAVE_TIMEGM \ - -DHAVE_NETINET_IN_SYSTM + -DHAVE_NETINET_IN_SYSTM -DUSE_RAW_SOCKS ifneq ($(found_lock_method), yes) C_DEFS+= -DUSE_PTHREAD_MUTEX # try pthread sems found_lock_method=yes

14 years, 6 months

[tracker] Comment added: ds_reload fails (MySQL backend)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#83 - ds_reload fails (MySQL backend) User who did this - Kim Jakobsson (kjakobsson) ---------- >From tarball. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=83#comment108 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.

14 years, 6 months

[tracker] Comment added: ds_reload fails (MySQL backend)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#83 - ds_reload fails (MySQL backend) User who did this - Daniel-Constantin Mierla (miconda) ---------- Is it 3.0.2 from tarball/packages or is latest git branch kamailio_30? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=83#comment107 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.

14 years, 6 months

[tracker] Task opened: ds_reload fails (MySQL backend)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Kim Jakobsson (kjakobsson) Attached to Project - sip-router Summary - ds_reload fails (MySQL backend) Task Type - Bug Report Category - Module Status - Unconfirmed Assigned To - Operating System - Linux Severity - Medium Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - - Kamailio v3.0.2. - dispathcer module with mysql backend - Kamailio starts up ok and ds_select_domain() works. When trying to issue 'ds_reload' with sercmd, the reload fails. Module configuration: modparam("dispatcher", "db_url", "mysql://openser:openserrw@localhost/openser") > **> sercmd mi_fifo ds_list** >200 OK SET_NO:: 1 SET:: 1 URI:: sip:127.0.0.1:5060 flag=A > **> sercmd mi_fifo ds_reload** >500 ERROR Reloading data > **> tail -1 /var/log/kamailio.log** >ERROR: dispatcher [dispatch.c:555]: invalid DB handler More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=83 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.

14 years, 6 months

git:andrei/raw_sock: cfg: delay cfg_shmize to just before forking

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/raw_sock Commit: fbf0d2e03c019e51281ce569b93843ab0577cc0f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fbf0d2e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Aug 10 11:20:26 2010 +0200 cfg: delay cfg_shmize to just before forking cfg_shmize() delayed to allow late changes in the default config (any changes in the default config after cfg_shmize() are ignored). --- main.c | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/main.c b/main.c index d157a6b..9b594a0 100644 --- a/main.c +++ b/main.c @@ -1285,6 +1285,15 @@ int main_loop() " (no fork)\n"); } + /* delay cfg_shmize to the last moment (it must be called _before_ + forking). Changes to default cfgs after this point will be + ignored. + */ + if (cfg_shmize() < 0) { + LOG(L_CRIT, "could not initialize shared configuration\n"); + goto error; + } + /* Register the children that will keep updating their * local configuration */ cfg_register_child( @@ -1503,6 +1512,14 @@ int main_loop() * sending) so we open all first*/ if (do_suid()==-1) goto error; /* try to drop privileges */ + /* delay cfg_shmize to the last moment (it must be called _before_ + forking). Changes to default cfgs after this point will be + ignored (cfg_shmize() will copy the default cfgs into shmem). + */ + if (cfg_shmize() < 0) { + LOG(L_CRIT, "could not initialize shared configuration\n"); + goto error; + } /* init childs with rank==PROC_INIT before forking any process, * this is a place for delayed (after mod_init) initializations * (e.g. shared vars that depend on the total number of processes @@ -2328,11 +2345,6 @@ try_select_again: tval.tv_usec = 0; goto error; } - if (cfg_shmize() < 0) { - LOG(L_CRIT, "could not initialize shared configuration\n"); - goto error; - } - /* initialize process_table, add core process no. (calc_proc_no()) to the * processes registered from the modules*/ if (init_pt(calc_proc_no())==-1)

14 years, 6 months

git:andrei/raw_sock: raw sockets: ttl can be set from the config file

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/raw_sock Commit: 2556cd84fa12b25e9545535db9c766bf9cd3f354 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2556cd8… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Aug 10 11:15:06 2010 +0200 raw sockets: ttl can be set from the config file The ttl used for raw sockets can be set from the config file, using udp4_raw_ttl. -1 can be used for auto-detection. --- cfg.lex | 2 ++ cfg.y | 5 +++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/cfg.lex b/cfg.lex index de88891..6829724 100644 --- a/cfg.lex +++ b/cfg.lex @@ -215,6 +215,7 @@ UDP_MTU "udp_mtu" UDP_MTU_TRY_PROTO "udp_mtu_try_proto" UDP4_RAW "udp4_raw" UDP4_RAW_MTU "udp4_raw_mtu" +UDP4_RAW_TTL "udp4_raw_ttl" SETFLAG setflag RESETFLAG resetflag ISFLAGSET isflagset @@ -611,6 +612,7 @@ SUBST subst return UDP_MTU_TRY_PROTO; } <INITIAL>{UDP4_RAW} { count(); yylval.strval=yytext; return UDP4_RAW; } <INITIAL>{UDP4_RAW_MTU} { count(); yylval.strval=yytext; return UDP4_RAW_MTU; } +<INITIAL>{UDP4_RAW_TTL} { count(); yylval.strval=yytext; return UDP4_RAW_TTL; } <INITIAL>{IF} { count(); yylval.strval=yytext; return IF; } <INITIAL>{ELSE} { count(); yylval.strval=yytext; return ELSE; } diff --git a/cfg.y b/cfg.y index 3c52e69..78b0102 100644 --- a/cfg.y +++ b/cfg.y @@ -331,6 +331,7 @@ extern char *finame; %token UDP_MTU_TRY_PROTO %token UDP4_RAW %token UDP4_RAW_MTU +%token UDP4_RAW_TTL %token IF %token ELSE %token SET_ADV_ADDRESS @@ -1593,6 +1594,10 @@ assign_stm: IF_RAW_SOCKS(default_core_cfg.udp4_raw_mtu=$3); } | UDP4_RAW_MTU EQUAL error { yyerror("number expected"); } + | UDP4_RAW_TTL EQUAL NUMBER { + IF_RAW_SOCKS(default_core_cfg.udp4_raw_ttl=$3); + } + | UDP4_RAW_TTL EQUAL error { yyerror("number expected"); } | cfg_var | error EQUAL { yyerror("unknown config variable"); } ;

14 years, 6 months

git:andrei/raw_sock: core: always compile the raw sockets code on linux

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/raw_sock Commit: 53cc96bd61778fec14ebabd6a6182313bb778aa9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=53cc96b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Aug 10 11:16:38 2010 +0200 core: always compile the raw sockets code on linux Raw sockets support is compiled always on linux. Note that while the code is there, one still needs to explicitly enable them in ser.cfg or at runtime (e.g. setting udp4_raw = 1 at runtime will switch to using raw sockets for sending if possible). --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 1eb19f5..4cc1ee6 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -1628,7 +1628,7 @@ ifeq ($(OS), linux) use_futex= yes C_DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ - -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER + -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DUSE_RAW_SOCKS ifneq ($(found_lock_method), yes) #C_DEFS+= -DUSE_POSIX_SEM C_DEFS+=-DUSE_PTHREAD_MUTEX

14 years, 6 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev