sr-dev September 2011

sr-dev@lists.kamailio.org

40 participants
298 discussions

git:master: acc: documented new parameter acc_prepare_flag
by Daniel-Constantin Mierla 23 Sep '11

23 Sep '11

Module: sip-router Branch: master Commit: b986c7f0ace6d5d96bf99add235c56045176a31a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b986c7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 23 12:52:10 2011 +0200 acc: documented new parameter acc_prepare_flag --- modules_k/acc/README | 442 ++++++++++++++++++++------------------- modules_k/acc/doc/acc_admin.xml | 20 ++ 2 files changed, 250 insertions(+), 212 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=b98…

1 0

git:master: acc: added acc_prepare_flag parameter
by Daniel-Constantin Mierla 23 Sep '11

23 Sep '11

Module: sip-router Branch: master Commit: cf7a3249f9f792b0873b20bf6998f2ba74d7eb9d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cf7a324… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 23 12:42:22 2011 +0200 acc: added acc_prepare_flag parameter - useful to tell to acc module to prepare the request for later accounting, in case the acc or missed call flag is not set in request route block at all. Otherwise there will be no accounting if the acc flags are set for first time in TM routes (e.g., like failure_route) - dicovered in a discussion with Ozren Lapcevic --- modules_k/acc/acc_logic.c | 5 ++++- modules_k/acc/acc_mod.c | 2 ++ modules_k/acc/acc_mod.h | 1 + 3 files changed, 7 insertions(+), 1 deletions(-) diff --git a/modules_k/acc/acc_logic.c b/modules_k/acc/acc_logic.c index 6874327..d6e6d53 100644 --- a/modules_k/acc/acc_logic.c +++ b/modules_k/acc/acc_logic.c @@ -100,6 +100,8 @@ struct acc_enviroment acc_env; #define skip_cancel(_rq) \ (((_rq)->REQ_METHOD==METHOD_CANCEL) && report_cancels==0) +#define is_acc_prepare_on(_rq) \ + (is_acc_flag_set(_rq,acc_prepare_flag)) @@ -228,7 +230,8 @@ void acc_onreq( struct cell* t, int type, struct tmcb_params *ps ) int is_invite; if ( ps->req && !skip_cancel(ps->req) && - (is_acc_on(ps->req) || is_mc_on(ps->req)) ) { + ( is_acc_on(ps->req) || is_mc_on(ps->req) + || is_acc_prepare_on(ps->req) ) ) { /* do some parsing in advance */ if (acc_preparse_req(ps->req)<0) return; diff --git a/modules_k/acc/acc_mod.c b/modules_k/acc/acc_mod.c index d64610f..3dbf1f1 100644 --- a/modules_k/acc/acc_mod.c +++ b/modules_k/acc/acc_mod.c @@ -108,6 +108,7 @@ static char *failed_filter_str = 0; /* by default, do not filter logging of unsigned short failed_filter[MAX_FAILED_FILTER_COUNT + 1]; static char* leg_info_str = 0; /*!< multi call-leg support */ struct acc_extra *leg_info = 0; +int acc_prepare_flag = -1; /*!< should the request be prepared for later acc */ /* ----- SYSLOG acc variables ----------- */ @@ -236,6 +237,7 @@ static param_export_t params[] = { {"report_cancels", INT_PARAM, &report_cancels }, {"multi_leg_info", STR_PARAM, &leg_info_str }, {"detect_direction", INT_PARAM, &detect_direction }, + {"acc_prepare_flag", INT_PARAM, &acc_prepare_flag }, /* syslog specific */ {"log_flag", INT_PARAM, &log_flag }, {"log_missed_flag", INT_PARAM, &log_missed_flag }, diff --git a/modules_k/acc/acc_mod.h b/modules_k/acc/acc_mod.h index cf900fe..ca76eff 100644 --- a/modules_k/acc/acc_mod.h +++ b/modules_k/acc/acc_mod.h @@ -49,6 +49,7 @@ extern int early_media; extern int failed_transaction_flag; extern unsigned short failed_filter[]; extern int detect_direction; +extern int acc_prepare_flag; extern int log_facility; extern int log_level;

