sr-dev August 2011

sr-dev@lists.kamailio.org

33 participants
291 discussions

by Timo Reimann

Hi all, as announced quite a while ago, I finally checked in code that allows to produce CDRs (Call Data Records) directly from SIP-Router and generate logs accordingly. The main code portion resides in modules_k/acc and provides a switch to enable basic CDR generation including start time, end time, and duration. Analogous to the existing logging approach, you may define an extra parameter covering to-be-included dialog pseudo-variables that must be assigned in the configuration script. The new code will take care of transforming the basic and custom CDR fields into CDR logs at the end of a dialog. Speaking of dialogs: The implementation relies heavily on the dialog module. It takes advantage of dialog variables introduces by Carsten Bock and adds a few more features. Most notably, we had to change the dialog callback signature to provide both request and response messages. Having only one of them proved to be insufficient in certain cases; for instance, a locally generated 408 returned a FAKED_REPLY, thus rendering it impossible to access dialog variables through the PV framework. Other modules using dialog callbacks have been updated along the commit, third-party modules outside the repository will need to do so too (and think about whether using the request or response is the Right Thing to do). Due to the changes brought to the dialog module, I pushed the new acc and dialog code into a separate branch called treimann/acc-cdr. Feel free to give it a try by consulting the updated documentation and suggesting (or, if it's good enough, implementing :) ) improvements. A Kamailio 1.5 backport of the code has been in usage for quite some time with us, so generally there shouldn't be any major logical flaws. SIP-Router certainly needs more testing, however, so I'd be glad for any feedback. My plan is to merge the code into master branch prior to the 3.2 feature freeze, unless significant objections arise. Finally, big-time credits go to my co-worker Sven Knoblich who is the main contributor of the code. He's been working on this stuff for the past few months and dreams in CDRs by now. Cheers, --Timo

12 years, 8 months

Aync module is not included in deb package

by Iñaki Baz Castillo

Hi, should async module be included directly in kamailio package (as it ha.s no dependencies). BTW in the debs packages provided by deb.kamailio.org repository the module is not present. Thanks. -- Iñaki Baz Castillo <ibc(a)aliax.net>

12 years, 8 months

git:3.1: kamctl: added missing db tables creation scripts

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 6239efef5fe047248843da847d1cc458a44bd658 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6239efe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Aug 3 18:03:05 2011 +0200 kamctl: added missing db tables creation scripts - pipelimit was not generated after cherry-picking the xml schema definition, reported by Hala Alramli - other tables were ignored due to match of 'kamailio' token in path due to gitignore rules --- utils/kamctl/db_berkeley/kamailio/mtree | 12 ++++++++++++ utils/kamctl/db_berkeley/kamailio/pl_pipes | 12 ++++++++++++ utils/kamctl/db_berkeley/kamailio/uacreg | 12 ++++++++++++ utils/kamctl/dbtext/kamailio/mtree | 2 ++ utils/kamctl/dbtext/kamailio/pl_pipes | 2 ++ utils/kamctl/dbtext/kamailio/uacreg | 2 ++ utils/kamctl/mysql/pipelimit-create.sql | 8 ++++++++ utils/kamctl/oracle/pipelimit-create.sql | 16 ++++++++++++++++ utils/kamctl/postgres/pipelimit-create.sql | 8 ++++++++ 9 files changed, 74 insertions(+), 0 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/mtree b/utils/kamctl/db_berkeley/kamailio/mtree new file mode 100644 index 0000000..ec9b169 --- /dev/null +++ b/utils/kamctl/db_berkeley/kamailio/mtree @@ -0,0 +1,12 @@ +METADATA_COLUMNS +id(int) tprefix(str) tvalue(str) +METADATA_KEY + +METADATA_READONLY +0 +METADATA_LOGFLAGS +0 +METADATA_DEFAULTS +NIL|''|'' +mtree| +mtree|1 diff --git a/utils/kamctl/db_berkeley/kamailio/pl_pipes b/utils/kamctl/db_berkeley/kamailio/pl_pipes new file mode 100644 index 0000000..01a105e --- /dev/null +++ b/utils/kamctl/db_berkeley/kamailio/pl_pipes @@ -0,0 +1,12 @@ +METADATA_COLUMNS +id(int) pipeid(str) algorithm(str) plimit(int) +METADATA_KEY + +METADATA_READONLY +0 +METADATA_LOGFLAGS +0 +METADATA_DEFAULTS +NIL|''|''|0 +pl_pipes| +pl_pipes|1 diff --git a/utils/kamctl/db_berkeley/kamailio/uacreg b/utils/kamctl/db_berkeley/kamailio/uacreg new file mode 100644 index 0000000..2ebc01c --- /dev/null +++ b/utils/kamctl/db_berkeley/kamailio/uacreg @@ -0,0 +1,12 @@ +METADATA_COLUMNS +id(int) l_uuid(str) l_username(str) l_domain(str) r_username(str) r_domain(str) realm(str) auth_username(str) auth_password(str) auth_proxy(str) expires(int) +METADATA_KEY + +METADATA_READONLY +0 +METADATA_LOGFLAGS +0 +METADATA_DEFAULTS +NIL|''|''|''|''|''|''|''|''|''|0 +uacreg| +uacreg|1 diff --git a/utils/kamctl/dbtext/kamailio/mtree b/utils/kamctl/dbtext/kamailio/mtree new file mode 100644 index 0000000..2b6dcb6 --- /dev/null +++ b/utils/kamctl/dbtext/kamailio/mtree @@ -0,0 +1,2 @@ +id(int,auto) tprefix(string) tvalue(string) +mtree:1 diff --git a/utils/kamctl/dbtext/kamailio/pl_pipes b/utils/kamctl/dbtext/kamailio/pl_pipes new file mode 100644 index 0000000..bc51e86 --- /dev/null +++ b/utils/kamctl/dbtext/kamailio/pl_pipes @@ -0,0 +1,2 @@ +id(int,auto) pipeid(string) algorithm(string) plimit(int) +pl_pipes:1 diff --git a/utils/kamctl/dbtext/kamailio/uacreg b/utils/kamctl/dbtext/kamailio/uacreg new file mode 100644 index 0000000..cbb82bb --- /dev/null +++ b/utils/kamctl/dbtext/kamailio/uacreg @@ -0,0 +1,2 @@ +id(int,auto) l_uuid(string) l_username(string) l_domain(string) r_username(string) r_domain(string) realm(string) auth_username(string) auth_password(string) auth_proxy(string) expires(int) +uacreg:1 diff --git a/utils/kamctl/mysql/pipelimit-create.sql b/utils/kamctl/mysql/pipelimit-create.sql new file mode 100644 index 0000000..86fd350 --- /dev/null +++ b/utils/kamctl/mysql/pipelimit-create.sql @@ -0,0 +1,8 @@ +INSERT INTO version (table_name, table_version) values ('pl_pipes','1'); +CREATE TABLE pl_pipes ( + id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, + pipeid VARCHAR(64) DEFAULT '' NOT NULL, + algorithm VARCHAR(32) DEFAULT '' NOT NULL, + plimit INT DEFAULT 0 NOT NULL +) ENGINE=MyISAM; + diff --git a/utils/kamctl/oracle/pipelimit-create.sql b/utils/kamctl/oracle/pipelimit-create.sql new file mode 100644 index 0000000..09439a4 --- /dev/null +++ b/utils/kamctl/oracle/pipelimit-create.sql @@ -0,0 +1,16 @@ +INSERT INTO version (table_name, table_version) values ('pl_pipes','1'); +CREATE TABLE pl_pipes ( + id NUMBER(10) PRIMARY KEY, + pipeid VARCHAR2(64) DEFAULT '', + algorithm VARCHAR2(32) DEFAULT '', + plimit NUMBER(10) DEFAULT 0 NOT NULL +); + +CREATE OR REPLACE TRIGGER pl_pipes_tr +before insert on pl_pipes FOR EACH ROW +BEGIN + auto_id(:NEW.id); +END pl_pipes_tr; +/ +BEGIN map2users('pl_pipes'); END; +/ diff --git a/utils/kamctl/postgres/pipelimit-create.sql b/utils/kamctl/postgres/pipelimit-create.sql new file mode 100644 index 0000000..6c4917b --- /dev/null +++ b/utils/kamctl/postgres/pipelimit-create.sql @@ -0,0 +1,8 @@ +INSERT INTO version (table_name, table_version) values ('pl_pipes','1'); +CREATE TABLE pl_pipes ( + id SERIAL PRIMARY KEY NOT NULL, + pipeid VARCHAR(64) DEFAULT '' NOT NULL, + algorithm VARCHAR(32) DEFAULT '' NOT NULL, + plimit INTEGER DEFAULT 0 NOT NULL +); +

12 years, 8 months

git:3.1: .gitingnore: set root path for binary names

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 2a080ba89d057ca5460d0df6d31c2d3d5dc6c9ce URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2a080ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Aug 1 14:33:15 2011 +0200 .gitingnore: set root path for binary names - some directories containing the binary name (e.g., kamailio like in utils/kamctl/dbtext/kamailio/...) in path were ignored. Updated .gitignore to use /kamailio and /ser which according to manual should match on the root folder of GIT tree (cherry picked from commit 285566bd31379ee4b6199f72c8c589a6b313bf07) --- .gitignore | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6cdbafa..e076c44 100644 --- a/.gitignore +++ b/.gitignore @@ -10,8 +10,8 @@ modules.lst # ignore dependency files *.d # ignore binary files and objects -ser -kamailio +/ser +/kamailio *.so *.so.* *.o @@ -38,4 +38,4 @@ utils/pdbt/pdbt libiname.lst *.dylib # man pages -*.7 \ No newline at end of file +*.7

12 years, 8 months

git:3.1: kamctl: updated the db screation scripts based on latest xml schema definitions

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: d7783646cc965cb15780cd2bdfc4909073f39cdd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d778364… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Aug 3 18:00:56 2011 +0200 kamctl: updated the db screation scripts based on latest xml schema definitions - dbtext and db_berkely folders were matched by gitignore rules due to 'kamailio' token --- utils/kamctl/db_berkeley/kamailio/lcr_gw | 2 -- utils/kamctl/db_berkeley/kamailio/lcr_rule | 2 -- utils/kamctl/db_berkeley/kamailio/lcr_rule_target | 2 -- utils/kamctl/db_berkeley/kamailio/version | 12 ++---------- utils/kamctl/dbtext/kamailio/lcr_gw | 1 - utils/kamctl/dbtext/kamailio/lcr_rule | 1 - utils/kamctl/dbtext/kamailio/lcr_rule_target | 1 - utils/kamctl/dbtext/kamailio/version | 6 +----- 8 files changed, 3 insertions(+), 24 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/lcr_gw b/utils/kamctl/db_berkeley/kamailio/lcr_gw index 00df7e4..d659ce6 100644 --- a/utils/kamctl/db_berkeley/kamailio/lcr_gw +++ b/utils/kamctl/db_berkeley/kamailio/lcr_gw @@ -8,5 +8,3 @@ METADATA_LOGFLAGS 0 METADATA_DEFAULTS NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NULL|0|NULL -lcr_gw| -lcr_gw|1 diff --git a/utils/kamctl/db_berkeley/kamailio/lcr_rule b/utils/kamctl/db_berkeley/kamailio/lcr_rule index dd53806..99a12cf 100644 --- a/utils/kamctl/db_berkeley/kamailio/lcr_rule +++ b/utils/kamctl/db_berkeley/kamailio/lcr_rule @@ -8,5 +8,3 @@ METADATA_LOGFLAGS 0 METADATA_DEFAULTS NIL|NIL|NULL|NULL|0|1 -lcr_rule| -lcr_rule|1 diff --git a/utils/kamctl/db_berkeley/kamailio/lcr_rule_target b/utils/kamctl/db_berkeley/kamailio/lcr_rule_target index 927e537..cffb6eb 100644 --- a/utils/kamctl/db_berkeley/kamailio/lcr_rule_target +++ b/utils/kamctl/db_berkeley/kamailio/lcr_rule_target @@ -8,5 +8,3 @@ METADATA_LOGFLAGS 0 METADATA_DEFAULTS NIL|NIL|NIL|NIL|NIL|1 -lcr_rule_target| -lcr_rule_target|1 diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index 93e3eb1..105d1f6 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -16,10 +16,10 @@ address| address|4 aliases| aliases|1004 -carrierfailureroute| -carrierfailureroute|2 carrier_name| carrier_name|1 +carrierfailureroute| +carrierfailureroute|2 carrierroute| carrierroute|3 cpl| @@ -50,16 +50,12 @@ globalblacklist| globalblacklist|1 grp| grp|2 -METADATA_DEFAULTS -NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NULL|NIL|0|NULL htable| htable|1 imc_members| imc_members|1 imc_rooms| imc_rooms|1 -METADATA_DEFAULTS -NIL|NIL|NULL|NULL|NIL|NIL lcr_gw| lcr_gw|1 lcr_rule| @@ -72,8 +68,6 @@ matrix| matrix|1 missed_calls| missed_calls|3 -mtree| -mtree|1 pdt| pdt|1 presentity| @@ -98,8 +92,6 @@ subscriber| subscriber|6 trusted| trusted|5 -uacreg| -uacreg|1 uri| uri|1 userblacklist| diff --git a/utils/kamctl/dbtext/kamailio/lcr_gw b/utils/kamctl/dbtext/kamailio/lcr_gw index 71f1fb9..deb04d7 100644 --- a/utils/kamctl/dbtext/kamailio/lcr_gw +++ b/utils/kamctl/dbtext/kamailio/lcr_gw @@ -1,2 +1 @@ id(int,auto) lcr_id(int) gw_name(string,null) ip_addr(string,null) hostname(string,null) port(int,null) params(string,null) uri_scheme(int,null) transport(int,null) strip(int,null) tag(string,null) flags(int) defunct(int,null) -lcr_gw:1 diff --git a/utils/kamctl/dbtext/kamailio/lcr_rule b/utils/kamctl/dbtext/kamailio/lcr_rule index 483ce58..f1dcabd 100644 --- a/utils/kamctl/dbtext/kamailio/lcr_rule +++ b/utils/kamctl/dbtext/kamailio/lcr_rule @@ -1,2 +1 @@ id(int,auto) lcr_id(int) prefix(string,null) from_uri(string,null) stopper(int) enabled(int) -lcr_rule:1 diff --git a/utils/kamctl/dbtext/kamailio/lcr_rule_target b/utils/kamctl/dbtext/kamailio/lcr_rule_target index d72e6f0..54dedd8 100644 --- a/utils/kamctl/dbtext/kamailio/lcr_rule_target +++ b/utils/kamctl/dbtext/kamailio/lcr_rule_target @@ -1,2 +1 @@ id(int,auto) lcr_id(int) rule_id(int) gw_id(int) priority(int) weight(int) -lcr_rule_target:1 diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index 60a7a5f..f64d079 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -3,8 +3,8 @@ acc:4 active_watchers:9 address:4 aliases:1004 -carrierfailureroute:2 carrier_name:1 +carrierfailureroute:2 carrierroute:3 cpl:1 dbaliases:1 @@ -20,18 +20,15 @@ dr_gw_lists:1 dr_rules:3 globalblacklist:1 grp:2 -id(int,auto) lcr_id(int) gw_name(string) grp_id(int) ip_addr(string) hostname(string,null) port(int,null) uri_scheme(int,null) transport(int,null) strip(int,null) tag(string,null) weight(int,null) flags(int) defunct(int,null) htable:1 imc_members:1 imc_rooms:1 -id(int,auto) lcr_id(int) prefix(string,null) from_uri(string,null) grp_id(int) priority(int) lcr_gw:1 lcr_rule:1 lcr_rule_target:1 location:1004 matrix:1 missed_calls:3 -mtree:1 pdt:1 presentity:3 pua:6 @@ -44,7 +41,6 @@ sip_trace:2 speed_dial:2 subscriber:6 trusted:5 -uacreg:1 uri:1 userblacklist:1 usr_preferences:2

12 years, 8 months

git:3.1: lib/srdb1/schema: removed index that included missing columns

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 8b801716e9f86950a9ec3a7b54374963e890dbfa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8b80171… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jul 31 19:04:43 2011 +0300 lib/srdb1/schema: removed index that included missing columns (cherry picked from commit 27f722f44ac080df47bb4c64e513f50be611aa7a) --- lib/srdb1/schema/pipelimit.xml | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/lib/srdb1/schema/pipelimit.xml b/lib/srdb1/schema/pipelimit.xml index 5ae2bb6..71941d9 100644 --- a/lib/srdb1/schema/pipelimit.xml +++ b/lib/srdb1/schema/pipelimit.xml @@ -52,10 +52,4 @@ <description>Pipe limit (hits per second)</description> </column> - <index> - <name>account_idx</name> - <colref linkend="username"/> - <colref linkend="domain"/> - </index> - </table>

12 years, 8 months

git:master: pdbt: off-by-one error fixed in carrier.c, better output for pdbt command-line interface (parseable)

by Henning Westerholt

Module: sip-router Branch: master Commit: 91f79909c53d3b86d497193a4671699b4ec09782 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=91f7990… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Aug 3 17:48:44 2011 +0200 pdbt: off-by-one error fixed in carrier.c, better output for pdbt command-line interface (parseable) --- utils/pdbt/carrier.c | 4 ++-- utils/pdbt/pdbt.c | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/utils/pdbt/carrier.c b/utils/pdbt/carrier.c index 07de4c6..24bfa0a 100644 --- a/utils/pdbt/carrier.c +++ b/utils/pdbt/carrier.c @@ -93,8 +93,8 @@ int load_carrier_names(char *filename) { exit(-1); } - strncpy(cnames[id], p, len); - cnames[id][len]=0; + strncpy(cnames[id], p, len - 1); + cnames[id][len - 1]=0; nextline: n++; diff --git a/utils/pdbt/pdbt.c b/utils/pdbt/pdbt.c index 5cc5689..afb9525 100644 --- a/utils/pdbt/pdbt.c +++ b/utils/pdbt/pdbt.c @@ -546,10 +546,12 @@ void query_mmap(char *number, char *comment, void *data) { nmatch=dtm_longest_match(mroot, number, strlen(number), &carrierid); if (nmatch<=0) { - LINFO("%s: not_found: nmatch=%ld, comment='%s'\n", number, (long int)nmatch, comment); + LINFO("%s:%s:%ld:%s\n", number, comment, (long int)carrierid, "not allocated, probably old"); } else { - LINFO("%s: found: carrier_id=%ld, carrier_name='%s', nmatch=%ld, comment='%s'\n", number, (long int)carrierid, carrierid2name(carrierid), (long int)nmatch, comment); + LINFO("%s:%s:%ld:%s\n", number, comment, (long int)carrierid, carrierid2name(carrierid)); + /* LINFO("%s: found: carrier_id=%ld, carrier_name='%s', nmatch=%ld, comment='%s'\n", number, (long int)carrierid, carrierid2name(carrierid), (long int)nmatch, comment); + */ } } @@ -566,7 +568,9 @@ void query_server(char *number, char *comment, void *data) { LINFO("%s: not_found: comment='%s'\n", number, comment); } else { - LINFO("%s: found: carrier_id=%ld, carrier_name='%s', comment='%s'\n", number, (long int)carrierid, carrierid2name(carrierid), comment); + LINFO("%s:%ld:%s\n", number, (long int)carrierid, carrierid2name(carrierid)); + /* LINFO("%s: found: carrier_id=%ld, carrier_name='%s', comment='%s'\n", number, (long int)carrierid, carrierid2name(carrierid), comment); + */ } }

