sr-dev December 2011

sr-dev@lists.kamailio.org

32 participants
230 discussions

git:master: srdb1: schema update for address table of permissions module
by Daniel-Constantin Mierla 23 Dec '11

23 Dec '11

Module: sip-router Branch: master Commit: e593683639abe5192a5da0ac1f3b4a35c45e00f3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e593683… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: 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 --- lib/srdb1/schema/address.xml | 12 ++++++------ utils/kamctl/db_berkeley/kamailio/version | 2 +- utils/kamctl/db_sqlite/permissions-create.sql | 8 ++++---- utils/kamctl/dbtext/kamailio/version | 2 +- utils/kamctl/mysql/permissions-create.sql | 8 ++++---- utils/kamctl/oracle/permissions-create.sql | 8 ++++---- utils/kamctl/postgres/permissions-create.sql | 8 ++++---- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lib/srdb1/schema/address.xml b/lib/srdb1/schema/address.xml index 5369685..be380ee 100644 --- a/lib/srdb1/schema/address.xml +++ b/lib/srdb1/schema/address.xml @@ -9,7 +9,7 @@ <table id="address" xmlns:db="http://docbook.org/ns/docbook"> <name>address</name> - <version>4</version> + <version>5</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>This table is used by the permissions module. More information is available at: &KAMAILIO_MOD_DOC;permissions.html @@ -28,8 +28,8 @@ <column> <name>grp</name> - <type>unsigned short</type> - <size>5</size> + <type>unsigned int</type> + <size>11</size> <default>1</default> <description>Group</description> <natural/> @@ -38,15 +38,15 @@ <column> <name>ip_addr</name> <type>string</type> - <size>15</size> + <size>48</size> <description>IP address</description> </column> <column> <name>mask</name> - <type>char</type> + <type>int</type> <default>32</default> - <description>Network mask - integer equal or less than 32</description> + <description>Network mask - integer equal or less than 128</description> </column> <column> diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index 98b5f87..09b177d 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -13,7 +13,7 @@ acc|4 active_watchers| active_watchers|9 address| -address|4 +address|5 aliases| aliases|1004 carrier_name| diff --git a/utils/kamctl/db_sqlite/permissions-create.sql b/utils/kamctl/db_sqlite/permissions-create.sql index ff3ac56..e0c3f59 100644 --- a/utils/kamctl/db_sqlite/permissions-create.sql +++ b/utils/kamctl/db_sqlite/permissions-create.sql @@ -9,12 +9,12 @@ CREATE TABLE trusted ( CREATE INDEX trusted_peer_idx ON trusted (src_ip); -INSERT INTO version (table_name, table_version) values ('address','4'); +INSERT INTO version (table_name, table_version) values ('address','5'); CREATE TABLE address ( id INTEGER PRIMARY KEY NOT NULL, - grp SMALLINT DEFAULT 1 NOT NULL, - ip_addr VARCHAR(15) NOT NULL, - mask SMALLINT DEFAULT 32 NOT NULL, + grp INTEGER DEFAULT 1 NOT NULL, + ip_addr VARCHAR(48) NOT NULL, + mask INTEGER DEFAULT 32 NOT NULL, port SMALLINT DEFAULT 0 NOT NULL, tag VARCHAR(64) ); diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index a41262e..d326bbf 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -1,7 +1,7 @@ table_name(string) table_version(int) acc:4 active_watchers:9 -address:4 +address:5 aliases:1004 carrier_name:1 carrierfailureroute:2 diff --git a/utils/kamctl/mysql/permissions-create.sql b/utils/kamctl/mysql/permissions-create.sql index ae6ce8b..660ac6f 100644 --- a/utils/kamctl/mysql/permissions-create.sql +++ b/utils/kamctl/mysql/permissions-create.sql @@ -9,12 +9,12 @@ CREATE TABLE trusted ( CREATE INDEX peer_idx ON trusted (src_ip); -INSERT INTO version (table_name, table_version) values ('address','4'); +INSERT INTO version (table_name, table_version) values ('address','5'); CREATE TABLE address ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, - grp SMALLINT(5) UNSIGNED DEFAULT 1 NOT NULL, - ip_addr VARCHAR(15) NOT NULL, - mask TINYINT DEFAULT 32 NOT NULL, + grp INT(11) UNSIGNED DEFAULT 1 NOT NULL, + ip_addr VARCHAR(48) NOT NULL, + mask INT DEFAULT 32 NOT NULL, port SMALLINT(5) UNSIGNED DEFAULT 0 NOT NULL, tag VARCHAR(64) ) ENGINE=MyISAM; diff --git a/utils/kamctl/oracle/permissions-create.sql b/utils/kamctl/oracle/permissions-create.sql index 1e1b31c..6b934cc 100644 --- a/utils/kamctl/oracle/permissions-create.sql +++ b/utils/kamctl/oracle/permissions-create.sql @@ -17,12 +17,12 @@ BEGIN map2users('trusted'); END; / CREATE INDEX trusted_peer_idx ON trusted (src_ip); -INSERT INTO version (table_name, table_version) values ('address','4'); +INSERT INTO version (table_name, table_version) values ('address','5'); CREATE TABLE address ( id NUMBER(10) PRIMARY KEY, - grp NUMBER(5) DEFAULT 1 NOT NULL, - ip_addr VARCHAR2(15), - mask NUMBER(5) DEFAULT 32 NOT NULL, + grp NUMBER(10) DEFAULT 1 NOT NULL, + ip_addr VARCHAR2(48), + mask NUMBER(10) DEFAULT 32 NOT NULL, port NUMBER(5) DEFAULT 0 NOT NULL, tag VARCHAR2(64) ); diff --git a/utils/kamctl/postgres/permissions-create.sql b/utils/kamctl/postgres/permissions-create.sql index 602c399..9e48623 100644 --- a/utils/kamctl/postgres/permissions-create.sql +++ b/utils/kamctl/postgres/permissions-create.sql @@ -9,12 +9,12 @@ CREATE TABLE trusted ( CREATE INDEX trusted_peer_idx ON trusted (src_ip); -INSERT INTO version (table_name, table_version) values ('address','4'); +INSERT INTO version (table_name, table_version) values ('address','5'); CREATE TABLE address ( id SERIAL PRIMARY KEY NOT NULL, - grp SMALLINT DEFAULT 1 NOT NULL, - ip_addr VARCHAR(15) NOT NULL, - mask SMALLINT DEFAULT 32 NOT NULL, + grp INTEGER DEFAULT 1 NOT NULL, + ip_addr VARCHAR(48) NOT NULL, + mask INTEGER DEFAULT 32 NOT NULL, port SMALLINT DEFAULT 0 NOT NULL, tag VARCHAR(64) );

1 0

git:master: core: function to match ip address to net address with bitmask
by Daniel-Constantin Mierla 23 Dec '11

23 Dec '11

Module: sip-router Branch: master Commit: c1a4788cfd058e3eb52330eac04344be5fc93e35 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c1a4788… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: 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 --- ip_addr.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ip_addr.h | 7 ++++++- 2 files changed, 63 insertions(+), 1 deletions(-) diff --git a/ip_addr.c b/ip_addr.c index 06c57c3..1b15c96 100644 --- a/ip_addr.c +++ b/ip_addr.c @@ -354,3 +354,60 @@ char* get_proto_name(unsigned int proto) return "unknown"; } } + + +/** + * match ip address with net address and bitmask + * - return 0 on match, -1 otherwise + */ +int ip_addr_match_net(ip_addr_t *iaddr, ip_addr_t *naddr, + int mask) +{ + unsigned char c; + int i; + int mbytes; + int mbits; + + if(mask==0) + return 0; + if(iaddr==NULL || naddr==NULL || mask<0) + return -1; + if(iaddr->af != naddr->af) + return -1; + + if(iaddr->af == AF_INET) + { + if(mask>32) + return -1; + if(mask==32) + { + if(ip_addr_cmp(iaddr, naddr)) + return 0; + return -1; + } + } else if(iaddr->af == AF_INET6) { + if(mask>128) + return -1; + + if(mask==128) + { + if(ip_addr_cmp(iaddr, naddr)) + return 0; + return -1; + } + } + + mbytes = mask / 8; + for(i=0; i<mbytes; i++) + { + if(iaddr->u.addr[i] != naddr->u.addr[i]) + return -1; + } + mbits = mask % 8; + if(mbits==0) + return 0; + c = naddr->u.addr[i] & (~((1 << (8 - mbits)) - 1)); + if((iaddr->u.addr[i] & c) == c) + return 0; + return -1; +} diff --git a/ip_addr.h b/ip_addr.h index 0c1a129..9bfe670 100644 --- a/ip_addr.h +++ b/ip_addr.h @@ -72,7 +72,7 @@ struct ip_addr{ }u; }; - +typedef struct ip_addr ip_addr_t; struct net{ struct ip_addr ip; @@ -825,5 +825,10 @@ inline static void init_dst_from_rcv(struct dest_info* dst, #endif } +/** + * match ip address with net address and bitmask + * - return 0 on match, -1 otherwise + */ +int ip_addr_match_net(ip_addr_t *iaddr, ip_addr_t *naddr, int mask); #endif

1 0

git:master: libsrdb1: macro to return unsigned it from db value
by Daniel-Constantin Mierla 23 Dec '11

23 Dec '11

Module: sip-router Branch: master Commit: a75afdd69929eabf014ba5958898182ae2478dcb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a75afdd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: 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 --- lib/srdb1/db_val.h | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/lib/srdb1/db_val.h b/lib/srdb1/db_val.h index 2e5b166..2ad07be 100644 --- a/lib/srdb1/db_val.h +++ b/lib/srdb1/db_val.h @@ -126,6 +126,13 @@ typedef struct { /** + * Use this macro if you need to access the integer value in the db_val_t structure + * casted to unsigned int. + */ +#define VAL_UINT(dv) ((unsigned int)(dv)->val.int_val) + + +/** * Use this macro if you need to access the long long value in the db_val_t structure. */ #define VAL_BIGINT(dv) ((dv)->val.ll_val)

1 0

git:master: tm: rest the pointer of hash table after free to avoid double free on false start
by Daniel-Constantin Mierla 23 Dec '11

23 Dec '11

Module: sip-router Branch: master Commit: 7728464362af67eff4dc105f16a1d42c72407cca URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7728464… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: 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 --- modules/tm/h_table.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/tm/h_table.c b/modules/tm/h_table.c index 18b0857..663b0ea 100644 --- a/modules/tm/h_table.c +++ b/modules/tm/h_table.c @@ -444,6 +444,7 @@ void free_hash_table( ) } } shm_free(_tm_table); + _tm_table = 0; } }

