sr-dev September 2014

sr-dev@lists.kamailio.org

33 participants
376 discussions

git:master: core: new parameter - log_prefix
by Daniel-Constantin Mierla 10 Sep '14

10 Sep '14

Module: sip-router Branch: master Commit: 35e94c97dfb2f6519c87e566b5158e5b9b9f39ef URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=35e94c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 11 00:16:53 2014 +0200 core: new parameter - log_prefix - can be used to set what prefix to be printed for each log message while processing a SIP message - can contain variables - example: log_prefix="[$mt $hdr(CSeq) $ci]" --- action.h | 2 + cfg.lex | 2 + cfg.y | 3 ++ dprint.c | 41 ++++++++++++++++++++++++++++++++++++ dprint.h | 68 +++++++++++++++++++++++++++++++----------------------------- main.c | 7 ++++++ receive.c | 7 ++++++ 7 files changed, 97 insertions(+), 33 deletions(-) diff --git a/action.h b/action.h index 77f1948..f8a30f6 100644 --- a/action.h +++ b/action.h @@ -81,4 +81,6 @@ int run_actions_safe(struct run_act_ctx* c, struct action* a, #define run_actions_safe(c, a, m) run_actions(c, a, m) #endif /* USE_LONGJMP */ +void log_prefix_set(sip_msg_t *msg); + #endif diff --git a/cfg.lex b/cfg.lex index 874e85f..10766b2 100644 --- a/cfg.lex +++ b/cfg.lex @@ -346,6 +346,7 @@ LOGSTDERROR log_stderror LOGFACILITY log_facility LOGNAME log_name LOGCOLOR log_color +LOGPREFIX log_prefix LISTEN listen ADVERTISE advertise|ADVERTISE ALIAS alias @@ -709,6 +710,7 @@ IMPORTFILE "import_file" <INITIAL>{LOGFACILITY} { yylval.strval=yytext; return LOGFACILITY; } <INITIAL>{LOGNAME} { yylval.strval=yytext; return LOGNAME; } <INITIAL>{LOGCOLOR} { yylval.strval=yytext; return LOGCOLOR; } +<INITIAL>{LOGPREFIX} { yylval.strval=yytext; return LOGPREFIX; } <INITIAL>{LISTEN} { count(); yylval.strval=yytext; return LISTEN; } <INITIAL>{ADVERTISE} { count(); yylval.strval=yytext; return ADVERTISE; } <INITIAL>{ALIAS} { count(); yylval.strval=yytext; return ALIAS; } diff --git a/cfg.y b/cfg.y index 18849b8..1e52289 100644 --- a/cfg.y +++ b/cfg.y @@ -395,6 +395,7 @@ extern char *default_routename; %token LOGFACILITY %token LOGNAME %token LOGCOLOR +%token LOGPREFIX %token LISTEN %token ADVERTISE %token ALIAS @@ -843,6 +844,8 @@ assign_stm: | LOGNAME EQUAL error { yyerror("string value expected"); } | LOGCOLOR EQUAL NUMBER { log_color=$3; } | LOGCOLOR EQUAL error { yyerror("boolean value expected"); } + | LOGPREFIX EQUAL STRING { log_prefix_fmt=$3; } + | LOGPREFIX EQUAL error { yyerror("string value expected"); } | DNS EQUAL NUMBER { received_dns|= ($3)?DO_DNS:0; } | DNS EQUAL error { yyerror("boolean value expected"); } | REV_DNS EQUAL NUMBER { received_dns|= ($3)?DO_REV_DNS:0; } diff --git a/dprint.c b/dprint.c index f65facb..4906001 100644 --- a/dprint.c +++ b/dprint.c @@ -38,6 +38,7 @@ #include "globals.h" #include "dprint.h" +#include "pvar.h" #include <stdarg.h> #include <stdio.h> @@ -368,3 +369,43 @@ void dprint_color_update(int level, char f, char b) if(f && f!='0') _log_level_colors[level - L_MIN].f = f; if(b && b!='0') _log_level_colors[level - L_MIN].b = b; } + + +/* log_prefix functionality */ +str *log_prefix_val = NULL; +static pv_elem_t *log_prefix_pvs = NULL; + +#define LOG_PREFIX_SIZE 128 +static char log_prefix_buf[LOG_PREFIX_SIZE]; +static str log_prefix_str; + +void log_prefix_init(void) +{ + str s; + if(log_prefix_fmt==NULL) + return; + s.s = log_prefix_fmt; s.len = strlen(s.s); + + if(pv_parse_format(&s, &log_prefix_pvs)<0) + { + LM_ERR("wrong format[%s]\n", s.s); + return; + } +} + +void log_prefix_set(sip_msg_t *msg) +{ + if(log_prefix_pvs == NULL) + return; + if(msg==NULL) { + log_prefix_val = NULL; + return; + } + log_prefix_str.s = log_prefix_buf; + log_prefix_str.len = LOG_PREFIX_SIZE; + if(pv_printf(msg, log_prefix_pvs, log_prefix_str.s, &log_prefix_str.len)<0) + return; + if(log_prefix_str.len<=0) + return; + log_prefix_val = &log_prefix_str; +} diff --git a/dprint.h b/dprint.h index 2d414c3..3c57d9c 100644 --- a/dprint.h +++ b/dprint.h @@ -118,6 +118,8 @@ extern int my_pid(void); extern int log_stderr; extern int log_color; +extern char *log_prefix_fmt; +extern str *log_prefix_val; /** @brief maps log levels to their string name and corresponding syslog level */ @@ -151,6 +153,8 @@ void dprint_color_update(int level, char f, char b); void dprint_init_colors(void); void dprint_term_color(char f, char b, str *obuf); +void log_prefix_init(void); + /** @brief * General logging macros * @@ -271,44 +275,42 @@ void dprint_term_color(char f, char b, str *obuf); do { \ if (get_debug_level(LOG_MNAME, LOG_MNAME_LEN) >= (level) && \ DPRINT_NON_CRIT) { \ + int __llevel; \ + __llevel = ((level)<L_ALERT)?L_ALERT:(((level)>L_DBG)?L_DBG:level); \ DPRINT_CRIT_ENTER; \ - if (likely(((level) >= L_ALERT) && ((level) <= L_DBG))){ \ - if (unlikely(log_stderr)) { \ - if (unlikely(log_color)) dprint_color(level); \ - fprintf(stderr, "%2d(%d) %s: %s" fmt, \ - process_no, my_pid(), \ - (lname)?(lname):LOG_LEVEL2NAME(level), \ - (prefix) , ## args);\ - if (unlikely(log_color)) dprint_color_reset(); \ + if (unlikely(log_stderr)) { \ + if (unlikely(log_color)) dprint_color(__llevel); \ + if(unlikely(log_prefix_val)) { \ + fprintf(stderr, "%.*s%2d(%d) %s: %s" fmt, \ + log_prefix_val->len, log_prefix_val->s, \ + process_no, my_pid(), \ + (lname)?(lname):LOG_LEVEL2NAME(__llevel), \ + (prefix) , ## args);\ } else { \ - syslog(LOG2SYSLOG_LEVEL(level) |\ - (((facility) != DEFAULT_FACILITY) ? \ - (facility) : \ - cfg_get(core, core_cfg, log_facility)), \ - "%s: %s" fmt,\ - (lname)?(lname):LOG_LEVEL2NAME(level),\ - (prefix) , ## args); \ + fprintf(stderr, "%2d(%d) %s: %s" fmt, \ + process_no, my_pid(), \ + (lname)?(lname):LOG_LEVEL2NAME(__llevel), \ + (prefix) , ## args);\ } \ + if (unlikely(log_color)) dprint_color_reset(); \ } else { \ - if (log_stderr) { \ - if (unlikely(log_color)) dprint_color(level); \ - fprintf(stderr, "%2d(%d) %s" fmt, \ - process_no, my_pid(), \ - (prefix) , ## args); \ - if (unlikely(log_color)) dprint_color_reset(); \ + if(unlikely(log_prefix_val)) { \ + syslog(LOG2SYSLOG_LEVEL(__llevel) |\ + (((facility) != DEFAULT_FACILITY) ? \ + (facility) : \ + cfg_get(core, core_cfg, log_facility)), \ + "%.*s%s: %s" fmt,\ + log_prefix_val->len, log_prefix_val->s, \ + (lname)?(lname):LOG_LEVEL2NAME(__llevel),\ + (prefix) , ## args); \ } else { \ - if ((level)<L_ALERT) \ - syslog(LOG2SYSLOG_LEVEL(L_ALERT) | \ - (((facility) != DEFAULT_FACILITY) ? \ - (facility) : \ - cfg_get(core, core_cfg, log_facility)),\ - "%s" fmt, (prefix) , ## args); \ - else \ - syslog(LOG2SYSLOG_LEVEL(L_DBG) | \ - (((facility) != DEFAULT_FACILITY) ? \ - (facility) : \ - cfg_get(core, core_cfg, log_facility)),\ - "%s" fmt, (prefix) , ## args); \ + syslog(LOG2SYSLOG_LEVEL(__llevel) |\ + (((facility) != DEFAULT_FACILITY) ? \ + (facility) : \ + cfg_get(core, core_cfg, log_facility)), \ + "%s: %s" fmt,\ + (lname)?(lname):LOG_LEVEL2NAME(__llevel),\ + (prefix) , ## args); \ } \ } \ DPRINT_CRIT_EXIT; \ diff --git a/main.c b/main.c index bed6ccc..be75335 100644 --- a/main.c +++ b/main.c @@ -380,6 +380,7 @@ int log_stderr = 0; int log_color = 0; /* set custom app name for syslog printing */ char *log_name = 0; +char *log_prefix_fmt = 0; pid_t creator_pid = (pid_t) -1; int config_check = 0; /* check if reply first via host==us */ @@ -1352,6 +1353,9 @@ int main_loop(void) */ cfg_main_set_local(); + /* init log prefix format */ + log_prefix_init(); + /* 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 @@ -1565,6 +1569,9 @@ int main_loop(void) */ cfg_main_set_local(); + /* init log prefix format */ + log_prefix_init(); + /* 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 diff --git a/receive.c b/receive.c index 62ad047..83f72c0 100644 --- a/receive.c +++ b/receive.c @@ -153,6 +153,8 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) } DBG("After parse_msg...\n"); + /* set log prefix */ + log_prefix_set(msg); /* ... clear branches from previous message */ clear_branches(); @@ -301,7 +303,10 @@ end: #ifdef STATS if (skipped) STATS_RX_DROPS; #endif + /* reset log prefix */ + log_prefix_set(NULL); return 0; + #ifndef NO_ONREPLY_ROUTE_ERROR error_rpl: /* execute post reply-script callbacks */ @@ -327,6 +332,8 @@ error02: pkg_free(msg); error00: STATS_RX_DROPS; + /* reset log prefix */ + log_prefix_set(NULL); return -1; }

1 0

git:master: modules:sipcapture fixed duplicate value
by Alexandr Dubovikov 10 Sep '14

10 Sep '14

Module: sip-router Branch: master Commit: 975288957ae47e2bcf3472780fe4f085605297fa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9752889… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Wed Sep 10 22:25:56 2014 +0200 modules:sipcapture fixed duplicate value --- .../examples/partrotate_unixtimestamp.pl | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/modules/sipcapture/examples/partrotate_unixtimestamp.pl b/modules/sipcapture/examples/partrotate_unixtimestamp.pl index de6737b..cda5518 100644 --- a/modules/sipcapture/examples/partrotate_unixtimestamp.pl +++ b/modules/sipcapture/examples/partrotate_unixtimestamp.pl @@ -91,7 +91,6 @@ $query = "SELECT PARTITION_NAME, PARTITION_DESCRIPTION" $sth = $db->prepare($query); $sth->execute(); my @oldparts; -my $newparts = 0; my @partsremove; while(my @ref = $sth->fetchrow_array()) { @@ -103,7 +102,6 @@ while(my @ref = $sth->fetchrow_array()) if($curtstamp <= $todaytstamp) { $PARTS{$minpart."_".$todaytstamp} = 1; - $newparts++; } else { push(@oldparts, \@ref); }

1 0

git:master: ims_usrloc_pcscf: Set proper field for service routes, when saving to DB
by Carsten Bock 10 Sep '14

10 Sep '14

Module: sip-router Branch: master Commit: fc103f947d2c2eeb4ed6f6e30f45bc9603ca86c4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fc103f9… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Wed Sep 10 21:52:11 2014 +0200 ims_usrloc_pcscf: Set proper field for service routes, when saving to DB --- modules/ims_usrloc_pcscf/usrloc_db.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/ims_usrloc_pcscf/usrloc_db.c b/modules/ims_usrloc_pcscf/usrloc_db.c index cc85163..015b602 100644 --- a/modules/ims_usrloc_pcscf/usrloc_db.c +++ b/modules/ims_usrloc_pcscf/usrloc_db.c @@ -306,8 +306,8 @@ int db_insert_pcontact(struct pcontact* _c) /* add service routes */ service_routes.len = service_routes_as_string(_c, &service_route_buffer); service_routes.s = service_route_buffer.buf; - SET_PROPER_NULL_FLAG(service_routes, values, LP_PUBLIC_IPS_IDX); - SET_STR_VALUE(GET_FIELD_IDX(values, LP_PUBLIC_IPS_IDX), service_routes); + SET_PROPER_NULL_FLAG(service_routes, values, LP_SERVICE_ROUTES_IDX); + SET_STR_VALUE(GET_FIELD_IDX(values, LP_SERVICE_ROUTES_IDX), service_routes); if (use_location_pcscf_table(_c->domain) < 0) { LM_ERR("Error trying to use table %.*s\n", _c->domain->len, _c->domain->s);

1 0

git:master: ims_registrar_pcscf: Add option to ignore "REGISTERED STATE", when checking for a registered client.
by Carsten Bock 10 Sep '14

10 Sep '14

Module: sip-router Branch: master Commit: b05795313b031d50a78589ba2bd89dd0d1811166 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b057953… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Wed Sep 10 21:51:20 2014 +0200 ims_registrar_pcscf: Add option to ignore "REGISTERED STATE", when checking for a registered client. --- modules/ims_registrar_pcscf/reg_mod.c | 7 ++++++- modules/ims_registrar_pcscf/reg_mod.h | 1 + modules/ims_registrar_pcscf/service_routes.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/ims_registrar_pcscf/reg_mod.c b/modules/ims_registrar_pcscf/reg_mod.c index fb5c715..a987a04 100644 --- a/modules/ims_registrar_pcscf/reg_mod.c +++ b/modules/ims_registrar_pcscf/reg_mod.c @@ -78,7 +78,9 @@ pua_api_t pua; /**!< PUA API structure */ int publish_reginfo = 0; int subscribe_to_reginfo = 0; int subscription_expires = 3600; -int ignore_contact_rxport_check = 0; /**!< ignore port checks between received port on message and registration received port. +int ignore_reg_state = 0; +int ignore_contact_rxport_check = 0; /**!< ignore port checks between received port on message and +registration received port. * this is useful for example if you register with UDP but possibly send invite over TCP (message too big)*/ time_t time_now; @@ -90,6 +92,8 @@ unsigned int pending_reg_expires = 30; /**!< parameter for expiry time of a pe int is_registered_fallback2ip = 0; + + char* rcv_avp_param = 0; unsigned short rcv_avp_type = 0; int_str rcv_avp_name; @@ -159,6 +163,7 @@ static param_export_t params[] = { {"subscribe_to_reginfo", INT_PARAM, &subscribe_to_reginfo }, {"subscription_expires", INT_PARAM, &subscription_expires }, {"ignore_contact_rxport_check", INT_PARAM, &ignore_contact_rxport_check }, + {"ignore_reg_state", INT_PARAM, &ignore_reg_state }, {"force_icscf_uri", PARAM_STR, &force_icscf_uri }, // {"store_profile_dereg", INT_PARAM, &store_data_on_dereg}, {0, 0, 0} diff --git a/modules/ims_registrar_pcscf/reg_mod.h b/modules/ims_registrar_pcscf/reg_mod.h index 45fdc0f..258db4b 100644 --- a/modules/ims_registrar_pcscf/reg_mod.h +++ b/modules/ims_registrar_pcscf/reg_mod.h @@ -60,6 +60,7 @@ extern unsigned short rcv_avp_type; extern int_str rcv_avp_name; extern int is_registered_fallback2ip; +extern int ignore_reg_state; #endif /* REG_MOD_H */ diff --git a/modules/ims_registrar_pcscf/service_routes.c b/modules/ims_registrar_pcscf/service_routes.c index 4380ce8..851ffad 100644 --- a/modules/ims_registrar_pcscf/service_routes.c +++ b/modules/ims_registrar_pcscf/service_routes.c @@ -137,7 +137,7 @@ int checkcontact(struct sip_msg* _m, pcontact_t * c) { } } - if ((c->reg_state == PCONTACT_REGISTERED) + if ((ignore_reg_state || (c->reg_state == PCONTACT_REGISTERED)) && (ignore_contact_rxport_check || (c->received_port == _m->rcv.src_port) || (security_server_port == _m->rcv.src_port)) && (ignore_contact_rxport_check||(c->received_proto == _m->rcv.proto))) {

1 0

git:master: modules:sipcapture fixed sql schema to version 4. Added optimized partrotation script.
by Alexandr Dubovikov 10 Sep '14

10 Sep '14

Module: sip-router Branch: master Commit: 54671510ee5864f51cf5079fd2d59df6b00b88d8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5467151… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Wed Sep 10 20:49:07 2014 +0200 modules:sipcapture fixed sql schema to version 4. Added optimized partrotation script. --- .../examples/partrotate_unixtimestamp.pl | 109 +++++++------------- modules/sipcapture/sql/create_sipcapture.sql | 13 +-- 2 files changed, 43 insertions(+), 79 deletions(-) diff --git a/modules/sipcapture/examples/partrotate_unixtimestamp.pl b/modules/sipcapture/examples/partrotate_unixtimestamp.pl index bca92a6..de6737b 100644 --- a/modules/sipcapture/examples/partrotate_unixtimestamp.pl +++ b/modules/sipcapture/examples/partrotate_unixtimestamp.pl @@ -22,7 +22,7 @@ use DBI; -$version = "0.3.0"; +$version = "0.3.1k"; $mysql_table = "sip_capture"; $mysql_dbname = "homer_db"; $mysql_user = "mysql_login"; @@ -63,62 +63,6 @@ $auth_column = "authorization" if($sql_schema_version == 1); #$db->{PrintError} = 0; -$sql = "CREATE TABLE IF NOT EXISTS `".$mysql_table."` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `date` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `micro_ts` bigint(18) NOT NULL DEFAULT '0', - `method` varchar(50) NOT NULL DEFAULT '', - `reply_reason` varchar(100) NOT NULL, - `ruri` varchar(200) NOT NULL DEFAULT '', - `ruri_user` varchar(100) NOT NULL DEFAULT '', - `from_user` varchar(100) NOT NULL DEFAULT '', - `from_tag` varchar(64) NOT NULL DEFAULT '', - `to_user` varchar(100) NOT NULL DEFAULT '', - `to_tag` varchar(64) NOT NULL, - `pid_user` varchar(100) NOT NULL DEFAULT '', - `contact_user` varchar(120) NOT NULL, - `auth_user` varchar(120) NOT NULL, - `callid` varchar(100) NOT NULL DEFAULT '', - `callid_aleg` varchar(100) NOT NULL DEFAULT '', - `via_1` varchar(256) NOT NULL, - `via_1_branch` varchar(80) NOT NULL, - `cseq` varchar(25) NOT NULL, - `diversion` varchar(256) NOT NULL, - `reason` varchar(200) NOT NULL, - `content_type` varchar(256) NOT NULL, - `".$auth_column."` varchar(120) NOT NULL, - `user_agent` varchar(256) NOT NULL, - `source_ip` varchar(60) NOT NULL DEFAULT '', - `source_port` int(10) NOT NULL, - `destination_ip` varchar(60) NOT NULL DEFAULT '', - `destination_port` int(10) NOT NULL, - `contact_ip` varchar(60) NOT NULL, - `contact_port` int(10) NOT NULL, - `originator_ip` varchar(60) NOT NULL DEFAULT '', - `originator_port` int(10) NOT NULL, - `proto` int(5) NOT NULL, - `family` int(1) DEFAULT NULL, - `rtp_stat` varchar(256) NOT NULL, - `type` int(2) NOT NULL, - `node` varchar(125) NOT NULL, - `msg` text NOT NULL, - PRIMARY KEY (`id`,`date`), - KEY `ruri_user` (`ruri_user`), - KEY `from_user` (`from_user`), - KEY `to_user` (`to_user`), - KEY `pid_user` (`pid_user`), - KEY `auth_user` (`auth_user`), - KEY `callid_aleg` (`callid_aleg`), - KEY `date` (`date`), - KEY `callid` (`callid`), - KEY `method` (`method`), - KEY `source_ip` (`source_ip`), - KEY `destination_ip` (`destination_ip`) -) ENGINE=".$engine." DEFAULT CHARSET=utf8 $compress -PARTITION BY RANGE ( UNIX_TIMESTAMP(`date`)) (PARTITION pmax VALUES LESS THAN MAXVALUE ENGINE = ".$engine.")"; - -my $sth = $db->do($sql) if($check_table == 1); - #check if the table has partitions. If not, create one my $query = "SHOW TABLE STATUS FROM ".$mysql_dbname. " WHERE Name='".$mysql_table."'"; $sth = $db->prepare($query); @@ -138,6 +82,7 @@ $curtstamp+=0; $todaytstamp+=0; + my %PARTS; #Geting all partitions $query = "SELECT PARTITION_NAME, PARTITION_DESCRIPTION" @@ -145,25 +90,50 @@ $query = "SELECT PARTITION_NAME, PARTITION_DESCRIPTION" ."\n AND TABLE_SCHEMA='".$mysql_dbname."' ORDER BY PARTITION_DESCRIPTION ASC;"; $sth = $db->prepare($query); $sth->execute(); -my ($partcount) = $sth->rows; -while(my ($minpart,$todaytstamp) = $sth->fetchrow_array()) { - - if($partcount <= $totalparts || $curtstamp <= $todaytstamp) { - #Creating HASH of existing partitions +my @oldparts; +my $newparts = 0; +my @partsremove; +while(my @ref = $sth->fetchrow_array()) +{ + + my $minpart = $ref[0]; + my $todaytstamp = $ref[1]; + + next if($minpart eq "pmax"); + + if($curtstamp <= $todaytstamp) { $PARTS{$minpart."_".$todaytstamp} = 1; - next; + $newparts++; + } + else { push(@oldparts, \@ref); } + +} + +my $partcount = $#oldparts; +if($partcount > $maxparts) +{ + foreach my $ref (@oldparts) { + + $minpart = $ref->[0]; + $todaytstamp = $ref->[1]; + + push(@partsremove,$minpart); + + $partcount--; + last if($partcount <= $maxparts); } - - next if($minpart eq "pmax"); - - $query = "ALTER TABLE ".$mysql_table." DROP PARTITION ".$minpart; +} + + +if($#partsremove > 0) +{ + + $query = "ALTER TABLE ".$mysql_table." DROP PARTITION ".join(',', @partsremove); $db->do($query); if (!$db->{Executed}) { print "Couldn't drop partition: $minpart\n"; break; } - - $partcount--; } # < condition @@ -191,4 +161,3 @@ for(my $i=0; $i<$newparts; $i++) { } } } - diff --git a/modules/sipcapture/sql/create_sipcapture.sql b/modules/sipcapture/sql/create_sipcapture.sql index 20ae09b..a7c31fa 100644 --- a/modules/sipcapture/sql/create_sipcapture.sql +++ b/modules/sipcapture/sql/create_sipcapture.sql @@ -1,12 +1,7 @@ -/* - * only for MYSQL >= 5.1.43 -*/ -/* this SQL schema version # 3 */ +/* this is SQL schema version # 4 */ -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `sip_capture` ( +CREATE TABLE IF NOT EXISTS `sip_capture` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, `date` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', `micro_ts` bigint(18) NOT NULL DEFAULT '0', @@ -29,7 +24,7 @@ CREATE TABLE `sip_capture` ( `via_1` varchar(256) NOT NULL, `via_1_branch` varchar(80) NOT NULL, `cseq` varchar(25) NOT NULL, - `diversion` varchar(256) NOT NULL DEFAULT '', + `diversion` varchar(256) NOT NULL, `reason` varchar(200) NOT NULL, `content_type` varchar(256) NOT NULL, `auth` varchar(256) NOT NULL, @@ -42,6 +37,7 @@ CREATE TABLE `sip_capture` ( `contact_port` int(10) NOT NULL, `originator_ip` varchar(60) NOT NULL DEFAULT '', `originator_port` int(10) NOT NULL, + `correlation_id` varchar(256) NOT NULL, `proto` int(5) NOT NULL, `family` int(1) DEFAULT NULL, `rtp_stat` varchar(256) NOT NULL, @@ -61,4 +57,3 @@ CREATE TABLE `sip_capture` ( PARTITION BY RANGE ( UNIX_TIMESTAMP(`date`) ) ( PARTITION pmax VALUES LESS THAN (MAXVALUE) ); -

1 0

git:master: topoh: allow server ip to be used as mask ip
by Daniel-Constantin Mierla 10 Sep '14

10 Sep '14

Module: sip-router Branch: master Commit: a0cd3fb7e3ae77c1305c05038d45ce55581b44aa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a0cd3fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 10 20:11:36 2014 +0200 topoh: allow server ip to be used as mask ip --- modules/topoh/th_msg.c | 46 ++++++++++++++++++++++++-------------------- modules/topoh/topoh_mod.c | 36 +++++++++++++++++++++++++++------- 2 files changed, 53 insertions(+), 29 deletions(-) diff --git a/modules/topoh/th_msg.c b/modules/topoh/th_msg.c index d572f00..3a68f3f 100644 --- a/modules/topoh/th_msg.c +++ b/modules/topoh/th_msg.c @@ -57,6 +57,7 @@ extern str th_vparam_name; extern str th_vparam_prefix; extern int th_param_mask_callid; +extern int th_mask_addr_myself; int th_skip_rw(char *s, int len) { @@ -126,34 +127,37 @@ int th_get_uri_type(str *uri, int *mode, str *value) if(parse_uri(uri->s, uri->len, &puri)<0) return -1; - LM_DBG("+++++++++++ PARAMS [%.*s]\n", puri.params.len, puri.params.s); + LM_DBG("PARAMS [%.*s]\n", puri.params.len, puri.params.s); if(puri.host.len==th_ip.len && strncasecmp(puri.host.s, th_ip.s, th_ip.len)==0) { /* host matches TH ip */ ret = th_get_param_value(&puri.params, &th_uparam_name, value); if(ret<0) + return -1; /* eroor parsing parameters */ + if(ret==0) + return 2; /* param found - decode */ + if(th_mask_addr_myself==0) + return 0; /* param not found - skip */ + } + + if(check_self(&puri.host, puri.port_no, 0)==1) + { + /* myself -- matched on all protos */ + ret = th_get_param_value(&puri.params, &r2, value); + if(ret<0) return -1; - return 2; /* decode */ - } else { - if(check_self(&puri.host, (puri.port_no)?puri.port_no:0, 0)==1) - { - /* myself -- matched on all protos */ - ret = th_get_param_value(&puri.params, &r2, value); - if(ret<0) - return -1; - if(ret==1) /* not found */ - return 0; /* skip */ - LM_DBG("+++++++++++++++++++************ [%.*s]\n", - value->len, value->s); - if(value->len==2 && strncasecmp(value->s, "on", 2)==0) - *mode = 1; - memset(value, 0, sizeof(str)); + if(ret==1) /* not found */ return 0; /* skip */ - } else { - return 1; /* encode */ - } + LM_DBG("VALUE [%.*s]\n", + value->len, value->s); + if(value->len==2 && strncasecmp(value->s, "on", 2)==0) + *mode = 1; + memset(value, 0, sizeof(str)); + return 0; /* skip */ } + /* not myself & not mask ip */ + return 1; /* encode */ } int th_mask_via(sip_msg_t *msg) @@ -903,7 +907,7 @@ int th_add_hdr_cookie(sip_msg_t *msg) pkg_free(h.s); return -1; } - LM_DBG("+++++++++++++ added cookie header [%s]\n", h.s); + LM_DBG("added cookie header [%s]\n", h.s); return 0; } diff --git a/modules/topoh/topoh_mod.c b/modules/topoh/topoh_mod.c index 8340f19..ff64b6c 100644 --- a/modules/topoh/topoh_mod.c +++ b/modules/topoh/topoh_mod.c @@ -1,6 +1,4 @@ /** - * $Id$ - * * Copyright (C) 2009 SIP-Router.org * * This file is part of Extensible SIP Router, a free SIP server. @@ -44,7 +42,9 @@ #include "../../tcp_options.h" #include "../../ut.h" #include "../../forward.h" +#include "../../config.h" #include "../../parser/msg_parser.h" +#include "../../parser/parse_uri.h" #include "../../parser/parse_to.h" #include "../../parser/parse_from.h" @@ -60,7 +60,7 @@ MODULE_VERSION str _th_key = str_init("aL9.n8~Hm]Z"); str th_cookie_name = str_init("TH"); /* lost parameter? */ str th_cookie_value = {0, 0}; /* lost parameter? */ -str th_ip = str_init("10.1.1.10"); +str th_ip = str_init("127.0.0.8"); str th_uparam_name = str_init("line"); str th_uparam_prefix = str_init("sr-"); str th_vparam_name = str_init("branch"); @@ -74,6 +74,7 @@ int th_param_mask_callid = 0; int th_sanity_checks = 0; sanity_api_t scb; +int th_mask_addr_myself = 0; int th_msg_received(void *data); int th_msg_sent(void *data); @@ -84,13 +85,13 @@ static int mod_init(void); static param_export_t params[]={ {"mask_key", PARAM_STR, &_th_key}, {"mask_ip", PARAM_STR, &th_ip}, - {"mask_callid", INT_PARAM, &th_param_mask_callid}, + {"mask_callid", PARAM_INT, &th_param_mask_callid}, {"uparam_name", PARAM_STR, &th_uparam_name}, {"uparam_prefix", PARAM_STR, &th_uparam_prefix}, {"vparam_name", PARAM_STR, &th_vparam_name}, {"vparam_prefix", PARAM_STR, &th_vparam_prefix}, {"callid_prefix", PARAM_STR, &th_callid_prefix}, - {"sanity_checks", INT_PARAM, &th_sanity_checks}, + {"sanity_checks", PARAM_INT, &th_sanity_checks}, {0,0,0} }; @@ -116,6 +117,9 @@ struct module_exports exports= { */ static int mod_init(void) { + sip_uri_t puri; + char buri[MAX_URI_SIZE]; + if(th_sanity_checks!=0) { if(sanity_load_api(&scb)<0) @@ -129,11 +133,25 @@ static int mod_init(void) LM_ERR("mask IP parameter is invalid\n"); goto error; } - if(check_self(&th_ip, 0, 0)==1) - { - LM_ERR("mask IP must be different than SIP server local IP\n"); + + if(th_ip.len + 32 >= MAX_URI_SIZE) { + LM_ERR("mask address is too long\n"); + goto error; + } + memcpy(buri, "sip:", 4); + memcpy(buri+4, th_ip.s, th_ip.len); + buri[th_ip.len+8] = '\0'; + + if(parse_uri(buri, th_ip.len+4, &puri)<0) { + LM_ERR("mask uri is invalid\n"); goto error; } + if(check_self(&puri.host, puri.port_no, 0)==1) + { + th_mask_addr_myself = 1; + LM_INFO("mask address matches myself [%.*s]\n", + th_ip.len, th_ip.s); + } /* 'SIP/2.0/UDP ' + ip + ';' + param + '=' + prefix (+ '\0') */ th_via_prefix.len = 12 + th_ip.len + 1 + th_vparam_name.len + 1 @@ -328,6 +346,8 @@ int th_msg_received(void *data) th_cookie_value.len = 2; } + LM_DBG("adding cookie: %.*s\n", th_cookie_value.len, th_cookie_value.s); + th_add_cookie(&msg); nbuf = th_msg_update(&msg, (unsigned int*)&obuf->len);

1 0

git:master: topoh: documentation updated for mask_ip parameter
by Daniel-Constantin Mierla 10 Sep '14

10 Sep '14

Module: sip-router Branch: master Commit: a35f99d0bceeb49edc0ebe782fad04db8476f3d9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a35f99d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 10 20:16:31 2014 +0200 topoh: documentation updated for mask_ip parameter --- modules/topoh/README | 9 +++++---- modules/topoh/doc/topoh_admin.xml | 7 ++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/topoh/README b/modules/topoh/README index 4783f9d..6895a33 100644 --- a/modules/topoh/README +++ b/modules/topoh/README @@ -128,11 +128,12 @@ modparam("topoh", "mask_key", "some secret here") 3.2. mask_ip (str) IP address to be used in masked headers to build valid SIP URIs. Can be - any IP address, even a private-space IP address (e.g., 192.168.1.1), - but must not be SIP server's local IP address. It is not used at all - for SIP routing. + any IP address, even a private-space or non-existing IP address (e.g., + 192.168.1.1, 127.0.0.2), including the SIP server address, but must not + be an address potentially used by clients. It is not used at all for + SIP routing. - Default value is "10.1.1.10". + Default value is "127.0.0.8". Example 1.2. Set mask_ip parameter ... diff --git a/modules/topoh/doc/topoh_admin.xml b/modules/topoh/doc/topoh_admin.xml index 66719ee..f932b3e 100644 --- a/modules/topoh/doc/topoh_admin.xml +++ b/modules/topoh/doc/topoh_admin.xml @@ -89,13 +89,14 @@ modparam("topoh", "mask_key", "some secret here") <title><varname>mask_ip</varname> (str)</title> <para> IP address to be used in masked headers to build valid - SIP URIs. Can be any IP address, even a private-space IP address - (e.g., 192.168.1.1), but must not be SIP server's local IP address. + SIP URIs. Can be any IP address, even a private-space or non-existing + IP address (e.g., 192.168.1.1, 127.0.0.2), including the SIP server + address, but must not be an address potentially used by clients. It is not used at all for SIP routing. </para> <para> <emphasis> - Default value is "10.1.1.10". + Default value is "127.0.0.8". </emphasis> </para> <example>

1 0

git:master: core: fix execution of callbacks list for net_data_in
by Daniel-Constantin Mierla 10 Sep '14

10 Sep '14

Module: sip-router Branch: master Commit: 6435d8a8666423eda76a0bddae5ee74690882969 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6435d8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 10 20:11:14 2014 +0200 core: fix execution of callbacks list for net_data_in --- events.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/events.c b/events.c index 6de9e2f..0e1d85d 100644 --- a/events.c +++ b/events.c @@ -194,7 +194,7 @@ int sr_event_exec(int type, void *data) #endif /* EXTRA_DEBUG */ ret = 0; for(i=0; i<SREV_CB_LIST_SIZE - && _sr_events_list.net_data_out[i]; i++) { + && _sr_events_list.net_data_in[i]; i++) { ret |= _sr_events_list.net_data_in[i](data); } #ifdef EXTRA_DEBUG

1 0

git:master: usrloc: new parameter db_raw_fetch_type
by Daniel-Constantin Mierla 10 Sep '14

10 Sep '14

Module: sip-router Branch: master Commit: ec1dfe890db6bd8ea50edc55e6774908d74a672e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ec1dfe8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 10 18:55:44 2014 +0200 usrloc: new parameter db_raw_fetch_type - specify what type of query should be used in DB-only mode for retrieving contacts for specific needs (e.g., sending NAT keepalives) --- modules/usrloc/README | 19 +++++++++++++++++++ modules/usrloc/dlist.c | 15 ++++++++------- modules/usrloc/doc/usrloc_admin.xml | 24 ++++++++++++++++++++++++ modules/usrloc/ul_mod.c | 2 ++ 4 files changed, 53 insertions(+), 7 deletions(-) diff --git a/modules/usrloc/README b/modules/usrloc/README index 68fac27..ed9df55 100644 --- a/modules/usrloc/README +++ b/modules/usrloc/README @@ -70,6 +70,7 @@ Bogdan-Andrei Iancu 3.32. db_ops_ruid (int) 3.33. handle_lost_tcp (int) 3.34. expires_type (int) + 3.35. db_raw_fetch_type (int) 4. Functions 5. MI Commands @@ -161,6 +162,7 @@ Bogdan-Andrei Iancu 1.32. Set db_ops_ruid parameter 1.33. Set handle_lost_tcp parameter 1.34. Set expires_type parameter + 1.35. Set db_raw_fetch_type parameter Chapter 1. Admin Guide @@ -211,6 +213,7 @@ Chapter 1. Admin Guide 3.32. db_ops_ruid (int) 3.33. handle_lost_tcp (int) 3.34. expires_type (int) + 3.35. db_raw_fetch_type (int) 4. Functions 5. MI Commands @@ -333,6 +336,7 @@ Chapter 1. Admin Guide 3.32. db_ops_ruid (int) 3.33. handle_lost_tcp (int) 3.34. expires_type (int) + 3.35. db_raw_fetch_type (int) 3.1. nat_bflag (integer) @@ -799,6 +803,21 @@ modparam("usrloc", "handle_lost_tcp", 1) modparam("usrloc", "expires_type", 1) ... +3.35. db_raw_fetch_type (int) + + This affect DB-only mode and controls what kind of raw query is used to + fetch the contacts from database for specific needs (e.g., sending NAT + keepalives). If it is set to 0, then the common SQL query is used + (working for MySQL, PostgreSQL, ...). If it is set to 1, the query + required by Oracle is used. + + Default value is "0". + + Example 1.35. Set db_raw_fetch_type parameter +... +modparam("usrloc", "db_raw_fetch_type", 1) +... + 4. Functions There are no exported functions that could be used in scripts. diff --git a/modules/usrloc/dlist.c b/modules/usrloc/dlist.c index 1fbfacf..8ac272a 100644 --- a/modules/usrloc/dlist.c +++ b/modules/usrloc/dlist.c @@ -79,6 +79,11 @@ static inline int find_dlist(str* _n, dlist_t** _d) return 1; } +extern int ul_db_raw_fetch_type; + +#define UL_DB_RAW_FETCH_COMMON "select %.*s, %.*s, %.*s, %.*s, %.*s, %.*s from %s where %.*s > %.*s and %.*s & %d = %d and id %% %u = %u" + +#define UL_DB_RAW_FETCH_ORACLE "select %.*s, %.*s, %.*s, %.*s, %.*s, %.*s from %s where %.*s > %.*s and bitand(%.*s, %d) = %d and mod(id, %u) = %u" /*! * \brief Get all contacts from the database, in partitions if wanted @@ -134,13 +139,9 @@ static inline int get_all_db_ucontacts(void *buf, int len, unsigned int flags, for (dom = root; dom!=NULL ; dom=dom->next) { /* build query */ - i = snprintf( query_buf, sizeof(query_buf), "select %.*s, %.*s, %.*s," - " %.*s, %.*s, %.*s from %s where %.*s > %.*s and" -#ifdef ORACLE_USRLOC - " bitand(%.*s, %d) = %d and mod(id, %u) = %u", -#else - " %.*s & %d = %d and id %% %u = %u", -#endif + i = snprintf( query_buf, sizeof(query_buf), + (ul_db_raw_fetch_type==1)? + UL_DB_RAW_FETCH_ORACLE:UL_DB_RAW_FETCH_COMMON, received_col.len, received_col.s, contact_col.len, contact_col.s, sock_col.len, sock_col.s, diff --git a/modules/usrloc/doc/usrloc_admin.xml b/modules/usrloc/doc/usrloc_admin.xml index b4f68a0..6520b49 100644 --- a/modules/usrloc/doc/usrloc_admin.xml +++ b/modules/usrloc/doc/usrloc_admin.xml @@ -921,6 +921,30 @@ modparam("usrloc", "expires_type", 1) </example> </section> + <section id="usrloc.p.db_raw_fetch_type"> + <title><varname>db_raw_fetch_type</varname> (int)</title> + <para> + This affect DB-only mode and controls what kind of + raw query is used to fetch the contacts from database for + specific needs (e.g., sending NAT keepalives). If it is set to 0, + then the common SQL query is used (working for MySQL, PostgreSQL, + ...). If it is set to 1, the query required by Oracle is used. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>db_raw_fetch_type</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "db_raw_fetch_type", 1) +... +</programlisting> + </example> + </section> + </section> <section> diff --git a/modules/usrloc/ul_mod.c b/modules/usrloc/ul_mod.c index b51675e..a8a0b91 100644 --- a/modules/usrloc/ul_mod.c +++ b/modules/usrloc/ul_mod.c @@ -120,6 +120,7 @@ int ul_keepalive_timeout = 0; int ul_db_ops_ruid = 0; int ul_expires_type = 0; +int ul_db_raw_fetch_type = 0; str ul_xavp_contact_name = {0}; @@ -224,6 +225,7 @@ static param_export_t params[] = { {"xavp_contact", PARAM_STR, &ul_xavp_contact_name}, {"db_ops_ruid", INT_PARAM, &ul_db_ops_ruid}, {"expires_type", PARAM_INT, &ul_expires_type}, + {"db_raw_fetch_type", PARAM_INT, &ul_db_raw_fetch_type}, {0, 0, 0} };

1 0

git:master: Makefile.groups: ndb_mongodb added to mongodb modules group
by Daniel-Constantin Mierla 10 Sep '14

10 Sep '14

Module: sip-router Branch: master Commit: 81e749aedccd96310a65a8578da48e3d9b80df26 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=81e749a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 10 18:35:19 2014 +0200 Makefile.groups: ndb_mongodb added to mongodb modules group --- Makefile.groups | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.groups b/Makefile.groups index acebbdb..f2e6033 100644 --- a/Makefile.groups +++ b/Makefile.groups @@ -167,7 +167,7 @@ mod_list_ev=evapi mod_list_kazoo=kazoo # - modules depending on mongodb -mod_list_mongodb=db_mongodb +mod_list_mongodb=db_mongodb ndb_mongodb # - all modules mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
38
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2014