12 years, 8 months

git:3.1: pdbt: off-by-one error fixed in carrier.c, better output for pdbt command-line interface (parseable)

by Henning Westerholt

Module: sip-router Branch: 3.1 Commit: 9213ce40cc77d388033e5bf70f10aa9457c4aacf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9213ce4… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Aug 3 17:48:44 2011 +0200 pdbt: off-by-one error fixed in carrier.c, better output for pdbt command-line interface (parseable) (cherry picked from commit 91f79909c53d3b86d497193a4671699b4ec09782) --- utils/pdbt/carrier.c | 4 ++-- utils/pdbt/pdbt.c | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/utils/pdbt/carrier.c b/utils/pdbt/carrier.c index 07de4c6..24bfa0a 100644 --- a/utils/pdbt/carrier.c +++ b/utils/pdbt/carrier.c @@ -93,8 +93,8 @@ int load_carrier_names(char *filename) { exit(-1); } - strncpy(cnames[id], p, len); - cnames[id][len]=0; + strncpy(cnames[id], p, len - 1); + cnames[id][len - 1]=0; nextline: n++; diff --git a/utils/pdbt/pdbt.c b/utils/pdbt/pdbt.c index 5cc5689..afb9525 100644 --- a/utils/pdbt/pdbt.c +++ b/utils/pdbt/pdbt.c @@ -546,10 +546,12 @@ void query_mmap(char *number, char *comment, void *data) { nmatch=dtm_longest_match(mroot, number, strlen(number), &carrierid); if (nmatch<=0) { - LINFO("%s: not_found: nmatch=%ld, comment='%s'\n", number, (long int)nmatch, comment); + LINFO("%s:%s:%ld:%s\n", number, comment, (long int)carrierid, "not allocated, probably old"); } else { - LINFO("%s: found: carrier_id=%ld, carrier_name='%s', nmatch=%ld, comment='%s'\n", number, (long int)carrierid, carrierid2name(carrierid), (long int)nmatch, comment); + LINFO("%s:%s:%ld:%s\n", number, comment, (long int)carrierid, carrierid2name(carrierid)); + /* LINFO("%s: found: carrier_id=%ld, carrier_name='%s', nmatch=%ld, comment='%s'\n", number, (long int)carrierid, carrierid2name(carrierid), (long int)nmatch, comment); + */ } } @@ -566,7 +568,9 @@ void query_server(char *number, char *comment, void *data) { LINFO("%s: not_found: comment='%s'\n", number, comment); } else { - LINFO("%s: found: carrier_id=%ld, carrier_name='%s', comment='%s'\n", number, (long int)carrierid, carrierid2name(carrierid), comment); + LINFO("%s:%ld:%s\n", number, (long int)carrierid, carrierid2name(carrierid)); + /* LINFO("%s: found: carrier_id=%ld, carrier_name='%s', comment='%s'\n", number, (long int)carrierid, carrierid2name(carrierid), comment); + */ } }