1 0

git:master: libsrdb1: Make IPv6 addresses fit into lcr_gw
by Andreas Granig 22 Dec '11

22 Dec '11

Module: sip-router Branch: master Commit: 0894cb4434d707f455a383f702ae60dbf76b9655 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0894cb4… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Andreas Granig <agranig(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. --- lib/srdb1/schema/lcr_gw.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/srdb1/schema/lcr_gw.xml b/lib/srdb1/schema/lcr_gw.xml index 273d03a..3c9513b 100644 --- a/lib/srdb1/schema/lcr_gw.xml +++ b/lib/srdb1/schema/lcr_gw.xml @@ -46,9 +46,9 @@ <column id="ip_addr"> <name>ip_addr</name> <type>string</type> - <size>15</size> + <size>47</size> <null/> - <description>IP Address of the gateway</description> + <description>IPv4 or IPv6 Address of the gateway</description> </column> <column id="hostname">

4 3

git:master: kamctl: update db table definitions after change to mtrees key
by Daniel-Constantin Mierla 22 Dec '11

22 Dec '11

Module: sip-router Branch: master Commit: 0036521d5ad043ba5f6c07463a67b61ae76720b0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0036521… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: 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 --- utils/kamctl/db_berkeley/kamailio/version | 2 +- utils/kamctl/db_sqlite/mtree-create.sql | 4 ++-- utils/kamctl/dbtext/kamailio/version | 2 +- utils/kamctl/mysql/mtree-create.sql | 4 ++-- utils/kamctl/oracle/mtree-create.sql | 4 ++-- utils/kamctl/postgres/mtree-create.sql | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index 57b6f8f..98b5f87 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -73,7 +73,7 @@ missed_calls|3 mtree| mtree|1 mtrees| -mtrees|1 +mtrees|2 pdt| pdt|1 pl_pipes| diff --git a/utils/kamctl/db_sqlite/mtree-create.sql b/utils/kamctl/db_sqlite/mtree-create.sql index 77c0e38..7e25f04 100644 --- a/utils/kamctl/db_sqlite/mtree-create.sql +++ b/utils/kamctl/db_sqlite/mtree-create.sql @@ -6,12 +6,12 @@ CREATE TABLE mtree ( CONSTRAINT mtree_tprefix_idx UNIQUE (tprefix) ); -INSERT INTO version (table_name, table_version) values ('mtrees','1'); +INSERT INTO version (table_name, table_version) values ('mtrees','2'); CREATE TABLE mtrees ( id INTEGER PRIMARY KEY NOT NULL, tname VARCHAR(128) DEFAULT '' NOT NULL, tprefix VARCHAR(32) DEFAULT '' NOT NULL, tvalue VARCHAR(128) DEFAULT '' NOT NULL, - CONSTRAINT mtrees_tname_tprefix_idx UNIQUE (tname, tprefix) + CONSTRAINT mtrees_tname_tprefix_tvalue_idx UNIQUE (tname, tprefix, tvalue) ); diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index 50adbcf..a41262e 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -31,7 +31,7 @@ location:1004 matrix:1 missed_calls:3 mtree:1 -mtrees:1 +mtrees:2 pdt:1 pl_pipes:1 presentity:3 diff --git a/utils/kamctl/mysql/mtree-create.sql b/utils/kamctl/mysql/mtree-create.sql index 8834163..251ddea 100644 --- a/utils/kamctl/mysql/mtree-create.sql +++ b/utils/kamctl/mysql/mtree-create.sql @@ -6,12 +6,12 @@ CREATE TABLE mtree ( CONSTRAINT tprefix_idx UNIQUE (tprefix) ) ENGINE=MyISAM; -INSERT INTO version (table_name, table_version) values ('mtrees','1'); +INSERT INTO version (table_name, table_version) values ('mtrees','2'); CREATE TABLE mtrees ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, tname VARCHAR(128) DEFAULT '' NOT NULL, tprefix VARCHAR(32) DEFAULT '' NOT NULL, tvalue VARCHAR(128) DEFAULT '' NOT NULL, - CONSTRAINT tname_tprefix_idx UNIQUE (tname, tprefix) + CONSTRAINT tname_tprefix_tvalue_idx UNIQUE (tname, tprefix, tvalue) ) ENGINE=MyISAM; diff --git a/utils/kamctl/oracle/mtree-create.sql b/utils/kamctl/oracle/mtree-create.sql index f791897..115392b 100644 --- a/utils/kamctl/oracle/mtree-create.sql +++ b/utils/kamctl/oracle/mtree-create.sql @@ -14,13 +14,13 @@ END mtree_tr; / BEGIN map2users('mtree'); END; / -INSERT INTO version (table_name, table_version) values ('mtrees','1'); +INSERT INTO version (table_name, table_version) values ('mtrees','2'); CREATE TABLE mtrees ( id NUMBER(10) PRIMARY KEY, tname VARCHAR2(128) DEFAULT '', tprefix VARCHAR2(32) DEFAULT '', tvalue VARCHAR2(128) DEFAULT '', - CONSTRAINT mtrees_tname_tprefix_idx UNIQUE (tname, tprefix) + CONSTRAINT ORA_tname_tprefix_tvalue_idx UNIQUE (tname, tprefix, tvalue) ); CREATE OR REPLACE TRIGGER mtrees_tr diff --git a/utils/kamctl/postgres/mtree-create.sql b/utils/kamctl/postgres/mtree-create.sql index a7d0164..810aaae 100644 --- a/utils/kamctl/postgres/mtree-create.sql +++ b/utils/kamctl/postgres/mtree-create.sql @@ -6,12 +6,12 @@ CREATE TABLE mtree ( CONSTRAINT mtree_tprefix_idx UNIQUE (tprefix) ); -INSERT INTO version (table_name, table_version) values ('mtrees','1'); +INSERT INTO version (table_name, table_version) values ('mtrees','2'); CREATE TABLE mtrees ( id SERIAL PRIMARY KEY NOT NULL, tname VARCHAR(128) DEFAULT '' NOT NULL, tprefix VARCHAR(32) DEFAULT '' NOT NULL, tvalue VARCHAR(128) DEFAULT '' NOT NULL, - CONSTRAINT mtrees_tname_tprefix_idx UNIQUE (tname, tprefix) + CONSTRAINT mtrees_tname_tprefix_tvalue_idx UNIQUE (tname, tprefix, tvalue) );