1 0

Sip-router gentoo ebuild v3.1.5
by caio 23 Sep '11

23 Sep '11

Hello, Just want to announce the availability of an ebuild for version 3.1.5 (kamailio and ser flavours) on Gentoo Portage Overlays. Here the git link: * http://git.overlays.gentoo.org/gitweb/?p=user/caio.git;a=tree;f=net-misc/si… The unofficial overlays portage website: * http://gpo.zugaina.org/net-misc/sip-router Important, this is not an official ebuild, and neither it's not at official gentoo portage tree. You can use *layman* to add this overlay. Also at pkg/ser/gentoo path of sip-router project you can find the latest version. If you need any guidance to probe this ebuild under your gentoo linux do not hesitate to contact me or provide some feedback here at the lists. Best regards, Claudio

1 0

git:master: siptrace: track outgoing CANCEL requests
by Daniel-Constantin Mierla 23 Sep '11

23 Sep '11

Module: sip-router Branch: master Commit: 7b2eca4939ccae16ec7af4fa42e4b8a6e1a92b2f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7b2eca4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 23 11:46:20 2011 +0200 siptrace: track outgoing CANCEL requests - use associated INVITE transaction to check the siptrace flag state - reported by Timo Klecker --- modules_k/siptrace/siptrace.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/modules_k/siptrace/siptrace.c b/modules_k/siptrace/siptrace.c index c1ae15d..93c1db7 100644 --- a/modules_k/siptrace/siptrace.c +++ b/modules_k/siptrace/siptrace.c @@ -993,8 +993,21 @@ static void trace_onreq_out(struct cell* t, int type, struct tmcb_params *ps) } msg=ps->req; if(msg==NULL) { - LM_DBG("no uas msg, local transaction\n"); - return; + /* check if it is outgoing cancel, t is INVITE + * and send_buf starts with CANCEL */ + if(is_invite(t) && ps->send_buf.len>7 + && strncmp(ps->send_buf.s, "CANCEL ", 7)==0) { + msg = t->uas.request; + if(msg==NULL) { + LM_DBG("no uas msg for INVITE transaction\n"); + return; + } else { + LM_DBG("recording CANCEL based on INVITE transaction\n"); + } + } else { + LM_DBG("no uas msg, local transaction\n"); + return; + } } memset(&sto, 0, sizeof(struct _siptrace_data));

1 0

Re: [sr-dev] git:adubovikov/homer: Added support for distribution lookup between many AOR. Now only RAND and Round Robin are supported.
by Henning Westerholt 23 Sep '11

23 Sep '11

On Friday 23 September 2011, Alexandr Dubovikov wrote: > Hi Henning, > > sorry for delay, I was on vacation :-) > > yes, this method allows you make choose between different AORs. For > example: you can register the same user multiple times and after lookup > you will distribute incoming calls between these AORs. If you have 4 > registration, each will receive 25% of all incoming calls. It can help to > buid a cluster system based on registration. Hi Alexandr, thanks. :-) Maybe you can add the description you just gave to the module readme? Best regards, Henning

1 0

git:adubovikov/homer: modules/sipcapture: fix mysql MAXVALUE partitioning.
by Alexandr Dubovikov 22 Sep '11

22 Sep '11

