sr-dev January 2012

sr-dev@lists.kamailio.org

25 participants
166 discussions

git:master: Merge branch 'treimann/master_tm-extend-callbacks'
by Timo Reimann 06 Jan '12

06 Jan '12

Module: sip-router Branch: master Commit: 00391b9f3d212bd5a953153a08db9071b70aa854 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=00391b9… Author: Timo Reimann <sr(a)foo-lounge.de> Committer: Timo Reimann <sr(a)foo-lounge.de> Date: Fri Jan 6 20:32:50 2012 +0100 Merge branch 'treimann/master_tm-extend-callbacks' * treimann/master_tm-extend-callbacks: (43 commits) core: new cfg parameter fork_delay textopsx: set the tcp clone rcvbuf on in mod init topoh: set the tcp clone rcvbuf on in mod init core: new cfg global parameter tcp_clone_rcvbuf app_lua: don't start if a Lua API registered module is not found auth: documented realm_prefix parameter auth: re-introduced realm_prefix parameter pua: is_dialog() returns 1 if there is a temporary dialog Makefile: added app_mono module to exclude_modules list app_mono: new module to run managed code embedded pua: check if totag len >0 before comparing it dispatcher: give faked msg to event routes execuition mediaproxy: handle DLGCB_CONFIRMED event pua_dialogingo: handle DLGCB_CONFIRMED_NA mi_rpc: fixed warning of dereferencing type-punned pointer modules: fixed several compile warnings pua(k): use dedicated function to free tm dlg presence(k): renamed tm dlg functions to avoid potential conflicts pua: free parsed rr when sending subscribes srdb1: schema update for address table of permissions module ... ---

1 0

New commits on branch treimann/master_tm-extend-callbacks
by Timo Reimann 06 Jan '12

06 Jan '12

URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8033b34… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 6 12:06:02 2012 +0100 core: new cfg parameter fork_delay - number of usecs to wait before forking a process - default is 0, don't wait - useful in case there are some throttling policies for the system running the sip server (e.g., number of new db connections per second) -- you can introduce delays so that worker processes are not forked at once URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9d03ded… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 6 11:50:43 2012 +0100 textopsx: set the tcp clone rcvbuf on in mod init URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4ac0862… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 6 11:50:04 2012 +0100 topoh: set the tcp clone rcvbuf on in mod init URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=786fc55… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 6 11:42:10 2012 +0100 core: new cfg global parameter tcp_clone_rcvbuf - control cloning of tcp receive buffer, default is 0 (no cloning), set to 1 for cloning URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=99c3f6c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 5 12:14:52 2012 +0100 app_lua: don't start if a Lua API registered module is not found URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=25d8133… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 5 10:51:56 2012 +0100 auth: documented realm_prefix parameter URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3d734a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 5 10:48:10 2012 +0100 auth: re-introduced realm_prefix parameter - strip its value from realm, if parameter is set - reported by Kelvin Chua URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2dfdc5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 3 18:02:39 2012 +0100 pua: is_dialog() returns 1 if there is a temporary dialog - reported by Laura Testi URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4b0f98d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 2 23:44:09 2012 +0100 Makefile: added app_mono module to exclude_modules list URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=519fe26… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 2 23:39:56 2012 +0100 app_mono: new module to run managed code embedded - embeds the mono project interpreter - allows execution of manged code from config file, such as assemblies for C#/.NET, Java, a.s.o. - can load the assembly at startup or read it every time before execution URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8536407… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 29 16:22:28 2011 +0100 pua: check if totag len >0 before comparing it - more on proper free of dlg_t structure - patch by Laura Testi URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3c3cc0d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 29 12:53:57 2011 +0100 dispatcher: give faked msg to event routes execuition - some funtions may return prematurely if no msg exists - reported by Mino Haluz URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2bff9b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 29 10:10:26 2011 +0100 mediaproxy: handle DLGCB_CONFIRMED event - ACKs may have SDP - patch by Jasmin Schnatterbeck (FS195) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9eed2a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 29 09:40:07 2011 +0100 pua_dialogingo: handle DLGCB_CONFIRMED_NA - patch by Tomek Kotecki (FS#187), Jasmin Schnatterbeck (FS#195) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=107d904… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 29 09:36:48 2011 +0100 mi_rpc: fixed warning of dereferencing type-punned pointer URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fc9a175… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Dec 27 11:46:37 2011 +0100 modules: fixed several compile warnings - removed unused variables, initialized some URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2d0d915… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 23 13:16:46 2011 +0100 pua(k): use dedicated function to free tm dlg URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a3bfedf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 23 13:16:15 2011 +0100 presence(k): renamed tm dlg functions to avoid potential conflicts URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=576d0cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 23 12:48:42 2011 +0100 pua: free parsed rr when sending subscribes - reported by Laura Testi URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5344749… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 23 09:35:25 2011 +0100 srdb1: schema update for address table of permissions module - kamctl db scripts updated accordingly URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b50e4b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 23 09:35:02 2011 +0100 permissions(k): support for ipv6 in address-related functions URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4ec2dd2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 23 09:34:00 2011 +0100 tm: rest the pointer of hash table after free to avoid double free on false start URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5794974… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 23 09:33:26 2011 +0100 libsrdb1: macro to return unsigned it from db value URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=42731af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 23 09:32:24 2011 +0100 core: function to match ip address to net address with bitmask URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b5bcac4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 22 14:06:08 2011 +0100 core: log message about slow timer printed now as warning URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ea68fbb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 22 14:00:52 2011 +0100 kamctl: update db table definitions after change to mtrees key - reported by Andreas Granig URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=73a93c3… Author: Marius Bucur <marius(a)marius-bucur.ro> Date: Thu Dec 22 11:47:41 2011 +0200 Removed the constraint in siptrace to have the tm and sl modules loaded beforehand. The explicitly module specifies these dependencies as being optional. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8765be5… Author: Andreas Granig <agranig(a)sipwise.com> Date: Thu Dec 22 00:23:36 2011 +0100 utils: Updated auto-generated db schema changes. - Generated schema files for lcr ip_addr changes. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cd69668… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 21 17:42:23 2011 +0100 sdpops: readme is updated with documentation of latest additions URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c141441… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 21 15:15:25 2011 +0100 sdpops: added sdp_remove_media(type) - remove the media streams matching the type - e.g., sdp_remove_media("video"); URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6d7aabc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 21 14:54:29 2011 +0100 core: sdp parser - keep link to start and lenght of sdp content - useful in multi-part bodies and sdp operations URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5152a64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 21 14:18:51 2011 +0100 sdpops: keep codecs functions can do filtering on media type - a second optional paramter with media type can be given to keep codecs function to avoid removing codecs from wrong media stream URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=afe9f97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 21 13:56:15 2011 +0100 sdpops: added functions to test the presence of codecs - sdp_with_codecs_by_id(idlist) - sdp_with_codecs_by_name(namelist) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a5aca49… Author: Richard Fuchs <rfuchs(a)sipwise.com> Date: Wed Dec 21 16:21:07 2011 +0100 libsrdb1: Make IPv6 addresses fit into lcr_gw - Resize lcr_gw.ip_addr column to fit IPv6 addresses. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d1f44a9… Author: Richard Fuchs <rfuchs(a)sipwise.com> Date: Wed Dec 21 16:19:31 2011 +0100 lcr: added IPv6 support. - Support both IPv4 and IPv6 addresses as ip_addr.

1 0

git:master: core: new cfg parameter fork_delay
by Daniel-Constantin Mierla 06 Jan '12

06 Jan '12