1 0

git:master: core: log message about slow timer printed now as warning
by Daniel-Constantin Mierla 22 Dec '11

22 Dec '11

Module: sip-router Branch: master Commit: 566c30dd38f7e29903810472c5e1e9cde41297c7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=566c30d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: 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 --- timer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/timer.c b/timer.c index 2f23f0f..205efa6 100644 --- a/timer.c +++ b/timer.c @@ -970,7 +970,7 @@ static void timer_handler() if ((slow_idx_t)(*t_idx-*s_idx) < (SLOW_LISTS_NO-1U)) (*t_idx)++; else{ - LOG(L_ERR, "ERROR: slow timer too slow: overflow (%d - %d = %d)\n", + LOG(L_WARN, "slow timer too slow: overflow (%d - %d = %d)\n", *t_idx, *s_idx, *t_idx-*s_idx); /* trying to continue */ }

1 0

new in devel wiki page
by Daniel-Constantin Mierla 22 Dec '11

22 Dec '11

Hello, short reminder for everyone to update the wiki page with short description of the new stuff/enhancements added to GIT repository -- here it is: * http://www.kamailio.org/wiki/features/new-in-devel Also, if you do changes to existing parts that require upgrade of config file or database schema from v3.2.x to devel, please write short guidelines at: * http://www.kamailio.org/wiki/install/upgrade/3.2.x-to-3.3.0 Thanks, Daniel -- Daniel-Constantin Mierla -- http://www.asipto.com http://linkedin.com/in/miconda -- http://twitter.com/miconda

1 0

git:master: Removed the constraint in siptrace to have the tm and sl modules loaded beforehand .
by Marius Ovidiu Bucur 22 Dec '11

22 Dec '11

Module: sip-router Branch: master Commit: 68d282e2898db7b00de473a943af900f6659ce54 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=68d282e… Author: Marius Bucur <marius(a)marius-bucur.ro> Committer: 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. --- modules_k/siptrace/siptrace.c | 46 +++++++++++++++++----------------------- 1 files changed, 20 insertions(+), 26 deletions(-) diff --git a/modules_k/siptrace/siptrace.c b/modules_k/siptrace/siptrace.c index 93c1db7..a912fb4 100644 --- a/modules_k/siptrace/siptrace.c +++ b/modules_k/siptrace/siptrace.c @@ -327,42 +327,36 @@ static int mod_init(void) *xheaders_read_flag = xheaders_read; /* register callbacks to TM */ - if (load_tm_api(&tmb)!=0) - { - LM_ERR("can't load tm api. Is module tm loaded?\n"); - return -1; - } - - if(tmb.register_tmcb( 0, 0, TMCB_REQUEST_IN, trace_onreq_in, 0, 0) <=0) - { + if (load_tm_api(&tmb)!=0) { + LM_WARN("can't load tm api. Will not install tm callbacks.\n"); + } else if(tmb.register_tmcb( 0, 0, TMCB_REQUEST_IN, trace_onreq_in, 0, 0) <=0) { LM_ERR("can't register trace_onreq_in\n"); return -1; } /* bind the SL API */ if (sl_load_api(&slb)!=0) { - LM_ERR("cannot bind to SL API\n"); - return -1; - } - - /* register sl callbacks */ - memset(&slcb, 0, sizeof(sl_cbelem_t)); - - slcb.type = SLCB_REPLY_READY; - slcb.cbf = trace_sl_onreply_out; - if (slb.register_cb(&slcb) != 0) { - LM_ERR("can't register for SLCB_REPLY_READY\n"); - return -1; - } + LM_WARN("cannot bind to SL API. Will not install sl callbacks.\n"); + } else { + /* register sl callbacks */ + memset(&slcb, 0, sizeof(sl_cbelem_t)); - if(trace_sl_acks) - { - slcb.type = SLCB_ACK_FILTERED; - slcb.cbf = trace_sl_ack_in; + slcb.type = SLCB_REPLY_READY; + slcb.cbf = trace_sl_onreply_out; if (slb.register_cb(&slcb) != 0) { - LM_ERR("can't register for SLCB_ACK_FILTERED\n"); + LM_ERR("can't register for SLCB_REPLY_READY\n"); return -1; } + + if(trace_sl_acks) + { + slcb.type = SLCB_ACK_FILTERED; + slcb.cbf = trace_sl_ack_in; + if (slb.register_cb(&slcb) != 0) { + LM_ERR("can't register for SLCB_ACK_FILTERED\n"); + return -1; + } + } } if(dup_uri_str.s!=0)

1 0

git:master: utils: Updated auto-generated db schema changes.
by Andreas Granig 21 Dec '11

21 Dec '11

Module: sip-router Branch: master Commit: b30267a4669a7621a4e9b86030d59b6ef9759517 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b30267a… Author: Andreas Granig <agranig(a)sipwise.com> Committer: 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. --- utils/kamctl/db_sqlite/lcr-create.sql | 2 +- utils/kamctl/mysql/lcr-create.sql | 2 +- utils/kamctl/oracle/lcr-create.sql | 2 +- utils/kamctl/postgres/lcr-create.sql | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/kamctl/db_sqlite/lcr-create.sql b/utils/kamctl/db_sqlite/lcr-create.sql index 0671625..8cb83e6 100644 --- a/utils/kamctl/db_sqlite/lcr-create.sql +++ b/utils/kamctl/db_sqlite/lcr-create.sql @@ -3,7 +3,7 @@ CREATE TABLE lcr_gw ( id INTEGER PRIMARY KEY NOT NULL, lcr_id SMALLINT NOT NULL, gw_name VARCHAR(128), - ip_addr VARCHAR(15), + ip_addr VARCHAR(47), hostname VARCHAR(64), port SMALLINT, params VARCHAR(64), diff --git a/utils/kamctl/mysql/lcr-create.sql b/utils/kamctl/mysql/lcr-create.sql index f0887c5..696e095 100644 --- a/utils/kamctl/mysql/lcr-create.sql +++ b/utils/kamctl/mysql/lcr-create.sql @@ -3,7 +3,7 @@ CREATE TABLE lcr_gw ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, lcr_id SMALLINT UNSIGNED NOT NULL, gw_name VARCHAR(128), - ip_addr VARCHAR(15), + ip_addr VARCHAR(47), hostname VARCHAR(64), port SMALLINT UNSIGNED, params VARCHAR(64), diff --git a/utils/kamctl/oracle/lcr-create.sql b/utils/kamctl/oracle/lcr-create.sql index bdf3dc2..9c2f090 100644 --- a/utils/kamctl/oracle/lcr-create.sql +++ b/utils/kamctl/oracle/lcr-create.sql @@ -3,7 +3,7 @@ CREATE TABLE lcr_gw ( id NUMBER(10) PRIMARY KEY, lcr_id NUMBER(5), gw_name VARCHAR2(128), - ip_addr VARCHAR2(15), + ip_addr VARCHAR2(47), hostname VARCHAR2(64), port NUMBER(5), params VARCHAR2(64), diff --git a/utils/kamctl/postgres/lcr-create.sql b/utils/kamctl/postgres/lcr-create.sql index 316e3ab..669c1c9 100644 --- a/utils/kamctl/postgres/lcr-create.sql +++ b/utils/kamctl/postgres/lcr-create.sql @@ -3,7 +3,7 @@ CREATE TABLE lcr_gw ( id SERIAL PRIMARY KEY NOT NULL, lcr_id SMALLINT NOT NULL, gw_name VARCHAR(128), - ip_addr VARCHAR(15), + ip_addr VARCHAR(47), hostname VARCHAR(64), port SMALLINT, params VARCHAR(64),

1 0

← Newer
1
2
3
4
5
6
7
8
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2011