12 years, 8 months

git:treimann/acc-cdr: modules_k/acc: Implement CDR-based logging.

by Timo Reimann

Module: sip-router Branch: treimann/acc-cdr Commit: bbb6df5dffc1187acce2fcdd8c716e034eb5f70e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bbb6df5… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Wed Aug 3 13:17:24 2011 +0200 modules_k/acc: Implement CDR-based logging. Full credits to Sven Knoblich, sven.knoblich(a)1und1.de . --- modules_k/acc/acc.h | 1 + modules_k/acc/acc_cdr.c | 692 +++++++++++++++++++++++++++++++++++++++ modules_k/acc/acc_cdr.h | 49 +++ modules_k/acc/acc_mod.c | 47 +++- modules_k/acc/acc_mod.h | 3 + modules_k/acc/doc/acc.xml | 16 + modules_k/acc/doc/acc_admin.xml | 203 +++++++++++- 7 files changed, 999 insertions(+), 12 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=bbb…

12 years, 8 months

git:treimann/acc-cdr: modules_k/dialog: Allow configuration of when initial dialog

by Timo Reimann

Module: sip-router Branch: treimann/acc-cdr Commit: 48b8190c3fa1e42ed153f92d96e0fb7839712557 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=48b8190… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Tue Aug 2 20:14:52 2011 +0200 modules_k/dialog: Allow configuration of when initial dialog callbacks are executed (either in-script or post-script). - Implement functionality. - Add documentation. --- modules_k/dialog/dialog.c | 14 ++++++++++- modules_k/dialog/dlg_handlers.c | 23 ++++++++++++++---- modules_k/dialog/dlg_handlers.h | 2 +- modules_k/dialog/dlg_var.c | 8 ++++++ modules_k/dialog/dlg_var.h | 2 + modules_k/dialog/doc/dialog_admin.xml | 40 +++++++++++++++++++++++++++++++++ 6 files changed, 82 insertions(+), 7 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index 5e751ac..7f029d8 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -104,6 +104,7 @@ static char* profiles_wv_s = NULL; static char* profiles_nv_s = NULL; str dlg_extra_hdrs = {NULL,0}; static int db_fetch_rows = 200; +int initial_cbs_inscript = 1; str dlg_bridge_controller = {"sip:controller@kamailio.org", 27}; @@ -241,6 +242,7 @@ static param_export_t mod_params[]={ { "profiles_no_value", STR_PARAM, &profiles_nv_s }, { "bridge_controller", STR_PARAM, &dlg_bridge_controller.s }, { "ruri_pvar", STR_PARAM, &ruri_pvar_param.s }, + { "initial_cbs_inscript", INT_PARAM, &initial_cbs_inscript }, { 0,0,0 } }; @@ -503,6 +505,11 @@ static int mod_init(void) return -1; } + if (initial_cbs_inscript != 0 && initial_cbs_inscript != 1) { + LM_ERR("invalid parameter for running initial callbacks in-script (must be either 0 or 1)\n"); + return -1; + } + /* update the len of the extra headers */ if (dlg_extra_hdrs.s) dlg_extra_hdrs.len = strlen(dlg_extra_hdrs.s); @@ -575,6 +582,11 @@ static int mod_init(void) return -1; } + if (register_script_cb( spiral_detect_reset, POST_SCRIPT_CB|REQUEST_CB,0)<0) { + LM_ERR("cannot register req pre-script spiral detection reset callback\n"); + return -1; + } + if ( register_timer( dlg_timer_routine, 0, 1)<0 ) { LM_ERR("failed to register timer \n"); return -1; @@ -902,7 +914,7 @@ static int w_dlg_manage(struct sip_msg *msg, char *s1, char *s2) dlg_onroute(msg, NULL, NULL); seq_match_mode = backup_mode; } else { - if(dlg_new_dialog(msg, 0)!=0) + if(dlg_new_dialog(msg, 0, initial_cbs_inscript)!=0) return -1; } return 1; diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index a701fee..450fd09 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -83,6 +83,8 @@ static int default_timeout; /*!< default dialog timeout */ static int seq_match_mode; /*!< dlg_match mode */ static int shutdown_done = 0; /*!< 1 when destroy_dlg_handlers was called */ extern int detect_spirals; +extern int initial_cbs_inscript; +int spiral_detected = -1; extern struct rr_binds d_rrb; /*!< binding to record-routing module */ @@ -609,11 +611,17 @@ void dlg_onreq(struct cell* t, int type, struct tmcb_params *param) { struct sip_msg *req = param->req; + if (!initial_cbs_inscript) { + if (spiral_detected == 1) + run_dlg_callbacks( DLGCB_SPIRALED, current_dlg_pointer, req, NULL, DLG_DIR_DOWNSTREAM, 0); + else if (spiral_detected == 0) + run_create_callbacks( current_dlg_pointer, req); + } if((req->flags&dlg_flag)!=dlg_flag) return; if (current_dlg_pointer!=NULL) return; - dlg_new_dialog(req, t); + dlg_new_dialog(req, t, 1); } @@ -754,7 +762,7 @@ static void store_dlg_in_tm_cb (struct cell* t, * \param t transaction * \return 0 on success, -1 on failure */ -int dlg_new_dialog(struct sip_msg *req, struct cell *t) +int dlg_new_dialog(struct sip_msg *req, struct cell *t, const int run_initial_cbs) { struct dlg_cell *dlg; str s; @@ -787,6 +795,9 @@ int dlg_new_dialog(struct sip_msg *req, struct cell *t) if (detect_spirals) { + if (spiral_detected == 1) + return 0; + dir = DLG_DIR_NONE; dlg = get_dlg(&callid, &ftag, &ttag, &dir, &del); @@ -801,14 +812,16 @@ int dlg_new_dialog(struct sip_msg *req, struct cell *t) { LM_DBG("Callid '%.*s' found, must be a spiraled request\n", callid.len, callid.s); + spiral_detected = 1; - run_dlg_callbacks( DLGCB_SPIRALED, dlg, req, NULL, DLG_DIR_DOWNSTREAM, 0); - + if (run_initial_cbs) + run_dlg_callbacks( DLGCB_SPIRALED, dlg, req, NULL, DLG_DIR_DOWNSTREAM, 0); // get_dlg with del==0 has incremented the ref count by 1 unref_dlg(dlg, 1); goto finish; } } + spiral_detected = 0; dlg = build_new_dlg (&callid /*callid*/, &(get_from(req)->uri) /*from uri*/, @@ -837,7 +850,7 @@ int dlg_new_dialog(struct sip_msg *req, struct cell *t) link_dlg(dlg,0); - run_create_callbacks(dlg, req); + if (run_initial_cbs) run_create_callbacks( dlg, req); /* first INVITE seen (dialog created, unconfirmed) */ if ( seq_match_mode!=SEQ_MATCH_NO_ID && diff --git a/modules_k/dialog/dlg_handlers.h b/modules_k/dialog/dlg_handlers.h index d56b7fb..eef5a8f 100644 --- a/modules_k/dialog/dlg_handlers.h +++ b/modules_k/dialog/dlg_handlers.h @@ -128,7 +128,7 @@ void dlg_ontimeout( struct dlg_tl *tl); * \param t transaction * \return 0 on success, -1 on failure */ -int dlg_new_dialog(struct sip_msg *msg, struct cell *t); +int dlg_new_dialog(struct sip_msg *msg, struct cell *t, const int run_initial_cbs); /*! diff --git a/modules_k/dialog/dlg_var.c b/modules_k/dialog/dlg_var.c index 42a7e91..6483233 100644 --- a/modules_k/dialog/dlg_var.c +++ b/modules_k/dialog/dlg_var.c @@ -29,6 +29,7 @@ #include "dlg_db_handler.h" dlg_ctx_t _dlg_ctx; +extern int spiral_detected; /*! global variable table, in case the dialog does not exist yet */ struct dlg_var * var_table = 0; @@ -721,3 +722,10 @@ dlg_ctx_t* dlg_get_dlg_ctx(void) { return &_dlg_ctx; } + +int spiral_detect_reset(struct sip_msg *foo, unsigned int flags, void *bar) +{ + spiral_detected = -1; + + return 0; +} diff --git a/modules_k/dialog/dlg_var.h b/modules_k/dialog/dlg_var.h index 99ab746..cd53807 100644 --- a/modules_k/dialog/dlg_var.h +++ b/modules_k/dialog/dlg_var.h @@ -83,4 +83,6 @@ struct dlg_cell* dlg_get_ctx_dialog(void); dlg_ctx_t* dlg_get_dlg_ctx(void); +int spiral_detect_reset(struct sip_msg *foo, unsigned int flags, void *bar); + #endif diff --git a/modules_k/dialog/doc/dialog_admin.xml b/modules_k/dialog/doc/dialog_admin.xml index 34ac2ac..ae6c95d 100644 --- a/modules_k/dialog/doc/dialog_admin.xml +++ b/modules_k/dialog/doc/dialog_admin.xml @@ -1054,6 +1054,46 @@ modparam("dialog", "bridge_controller", "sip:ctd@kamailio.org") </example> </section> + <section> + <title><varname>initial_cbs_inscript</varname> (string)</title> + <para> + If the initial dialog callbacks (i.e., DLGCB_CREATED and + DLGCB_SPIRALED) should be executed in-script or post-script. + If dlg_manage() is not used, the setting of this parameter does + not matter; otherwise, initial callbacks will be executed + directly after dlg_manage() is called if this parameter is + enabled. If it is disabled, initial callback execution will be + postponed until configuration script execution completes. + </para> + <para> + The supported values are: + </para> + <itemizedlist> + <listitem><para> + <emphasis>0 - POST-SCRIPT</emphasis> - execute initial + callbacks after the script completes; + </para></listitem> + <listitem><para> + <emphasis>1 - IN-SCRIPT</emphasis> - execute initial + callbacks during script execution, i.e., right after + dlg_manage() is called; + </para></listitem> + </itemizedlist> + <para> + <emphasis> + Default value is <quote>1</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>initial_cbs_inscript</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dialog", "initial_cbs_inscript", "0") +... +</programlisting> + </example> + </section> + </section>

12 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2011