Module: sip-router Branch: master Commit: c2429a58e6b6c23094c73a267004330a82404a5a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c2429a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 6 12:06:02 2012 +0100 core: new cfg parameter fork_delay - number of usecs to wait before forking a process - default is 0, don't wait - useful in case there are some throttling policies for the system running the sip server (e.g., number of new db connections per second) -- you can introduce delays so that worker processes are not forked at once --- cfg.lex | 2 ++ cfg.y | 3 +++ pt.c | 13 +++++++++++++ pt.h | 2 ++ 4 files changed, 20 insertions(+), 0 deletions(-) diff --git a/cfg.lex b/cfg.lex index 0f1be4c..9c96261 100644 --- a/cfg.lex +++ b/cfg.lex @@ -339,6 +339,7 @@ AVP_PREF (([ft][rud]?)|g)\. /* config vars. */ DEBUG debug FORK fork +FORK_DELAY fork_delay LOGSTDERROR log_stderror LOGFACILITY log_facility LOGNAME log_name @@ -702,6 +703,7 @@ IMPORTFILE "import_file" <INITIAL>{DEBUG} { count(); yylval.strval=yytext; return DEBUG_V; } <INITIAL>{FORK} { count(); yylval.strval=yytext; return FORK; } +<INITIAL>{FORK_DELAY} { count(); yylval.strval=yytext; return FORK_DELAY; } <INITIAL>{LOGSTDERROR} { yylval.strval=yytext; return LOGSTDERROR; } <INITIAL>{LOGFACILITY} { yylval.strval=yytext; return LOGFACILITY; } <INITIAL>{LOGNAME} { yylval.strval=yytext; return LOGNAME; } diff --git a/cfg.y b/cfg.y index fb494ea..223d7ba 100644 --- a/cfg.y +++ b/cfg.y @@ -394,6 +394,7 @@ extern char *finame; /* config vars. */ %token DEBUG_V %token FORK +%token FORK_DELAY %token LOGSTDERROR %token LOGFACILITY %token LOGNAME @@ -828,6 +829,8 @@ assign_stm: | DEBUG_V EQUAL error { yyerror("number expected"); } | FORK EQUAL NUMBER { dont_fork= ! $3; } | FORK EQUAL error { yyerror("boolean value expected"); } + | FORK_DELAY EQUAL NUMBER { set_fork_delay($3); } + | FORK_DELAY EQUAL error { yyerror("number expected"); } | LOGSTDERROR EQUAL NUMBER { if (!config_check) log_stderr=$3; } | LOGSTDERROR EQUAL error { yyerror("boolean value expected"); } | LOGFACILITY EQUAL ID { diff --git a/pt.c b/pt.c index 68842e6..7764a94 100644 --- a/pt.c +++ b/pt.c @@ -68,6 +68,16 @@ static int estimated_proc_no=0; static int estimated_fds_no=0; +/* number of usec to wait before forking a process */ +static unsigned int fork_delay = 0; + +unsigned int set_fork_delay(unsigned int v) +{ + unsigned int r; + r = fork_delay; + fork_delay = v; + return r; +} /* number of known "common" used fds */ static int calc_common_open_fds_no() @@ -258,6 +268,9 @@ int fork_process(int child_id, char *desc, int make_sock) int sockfd[2]; #endif + if(unlikely(fork_delay>0)) + sleep_us(fork_delay); + ret=-1; #ifdef USE_TCP sockfd[0]=sockfd[1]=-1; diff --git a/pt.h b/pt.h index d2af6ac..c3bd901 100644 --- a/pt.h +++ b/pt.h @@ -103,4 +103,6 @@ void mem_dump_pkg_cb(str *gname, str *name); int mem_dump_shm_fixup(void *handle, str *gname, str *name, void **val); #endif +unsigned int set_fork_delay(unsigned int v); + #endif

1 0

git:master: topoh: set the tcp clone rcvbuf on in mod init
by Daniel-Constantin Mierla 06 Jan '12

06 Jan '12

Module: sip-router Branch: master Commit: f433198d66d1422bc34bf039df3fb20d35388ff2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f433198… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 6 11:50:04 2012 +0100 topoh: set the tcp clone rcvbuf on in mod init --- modules/topoh/topoh_mod.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules/topoh/topoh_mod.c b/modules/topoh/topoh_mod.c index ba312b0..f42b928 100644 --- a/modules/topoh/topoh_mod.c +++ b/modules/topoh/topoh_mod.c @@ -41,6 +41,7 @@ #include "../../sr_module.h" #include "../../events.h" #include "../../dprint.h" +#include "../../tcp_options.h" #include "../../ut.h" #include "../../forward.h" #include "../../parser/msg_parser.h" @@ -184,6 +185,9 @@ static int mod_init(void) th_mask_init(); sr_event_register_cb(SREV_NET_DATA_IN, th_msg_received); sr_event_register_cb(SREV_NET_DATA_OUT, th_msg_sent); +#ifdef USE_TCP + tcp_set_clone_rcvbuf(1); +#endif return 0; error: return -1;

1 0

git:master: textopsx: set the tcp clone rcvbuf on in mod init
by Daniel-Constantin Mierla 06 Jan '12

06 Jan '12