Module: sip-router Branch: adubovikov/homer Commit: 1010f7bf5a024679e2ec056fd1db2c20b8d7a3b9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1010f7b… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Thu Sep 22 17:17:42 2011 +0200 modules/sipcapture: fix mysql MAXVALUE partitioning. Thanks Dorn B. <djbinter(a)gmail.com> for report and fix. --- modules/sipcapture/examples/partrotate_todays.pl | 5 +++-- .../examples/partrotate_unixtimestamp.pl | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/sipcapture/examples/partrotate_todays.pl b/modules/sipcapture/examples/partrotate_todays.pl index f9e9059..2469a7c 100644 --- a/modules/sipcapture/examples/partrotate_todays.pl +++ b/modules/sipcapture/examples/partrotate_todays.pl @@ -74,8 +74,9 @@ for(my $i=0; $i<$newparts; $i++) { if(!$exist) { - $query = "ALTER TABLE ".$table." ADD PARTITION (PARTITION ".$newpartname - ."\n VALUES LESS THAN (".$curtodays.") ENGINE = MyISAM)"; + $query = "ALTER TABLE ".$table." REORGANIZE PARTITION pmax INTO (PARTITION ".$newpartname + ."\n VALUES LESS THAN (".$curtodays.") ENGINE = MyISAM, PARTITION pmax VALUES LESS THAN MAXVALUE ENGINE = MyISAM)"; + $db->do($query); if (!$db->{Executed}) { print "Couldn't add partition: $newpartname\n"; diff --git a/modules/sipcapture/examples/partrotate_unixtimestamp.pl b/modules/sipcapture/examples/partrotate_unixtimestamp.pl index 40d36a4..b9e221e 100644 --- a/modules/sipcapture/examples/partrotate_unixtimestamp.pl +++ b/modules/sipcapture/examples/partrotate_unixtimestamp.pl @@ -83,8 +83,10 @@ for(my $i=0; $i<$newparts; $i++) { if(!$exist) { - $query = "ALTER TABLE ".$table." ADD PARTITION (PARTITION ".$newpartname - ."\n VALUES LESS THAN (".$curtstamp.") ENGINE = MyISAM)"; + # Fix MAXVALUE. Thanks Dorn B. <djbinter(a)gmail.com> for report and fix. + $query = "ALTER TABLE ".$table." REORGANIZE PARTITION pmax INTO (PARTITION ".$newpartname + ."\n VALUES LESS THAN (".$curtstamp.") ENGINE = MyISAM, PARTITION pmax VALUES LESS THAN MAXVALUE ENGINE = MyISAM)"; + $db->do($query); if (!$db->{Executed}) { print "Couldn't add partition: $newpartname\n";

1 0

git:adubovikov/homer: modules/sipcapture: Fix for mirroring port support.
by Alexandr Dubovikov 22 Sep '11

22 Sep '11

Module: sip-router Branch: adubovikov/homer Commit: 568e94a33b49424f80f79b2f1cbea1de424721da URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=568e94a… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Thu Sep 22 17:14:32 2011 +0200 modules/sipcapture: Fix for mirroring port support. --- modules/sipcapture/README | 78 +++++++++------ modules/sipcapture/doc/sipcapture_admin.xml | 27 +++++- modules/sipcapture/examples/kamailio.cfg | 2 + modules/sipcapture/sipcapture.c | 145 +++++++++++++++++++-------- modules/sipcapture/sipcapture.h | 53 ++++++++++ 5 files changed, 231 insertions(+), 74 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=568…

1 0

git:adubovikov/homer: core: prepare raw_sock for monitoring port usage
by Alexandr Dubovikov 22 Sep '11

22 Sep '11

Module: sip-router Branch: adubovikov/homer Commit: 9a0390327614065f0992c032bfa474f2e4df2301 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9a03903… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Thu Sep 22 16:11:45 2011 +0200 core: prepare raw_sock for monitoring port usage --- raw_sock.c | 42 +++++++++++++++++++++++++++++++++++++----- raw_sock.h | 1 + 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/raw_sock.c b/raw_sock.c index b514a87..601d321 100644 --- a/raw_sock.c +++ b/raw_sock.c @@ -85,6 +85,8 @@ #endif /* __OS_* */ int raw_ipip = 0; /* set if raw socket is in capture mode for IPIP */ +int raw_moni = 0; /* set if raw socket is in capture mode for monitor port */ +#define ETHHDR 14 /* sizeof of ethhdr structure */ /** create and return a raw socket. @@ -244,13 +246,20 @@ int recvpkt4(int sock, char* buf, int len, union sockaddr_union* from, rcv_msg.msg_iovlen=1; ret=-2; /* no PKT_INFO or AF mismatch */ retry: - n=recvmsg(sock, &rcv_msg, MSG_WAITALL); + n=recvmsg(sock, &rcv_msg, raw_moni ? 0 : MSG_WAITALL); if (unlikely(n==-1)){ if (errno==EINTR) goto retry; ret=n; goto end; } + + /* RAW MONI */ + if(raw_moni) { + ret = n; + goto end; + } + /* find the pkt info */ for (cmsg=CMSG_FIRSTHDR(&rcv_msg); cmsg; cmsg=CMSG_NXTHDR(&rcv_msg, cmsg)){ #ifdef IP_PKTINFO @@ -309,7 +318,7 @@ int raw_udp4_recv(int rsock, char** buf, int len, union sockaddr_union* from, int n; unsigned short dst_port; unsigned short src_port; - struct ip_addr dst_ip; + struct ip_addr dst_ip, src_ip; char* end; char* udph_start; char* udp_payload; @@ -321,13 +330,15 @@ int raw_udp4_recv(int rsock, char** buf, int len, union sockaddr_union* from, if (unlikely(n<0)) goto error; end=*buf+n; - if (unlikely(n<((sizeof(struct ip) * raw_ipip ? 2 : 1)+sizeof(struct udphdr)))) { + if (unlikely(n<((sizeof(struct ip) * raw_ipip ? 2 : 1)+sizeof(struct udphdr) + (raw_moni ? ETHHDR : 0)))) { n=-3; goto error; } if(raw_ipip) - *buf = *buf + sizeof(struct ip); + *buf = *buf + sizeof(struct ip); + else if(raw_moni) + *buf = *buf + ETHHDR; /* FIXME: if initial buffer is aligned, one could skip the memcpy and directly cast ip and udphdr pointer to the memory */ @@ -345,7 +356,7 @@ int raw_udp4_recv(int rsock, char** buf, int len, union sockaddr_union* from, n=-3; goto error; }else{ - ERR("udp length too small: %d/%d\n", + if(!raw_moni) ERR("udp length too small: %d/%d\n", (int)udp_len, (int)(end-udph_start)); n=-3; goto error; @@ -363,8 +374,29 @@ int raw_udp4_recv(int rsock, char** buf, int len, union sockaddr_union* from, ip_addr2su(to, &dst_ip, dst_port); /* fill src_port */ src_port=ntohs(udph.uh_sport); + /* Need to fill from structure */ + if(raw_moni) { + src_ip.af=AF_INET; + src_ip.len=4; + src_ip.u.addr32[0]=iph.ip_src.s_addr; + ip_addr2su(from, &src_ip, src_port); + } su_setport(from, src_port); if (likely(rf)) { + + /* check moni mode */ + if(raw_moni) { + if(dst_port && src_port && + ( ((dst_port >= rf->port1) && (dst_port <= rf->port2)) || + ((src_port >= rf->port1) && (src_port <= rf->port2)) + )) { + /* match */ + goto error; + } + n=-4; + goto error; + } + su2ip_addr(&dst_ip, to); if ( (dst_port && rf->port1 && ((dst_port<rf->port1) || (dst_port>rf->port2)) ) || diff --git a/raw_sock.h b/raw_sock.h index 868399f..cd72954 100644 --- a/raw_sock.h +++ b/raw_sock.h @@ -40,6 +40,7 @@ struct raw_filter{ }; extern int raw_ipip; +extern int raw_moni; int raw_socket(int proto, struct ip_addr* ip, str* iface, int iphdr_incl); int raw_udp4_socket(struct ip_addr* ip, str* iface, int iphdr_incl);

1 0

git:adubovikov/homer: modules/sipcapture, modules_k/siptrace: fix merge
by Alexandr Dubovikov 22 Sep '11

22 Sep '11

Module: sip-router Branch: adubovikov/homer Commit: 95a3ea6375752cd8c741f9a59987f3e8a83a5710 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=95a3ea6… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Thu Sep 22 16:08:40 2011 +0200 modules/sipcapture, modules_k/siptrace: fix merge --- modules/sipcapture/examples/crontabtruncate.pl | 10 - modules/sipcapture/examples/kamailio.cfg | 8 - modules/sipcapture/examples/partrotate_todays.pl | 5 +- .../examples/partrotate_unixtimestamp.pl | 6 +- modules/sipcapture/sipcapture.c | 17 -- modules/sipcapture/sql/sipcapture-create.sql | 32 --- modules_k/siptrace/siptrace.c | 260 -------------------- 7 files changed, 4 insertions(+), 334 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=95a…

1 0

git:adubovikov/homer: modules/sipcapture: fix mysql MAXVALUE error.
by Alexandr Dubovikov 22 Sep '11

22 Sep '11

Module: sip-router Branch: adubovikov/homer Commit: 71ea0f261d080b623872304264198ea65d6033c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=71ea0f2… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Thu Sep 22 15:41:02 2011 +0200 modules/sipcapture: fix mysql MAXVALUE error. Thanks Dorn B. <djbinter(a)gmail.com> for report and fix. --- modules/sipcapture/examples/partrotate_todays.pl | 5 +++-- .../examples/partrotate_unixtimestamp.pl | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/sipcapture/examples/partrotate_todays.pl b/modules/sipcapture/examples/partrotate_todays.pl index f9e9059..2469a7c 100644 --- a/modules/sipcapture/examples/partrotate_todays.pl +++ b/modules/sipcapture/examples/partrotate_todays.pl @@ -74,8 +74,9 @@ for(my $i=0; $i<$newparts; $i++) { if(!$exist) { - $query = "ALTER TABLE ".$table." ADD PARTITION (PARTITION ".$newpartname - ."\n VALUES LESS THAN (".$curtodays.") ENGINE = MyISAM)"; + $query = "ALTER TABLE ".$table." REORGANIZE PARTITION pmax INTO (PARTITION ".$newpartname + ."\n VALUES LESS THAN (".$curtodays.") ENGINE = MyISAM, PARTITION pmax VALUES LESS THAN MAXVALUE ENGINE = MyISAM)"; + $db->do($query); if (!$db->{Executed}) { print "Couldn't add partition: $newpartname\n"; diff --git a/modules/sipcapture/examples/partrotate_unixtimestamp.pl b/modules/sipcapture/examples/partrotate_unixtimestamp.pl index 40d36a4..b9e221e 100644 --- a/modules/sipcapture/examples/partrotate_unixtimestamp.pl +++ b/modules/sipcapture/examples/partrotate_unixtimestamp.pl @@ -83,8 +83,10 @@ for(my $i=0; $i<$newparts; $i++) { if(!$exist) { - $query = "ALTER TABLE ".$table." ADD PARTITION (PARTITION ".$newpartname - ."\n VALUES LESS THAN (".$curtstamp.") ENGINE = MyISAM)"; + # Fix MAXVALUE. Thanks Dorn B. <djbinter(a)gmail.com> for report and fix. + $query = "ALTER TABLE ".$table." REORGANIZE PARTITION pmax INTO (PARTITION ".$newpartname + ."\n VALUES LESS THAN (".$curtstamp.") ENGINE = MyISAM, PARTITION pmax VALUES LESS THAN MAXVALUE ENGINE = MyISAM)"; + $db->do($query); if (!$db->{Executed}) { print "Couldn't add partition: $newpartname\n";

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
30
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 2011