Module: sip-router Branch: master Commit: 843c3bf661cc64a5640f8a3aa9d7aab21115d5ff URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=843c3bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 6 11:50:43 2012 +0100 textopsx: set the tcp clone rcvbuf on in mod init --- modules/textopsx/textopsx.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/modules/textopsx/textopsx.c b/modules/textopsx/textopsx.c index 7dddf8b..8a97a5c 100644 --- a/modules/textopsx/textopsx.c +++ b/modules/textopsx/textopsx.c @@ -33,6 +33,7 @@ #include "../../dprint.h" #include "../../data_lump.h" #include "../../msg_translator.h" +#include "../../tcp_options.h" #include "../../mod_fix.h" #include "api.h" @@ -53,6 +54,8 @@ static int fixup_fnmatch(void** param, int param_no); static int w_remove_body_f(struct sip_msg*, char*, char *); static int bind_textopsx(textopsx_api_t *tob); +static int mod_init(void); + /* cfg functions */ static cmd_export_t cmds[] = { {"msg_apply_changes", (cmd_function)msg_apply_changes_f, 0, @@ -80,7 +83,7 @@ struct module_exports exports= { cmds, /* cfg functions */ 0, /* RPC methods */ 0, /* cfg parameters */ - 0, /* initialization function */ + mod_init, /* initialization function */ 0, /* response function */ 0, /* destroy function */ 0, /* on_cancel function */ @@ -89,6 +92,17 @@ struct module_exports exports= { /** + * init module function + */ +static int mod_init(void) +{ +#ifdef USE_TCP + tcp_set_clone_rcvbuf(1); +#endif + return 0; +} + +/** * */ static int msg_apply_changes_f(sip_msg_t *msg, char *str1, char *str2)

1 0

git:master: core: new cfg global parameter tcp_clone_rcvbuf
by Daniel-Constantin Mierla 06 Jan '12

06 Jan '12

Module: sip-router Branch: master Commit: 691a34390725b4a84d50d12b76bcb69c32a50071 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=691a343… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 6 11:42:10 2012 +0100 core: new cfg global parameter tcp_clone_rcvbuf - control cloning of tcp receive buffer, default is 0 (no cloning), set to 1 for cloning --- cfg.lex | 3 +++ cfg.y | 9 +++++++++ tcp_options.h | 4 ++++ tcp_read.c | 21 ++++++++++++++++++++- 4 files changed, 36 insertions(+), 1 deletions(-) diff --git a/cfg.lex b/cfg.lex index 26e31d0..0f1be4c 100644 --- a/cfg.lex +++ b/cfg.lex @@ -434,6 +434,7 @@ TCP_OPT_KEEPINTVL "tcp_keepintvl" TCP_OPT_KEEPCNT "tcp_keepcnt" TCP_OPT_CRLF_PING "tcp_crlf_ping" TCP_OPT_ACCEPT_NO_CL "tcp_accept_no_cl" +TCP_CLONE_RCVBUF "tcp_clone_rcvbuf" DISABLE_TLS "disable_tls"|"tls_disable" ENABLE_TLS "enable_tls"|"tls_enable" TLSLOG "tlslog"|"tls_log" @@ -846,6 +847,8 @@ IMPORTFILE "import_file" return TCP_OPT_CRLF_PING; } <INITIAL>{TCP_OPT_ACCEPT_NO_CL} { count(); yylval.strval=yytext; return TCP_OPT_ACCEPT_NO_CL; } +<INITIAL>{TCP_CLONE_RCVBUF} { count(); yylval.strval=yytext; + return TCP_CLONE_RCVBUF; } <INITIAL>{DISABLE_TLS} { count(); yylval.strval=yytext; return DISABLE_TLS; } <INITIAL>{ENABLE_TLS} { count(); yylval.strval=yytext; return ENABLE_TLS; } <INITIAL>{TLSLOG} { count(); yylval.strval=yytext; return TLS_PORT_NO; } diff --git a/cfg.y b/cfg.y index dcca98e..fb494ea 100644 --- a/cfg.y +++ b/cfg.y @@ -492,6 +492,7 @@ extern char *finame; %token TCP_OPT_KEEPCNT %token TCP_OPT_CRLF_PING %token TCP_OPT_ACCEPT_NO_CL +%token TCP_CLONE_RCVBUF %token DISABLE_TLS %token ENABLE_TLS %token TLSLOG @@ -1232,6 +1233,14 @@ assign_stm: #endif } | TCP_OPT_ACCEPT_NO_CL EQUAL error { yyerror("boolean value expected"); } + | TCP_CLONE_RCVBUF EQUAL NUMBER { + #ifdef USE_TCP + tcp_set_clone_rcvbuf($3); + #else + warn("tcp support not compiled in"); + #endif + } + | TCP_CLONE_RCVBUF EQUAL error { yyerror("number expected"); } | DISABLE_TLS EQUAL NUMBER { #ifdef USE_TLS tls_disable=$3; diff --git a/tcp_options.h b/tcp_options.h index f9a4e64..1c0ed24 100644 --- a/tcp_options.h +++ b/tcp_options.h @@ -157,4 +157,8 @@ void tcp_options_check(); int tcp_register_cfg(); void tcp_options_get(struct cfg_group_tcp* t); +#ifdef USE_TCP +int tcp_set_clone_rcvbuf(int v); +#endif /* USE_TCP */ + #endif /* tcp_options_h */ diff --git a/tcp_read.c b/tcp_read.c index c86a2dd..dde2f94 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -121,6 +121,22 @@ static int tcpmain_sock=-1; static struct local_timer tcp_reader_ltimer; static ticks_t tcp_reader_prev_ticks; +/** + * control cloning of TCP receive buffer + * - needed for operations working directly inside the buffer + * (like msg_apply_changes()) + */ +#define TCP_CLONE_RCVBUF +static int tcp_clone_rcvbuf = 0; + +int tcp_set_clone_rcvbuf(int v) +{ + int r; + r = tcp_clone_rcvbuf; + tcp_clone_rcvbuf = v; + return r; +} + #ifdef READ_HTTP11 static inline char *strfindcasestrz(str *haystack, char *needlez) { @@ -856,7 +872,6 @@ skip: * the content of the stream. Safer, make a clone of buf content in a local * buffer and give that to receive_msg() to link to msg->buf */ -#define TCP_CLONE_RCVBUF int receive_tcp_msg(char* tcpbuf, unsigned int len, struct receive_info* rcv_info) { #ifdef TCP_CLONE_RCVBUF @@ -868,6 +883,10 @@ int receive_tcp_msg(char* tcpbuf, unsigned int len, struct receive_info* rcv_inf #endif int blen; + /* cloning is disabled via parameter */ + if(likely(tcp_clone_rcvbuf==0)) + return receive_msg(tcpbuf, len, rcv_info); + /* min buffer size is BUF_SIZE */ blen = len; if(blen < BUF_SIZE)

1 0

git:3.2: app_lua: don't start if a Lua API registered module is not found
by Daniel-Constantin Mierla 06 Jan '12

06 Jan '12

Module: sip-router Branch: 3.2 Commit: bee0949e6d20d66cae3d3ea9795654a4ee30282c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bee0949… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 5 12:14:52 2012 +0100 app_lua: don't start if a Lua API registered module is not found (cherry picked from commit 8b56ce5162f480a11d0b59a5de9a7c37e9e84d1b) --- modules/app_lua/app_lua_mod.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/app_lua/app_lua_mod.c b/modules/app_lua/app_lua_mod.c index f9e1a69..19a0c52 100644 --- a/modules/app_lua/app_lua_mod.c +++ b/modules/app_lua/app_lua_mod.c @@ -106,7 +106,8 @@ struct module_exports exports = { */ static int mod_init(void) { - lua_sr_init_mod(); + if(lua_sr_init_mod()<0) + return -1; return 0; }

1 0

git:master: app_lua: don' t start if a Lua API registered module is not found
by Daniel-Constantin Mierla 05 Jan '12

05 Jan '12

Module: sip-router Branch: master Commit: 8b56ce5162f480a11d0b59a5de9a7c37e9e84d1b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8b56ce5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 5 12:14:52 2012 +0100 app_lua: don't start if a Lua API registered module is not found --- modules/app_lua/app_lua_mod.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/app_lua/app_lua_mod.c b/modules/app_lua/app_lua_mod.c index f9e1a69..19a0c52 100644 --- a/modules/app_lua/app_lua_mod.c +++ b/modules/app_lua/app_lua_mod.c @@ -106,7 +106,8 @@ struct module_exports exports = { */ static int mod_init(void) { - lua_sr_init_mod(); + if(lua_sr_init_mod()<0) + return -1; return 0; }

1 0

git:master: auth: documented realm_prefix parameter
by Daniel-Constantin Mierla 05 Jan '12

05 Jan '12

Module: sip-router Branch: master Commit: 6f06566ab7f48162a01725e07c72649aeb4b5ecc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6f06566… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 5 10:51:56 2012 +0100 auth: documented realm_prefix parameter --- modules/auth/README | 27 +++++++++++++++++++++------ modules/auth/doc/params.xml | 21 +++++++++++++++++++++ 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/modules/auth/README b/modules/auth/README index a29bcf5..692c6d8 100644 --- a/modules/auth/README +++ b/modules/auth/README @@ -37,6 +37,7 @@ Daniel-Constantin Mierla 1.3.11. nonce_expire (integer) 1.3.12. nonce_auth_max_drift (integer) 1.3.13. force_stateless_reply (boolean) + 1.3.14. realm_prefix (string) 1.4. Functions @@ -496,6 +497,20 @@ modparam("auth", "nonce_auth_max_drift", 1) # set max drift to 1 s modparam("auth", "force_stateless_reply", 1) ... +1.3.14. realm_prefix (string) + + Prefix to be automatically strip from realm. As an alternative to SRV + records (not all SIP clients support SRV lookup), a subdomain of the + master domain can be defined for SIP purposes (like sip.mydomain.net + pointing to same IP address as the SRV record for mydomain.net). By + ignoring the realm_prefix "sip.", at authentication, sip.mydomain.net + will be equivalent to mydomain.net . + + Default value is empty string. + + Example 14. realm_prefix parameter example +modparam("auth", "realm_prefix", "sip.") + 1.4. Functions 1.4.1. consume_credentials() @@ -508,7 +523,7 @@ modparam("auth", "force_stateless_reply", 1) little bit shorter. The function must be called after www_authorize, proxy_authorize, www_authenticate or proxy_authenticate. - Example 14. consume_credentials example + Example 15. consume_credentials example ... if (www_authenticate("realm", "subscriber)) { consume_credentials(); @@ -544,7 +559,7 @@ if (www_authenticate("realm", "subscriber)) { This function can be used from REQUEST_ROUTE. - Example 15. www_challenge usage + Example 16. www_challenge usage ... if (!www_authenticate("$td", "subscriber")) { www_challenge("$td", "1"); @@ -566,7 +581,7 @@ if (!www_authenticate("$td", "subscriber")) { This function can be used from REQUEST_ROUTE. - Example 16. proxy_challenge usage + Example 17. proxy_challenge usage ... if (!proxy_authenticate("$fd", "subscriber")) { proxy_challenge("$fd", "1"); @@ -585,7 +600,7 @@ if (!proxy_authenticate("$fd", "subscriber")) { This function can be used from REQUEST_ROUTE. - Example 17. proxy_challenge usage + Example 18. proxy_challenge usage ... if (!auth_check("$fd", "subscriber", "1")) { auth_challenge("$fd", "1"); @@ -636,7 +651,7 @@ if (!auth_check("$fd", "subscriber", "1")) { This function can be used from REQUEST_ROUTE. - Example 18. pv_www_authenticate usage + Example 19. pv_www_authenticate usage ... if (!pv_www_authenticate("$td", "123abc", "0")) { www_challenge("$td", "1"); @@ -658,7 +673,7 @@ if (!pv_www_authenticate("$td", "123abc", "0")) { This function can be used from REQUEST_ROUTE. - Example 19. pv_proxy_authenticate usage + Example 20. pv_proxy_authenticate usage ... $avp(password)="xyz"; if (!pv_proxy_authenticate("$fd", "$avp(password)", "0")) { diff --git a/modules/auth/doc/params.xml b/modules/auth/doc/params.xml index 4e1dbbf..6494a4e 100644 --- a/modules/auth/doc/params.xml +++ b/modules/auth/doc/params.xml @@ -636,4 +636,25 @@ modparam("auth", "force_stateless_reply", 1) </programlisting> </example> </section> + <section id="realm_prefix"> + <title><varname>realm_prefix</varname> (string)</title> + <para> + Prefix to be automatically strip from realm. As an alternative to + SRV records (not all SIP clients support SRV lookup), a subdomain + of the master domain can be defined for SIP purposes (like + sip.mydomain.net pointing to same IP address as the SRV + record for mydomain.net). By ignoring the realm_prefix + <quote>sip.</quote>, at authentication, sip.mydomain.net will be + equivalent to mydomain.net . + </para> + <para> + Default value is empty string. + </para> + <example> + <title>realm_prefix parameter example</title> + <programlisting format="linespecific"> +modparam("auth", "realm_prefix", "sip.") +</programlisting> + </example> + </section> </section>

1 0

git:master: auth: re-introduced realm_prefix parameter
by Daniel-Constantin Mierla 05 Jan '12

05 Jan '12

Module: sip-router Branch: master Commit: 00d758fbf7c7db97f15db061b67e0cfb49e28768 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=00d758f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 5 10:48:10 2012 +0100 auth: re-introduced realm_prefix parameter - strip its value from realm, if parameter is set - reported by Kelvin Chua --- modules/auth/api.c | 1 + modules/auth/auth_mod.c | 6 ++++++ modules/auth/challenge.c | 26 ++++++++++++++++++++++++++ modules/auth/challenge.h | 2 ++ 4 files changed, 35 insertions(+), 0 deletions(-) diff --git a/modules/auth/api.c b/modules/auth/api.c index 14281c9..2ee39a7 100644 --- a/modules/auth/api.c +++ b/modules/auth/api.c @@ -76,6 +76,7 @@ auth_result_t pre_auth(struct sip_msg* msg, str* realm, hdr_types_t hftype, * in the message, parse them and return pointer to * parsed structure */ + strip_realm(realm); ret = find_credentials(msg, realm, hftype, hdr); if (ret < 0) { LOG(L_ERR, "auth:pre_auth: Error while looking for credentials\n"); diff --git a/modules/auth/auth_mod.c b/modules/auth/auth_mod.c index 4dabc10..8050d81 100644 --- a/modules/auth/auth_mod.c +++ b/modules/auth/auth_mod.c @@ -100,6 +100,9 @@ int nonce_expire = 300; /* Nonce lifetime */ int protect_contacts = 0; /* Do not include contacts in nonce by default */ int force_stateless_reply = 0; /* Always send reply statelessly */ +/*! Prefix to strip from realm */ +str auth_realm_prefix = {"", 0}; + str secret1; str secret2; char* sec_rand1 = 0; @@ -177,6 +180,7 @@ static param_export_t params[] = { {"otn_in_flight_order", PARAM_INT, &otn_in_flight_k }, {"nid_pool_no", PARAM_INT, &nid_pool_no }, {"force_stateless_reply", PARAM_INT, &force_stateless_reply }, + {"realm_prefix", PARAM_STRING, &auth_realm_prefix.s }, {0, 0, 0} }; @@ -244,6 +248,8 @@ static int mod_init(void) DBG("auth module - initializing\n"); + auth_realm_prefix.len = strlen(auth_realm_prefix.s); + /* bind the SL API */ if (sl_load_api(&slb)!=0) { LM_ERR("cannot bind to SL API\n"); diff --git a/modules/auth/challenge.c b/modules/auth/challenge.c index decebf0..8c2ec01 100644 --- a/modules/auth/challenge.c +++ b/modules/auth/challenge.c @@ -66,6 +66,31 @@ #define DIGEST_ALGORITHM_LEN (sizeof(DIGEST_ALGORITHM)-1) +extern str auth_realm_prefix; +/** + * @brief Strip the beginning of a realm string + * + * Strip the beginning of a realm string, depending on the length of + * the realm_prefix. + * @param _realm realm string + */ +void strip_realm(str* _realm) +{ + /* no param defined -- return */ + if (!auth_realm_prefix.len) return; + + /* prefix longer than realm -- return */ + if (auth_realm_prefix.len > _realm->len) return; + + /* match ? -- if so, shorten realm -*/ + if (memcmp(auth_realm_prefix.s, _realm->s, auth_realm_prefix.len) == 0) { + _realm->s += auth_realm_prefix.len; + _realm->len -= auth_realm_prefix.len; + } + return; +} + + /** * Create and return {WWW,Proxy}-Authenticate header field * @param nonce nonce value @@ -98,6 +123,7 @@ int get_challenge_hf(struct sip_msg* msg, int stale, str* realm, return -1; } + strip_realm(realm); if (realm) { DEBUG("build_challenge_hf: realm='%.*s'\n", realm->len, realm->s); } diff --git a/modules/auth/challenge.h b/modules/auth/challenge.h index 92e9b4f..711f6b4 100644 --- a/modules/auth/challenge.h +++ b/modules/auth/challenge.h @@ -53,4 +53,6 @@ int build_challenge_hf(struct sip_msg* msg, int stale, str* realm, int get_challenge_hf(struct sip_msg* msg, int stale, str* realm, str* nonce, str* algorithm, struct qp* qop, int hftype, str *ahf); +void strip_realm(str* _realm); + #endif /* CHALLENGE_H */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2012