sr-dev April 2012

sr-dev@lists.kamailio.org

29 participants
346 discussions

git:master: lib/srdb1/schema, utils/kamctl: Updated DB schemas for presence and RLS
by Peter Dunkley 23 Apr '12

23 Apr '12

Module: sip-router Branch: master Commit: 039c72b1f01f26e7a873e4db9985ad5d4d9178c9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=039c72b… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Apr 19 18:11:33 2012 +0100 lib/srdb1/schema, utils/kamctl: Updated DB schemas for presence and RLS - New fields for from_user and from_domain as these may be different to the watcher_user and watcher_domain now. --- lib/srdb1/schema/pr_active_watchers.xml | 16 +++++++++++++++- lib/srdb1/schema/rls_watchers.xml | 14 ++++++++++++++ utils/kamctl/db_berkeley/kamailio/active_watchers | 4 ++-- utils/kamctl/db_berkeley/kamailio/rls_watchers | 4 ++-- utils/kamctl/db_berkeley/kamailio/version | 4 ++-- utils/kamctl/db_sqlite/presence-create.sql | 4 +++- utils/kamctl/db_sqlite/rls-create.sql | 2 ++ utils/kamctl/dbtext/kamailio/active_watchers | 2 +- utils/kamctl/dbtext/kamailio/rls_watchers | 2 +- utils/kamctl/dbtext/kamailio/version | 4 ++-- utils/kamctl/mysql/presence-create.sql | 4 +++- utils/kamctl/mysql/rls-create.sql | 2 ++ utils/kamctl/oracle/presence-create.sql | 4 +++- utils/kamctl/oracle/rls-create.sql | 2 ++ utils/kamctl/postgres/presence-create.sql | 4 +++- utils/kamctl/postgres/rls-create.sql | 2 ++ 16 files changed, 59 insertions(+), 15 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=039…

2 5

git:master: lib/srdb1/schema, modules_k/rls, utils/kamctl: Updated rls_watchers table version number
by Peter Dunkley 23 Apr '12

23 Apr '12

Module: sip-router Branch: master Commit: 7aa9323534c67f0c46597541c268da9abc6f86c0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7aa9323… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Apr 23 11:58:40 2012 +0100 lib/srdb1/schema, modules_k/rls, utils/kamctl: Updated rls_watchers table version number --- lib/srdb1/schema/rls_watchers.xml | 2 +- modules_k/rls/rls.c | 2 +- utils/kamctl/db_berkeley/kamailio/version | 2 +- utils/kamctl/db_sqlite/rls-create.sql | 2 +- utils/kamctl/dbtext/kamailio/version | 2 +- utils/kamctl/mysql/rls-create.sql | 2 +- utils/kamctl/oracle/rls-create.sql | 2 +- utils/kamctl/postgres/rls-create.sql | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/srdb1/schema/rls_watchers.xml b/lib/srdb1/schema/rls_watchers.xml index b3f8289..8abead0 100644 --- a/lib/srdb1/schema/rls_watchers.xml +++ b/lib/srdb1/schema/rls_watchers.xml @@ -9,7 +9,7 @@ <table id="rls_watchers" xmlns:db="http://docbook.org/ns/docbook"> <name>rls_watchers</name> - <version>2</version> + <version>3</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>Table for RLS module used for storing resource lists subscribe diff --git a/modules_k/rls/rls.c b/modules_k/rls/rls.c index 379ed1d..845297b 100644 --- a/modules_k/rls/rls.c +++ b/modules_k/rls/rls.c @@ -62,7 +62,7 @@ MODULE_VERSION #define P_TABLE_VERSION 1 -#define W_TABLE_VERSION 2 +#define W_TABLE_VERSION 3 #define X_TABLE_VERSION 4 /** database connection */ diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index adb7cb0..411ab6b 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -91,7 +91,7 @@ re_grp|1 rls_presentity| rls_presentity|1 rls_watchers| -rls_watchers|2 +rls_watchers|3 silo| silo|6 sip_trace| diff --git a/utils/kamctl/db_sqlite/rls-create.sql b/utils/kamctl/db_sqlite/rls-create.sql index c23c62b..e832978 100644 --- a/utils/kamctl/db_sqlite/rls-create.sql +++ b/utils/kamctl/db_sqlite/rls-create.sql @@ -16,7 +16,7 @@ CREATE INDEX rls_presentity_rlsubs_idx ON rls_presentity (rlsubs_did); CREATE INDEX rls_presentity_updated_idx ON rls_presentity (updated); CREATE INDEX rls_presentity_expires_idx ON rls_presentity (expires); -INSERT INTO version (table_name, table_version) values ('rls_watchers','2'); +INSERT INTO version (table_name, table_version) values ('rls_watchers','3'); CREATE TABLE rls_watchers ( id INTEGER PRIMARY KEY NOT NULL, presentity_uri VARCHAR(128) NOT NULL, diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index 166d5b4..a29bdc8 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -40,7 +40,7 @@ pua:7 purplemap:1 re_grp:1 rls_presentity:1 -rls_watchers:2 +rls_watchers:3 silo:6 sip_trace:3 speed_dial:2 diff --git a/utils/kamctl/mysql/rls-create.sql b/utils/kamctl/mysql/rls-create.sql index 07a75b4..b1e90ae 100644 --- a/utils/kamctl/mysql/rls-create.sql +++ b/utils/kamctl/mysql/rls-create.sql @@ -16,7 +16,7 @@ CREATE INDEX rlsubs_idx ON rls_presentity (rlsubs_did); CREATE INDEX updated_idx ON rls_presentity (updated); CREATE INDEX expires_idx ON rls_presentity (expires); -INSERT INTO version (table_name, table_version) values ('rls_watchers','2'); +INSERT INTO version (table_name, table_version) values ('rls_watchers','3'); CREATE TABLE rls_watchers ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, presentity_uri VARCHAR(128) NOT NULL, diff --git a/utils/kamctl/oracle/rls-create.sql b/utils/kamctl/oracle/rls-create.sql index e7fa7d9..5f8b84f 100644 --- a/utils/kamctl/oracle/rls-create.sql +++ b/utils/kamctl/oracle/rls-create.sql @@ -24,7 +24,7 @@ CREATE INDEX rls_presentity_rlsubs_idx ON rls_presentity (rlsubs_did); CREATE INDEX rls_presentity_updated_idx ON rls_presentity (updated); CREATE INDEX rls_presentity_expires_idx ON rls_presentity (expires); -INSERT INTO version (table_name, table_version) values ('rls_watchers','2'); +INSERT INTO version (table_name, table_version) values ('rls_watchers','3'); CREATE TABLE rls_watchers ( id NUMBER(10) PRIMARY KEY, presentity_uri VARCHAR2(128), diff --git a/utils/kamctl/postgres/rls-create.sql b/utils/kamctl/postgres/rls-create.sql index 0eca1ef..205b98d 100644 --- a/utils/kamctl/postgres/rls-create.sql +++ b/utils/kamctl/postgres/rls-create.sql @@ -16,7 +16,7 @@ CREATE INDEX rls_presentity_rlsubs_idx ON rls_presentity (rlsubs_did); CREATE INDEX rls_presentity_updated_idx ON rls_presentity (updated); CREATE INDEX rls_presentity_expires_idx ON rls_presentity (expires); -INSERT INTO version (table_name, table_version) values ('rls_watchers','2'); +INSERT INTO version (table_name, table_version) values ('rls_watchers','3'); CREATE TABLE rls_watchers ( id SERIAL PRIMARY KEY NOT NULL, presentity_uri VARCHAR(128) NOT NULL,

1 0

[tracker] Comment added: to send notification to sender when the offline message is delivered
by sip-router 22 Apr '12

22 Apr '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#211 - to send notification to sender when the offline message is delivered User who did this - Daniel-Constantin Mierla (miconda) ---------- Any follow up on this? If you want it in 3.3.0, send the patch asap. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=211#comment518 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

spelling errors patch
by Victor Seva 22 Apr '12

22 Apr '12

Hi, I think I've found some minor spelling errors and this is the patch I'm already using. I'm not a native English myself so don't trust me at all. Greetings

2 1

git:master: Fix various spelling errors.
by Timo Reimann 22 Apr '12

22 Apr '12

Module: sip-router Branch: master Commit: adc585e48f6a56cc96fc10559a3327c921b6736b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=adc585e… Author: Timo Reimann <sr(a)foo-lounge.de> Committer: Timo Reimann <sr(a)foo-lounge.de> Date: Sun Apr 22 13:06:34 2012 +0200 Fix various spelling errors. - Credits to Victor Seva for providing the patch. --- modules/db_postgres/pg_cmd.c | 2 +- modules/sipcapture/sipcapture.c | 2 +- modules/sms/libsms_getsms.c | 2 +- modules/sms/sms_funcs.c | 4 ++-- modules/tls/tls_init.c | 4 ++-- modules_k/p_usrloc/ul_db_tran.c | 2 +- modules_k/path/path.c | 2 +- modules_k/pv/pv_core.c | 2 +- modules_k/regex/regex_mod.c | 4 ++-- modules_k/seas/event_dispatcher.c | 2 +- modules_s/domain/domain.c | 2 +- rvalue.c | 2 +- socket_info.c | 2 +- tcp_main.c | 2 +- utils/kamctl/kamdbctl.8 | 2 +- 15 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/db_postgres/pg_cmd.c b/modules/db_postgres/pg_cmd.c index f09014c..eec1c1b 100644 --- a/modules/db_postgres/pg_cmd.c +++ b/modules/db_postgres/pg_cmd.c @@ -349,7 +349,7 @@ static int upload_cmd(db_cmd_t* cmd) /* FIXME: The function should take the connection as one of parameters */ pcon = DB_GET_PAYLOAD(cmd->ctx->con[db_payload_idx]); - DBG("postgres: Uploading comand '%s': '%s'\n", pcmd->name, + DBG("postgres: Uploading command '%s': '%s'\n", pcmd->name, pcmd->sql_cmd.s); res = PQprepare(pcon->con, pcmd->name, pcmd->sql_cmd.s, 0, NULL); diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index e2df848..6905f85 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -1394,7 +1394,7 @@ int raw_capture_socket(struct ip_addr* ip, str* iface, int port_start, int port_ } #endif else { - ERR("raw_capture_socket: LSF currently suppoted only on linux\n"); + ERR("raw_capture_socket: LSF currently supported only on linux\n"); goto error; } diff --git a/modules/sms/libsms_getsms.c b/modules/sms/libsms_getsms.c index c4969eb..d185c57 100644 --- a/modules/sms/libsms_getsms.c +++ b/modules/sms/libsms_getsms.c @@ -519,7 +519,7 @@ int cds2sms(struct incame_sms *sms, struct modem *mdm, char *s, int s_len) ptr = s; for ( n=0 ; n<2 && (ptr=strstr(ptr,"\r\n")) ; n++,ptr+=2 ); if (n<2) { - LM_ERR("failed to find pdu begining in CDS!\n"); + LM_ERR("failed to find pdu beginning in CDS!\n"); goto error; } data = ptr; diff --git a/modules/sms/sms_funcs.c b/modules/sms/sms_funcs.c index 5561301..5fcb66b 100644 --- a/modules/sms/sms_funcs.c +++ b/modules/sms/sms_funcs.c @@ -641,7 +641,7 @@ int send_sms_as_sip( struct incame_sms *sms ) /* the rest of the sms (if any ;-)) is the body! */ sip_body.s = p; sip_body.len = sms->ascii + sms->userdatalength - p; - /* let's trim out all \n an \r from begining */ + /* let's trim out all \n an \r from beginning */ while ( sip_body.len && sip_body.s && (sip_body.s[0]=='\n' || sip_body.s[0]=='\r') ) { sip_body.s++; @@ -696,7 +696,7 @@ int send_sms_as_sip_scan_no(struct incame_sms *sms, char *to) sip_body.len = sms->ascii + sms->userdatalength - sms->ascii; sip_body.s = sms->ascii; - /* let's trim out all \n an \r from begining */ + /* let's trim out all \n an \r from beginning */ while (sip_body.len && sip_body.s && (sip_body.s[0] == '\n' || sip_body.s[0] == '\r')) { sip_body.s++; diff --git a/modules/tls/tls_init.c b/modules/tls/tls_init.c index 70338b1..e409b5e 100644 --- a/modules/tls/tls_init.c +++ b/modules/tls/tls_init.c @@ -544,8 +544,8 @@ int init_tls_h(void) " zlib compression: %s" "\n %s\n", SSLeay_version(SSLEAY_VERSION), ssl_version, - (lib_kerberos==1)?"on":(lib_kerberos==0)?"off":"unkown", - (lib_zlib==1)?"on":(lib_zlib==0)?"off":"unkown", + (lib_kerberos==1)?"on":(lib_kerberos==0)?"off":"unknown", + (lib_zlib==1)?"on":(lib_zlib==0)?"off":"unknown", SSLeay_version(SSLEAY_CFLAGS)); if (lib_kerberos!=kerberos_support){ if (lib_kerberos!=-1){ diff --git a/modules_k/p_usrloc/ul_db_tran.c b/modules_k/p_usrloc/ul_db_tran.c index 5d0fa1c..e87b130 100644 --- a/modules_k/p_usrloc/ul_db_tran.c +++ b/modules_k/p_usrloc/ul_db_tran.c @@ -85,7 +85,7 @@ int ul_db_tran_commit(ul_db_handle_t * handle, int working[]) { for(i=0; i<DB_NUM; i++) { if((handle->db[i].status == DB_ON) && (working[i])) { if(submit_tran_commit(&handle->db[i].dbf, handle->db[i].dbh) < 0) { - LM_ERR("error while commiting " + LM_ERR("error while committing " "transaction on id %i, db %i.\n", handle->id, handle->db[i].no); if(db_handle_error(handle, handle->db[i].no) < 0) { LM_ERR("error during handling error " diff --git a/modules_k/path/path.c b/modules_k/path/path.c index f286077..57c413a 100644 --- a/modules_k/path/path.c +++ b/modules_k/path/path.c @@ -210,7 +210,7 @@ void path_rr_callback(struct sip_msg *_m, str *r_param, void *cb_param) param_t *params; if (parse_params(r_param, CLASS_CONTACT, &hooks, &params) != 0) { - LM_ERR("failed to parse route parametes\n"); + LM_ERR("failed to parse route parameters\n"); return; } diff --git a/modules_k/pv/pv_core.c b/modules_k/pv/pv_core.c index fb76583..370ec1a 100644 --- a/modules_k/pv/pv_core.c +++ b/modules_k/pv/pv_core.c @@ -1707,7 +1707,7 @@ int pv_set_dsturi(struct sip_msg* msg, pv_param_t *param, } if(!(val->flags&PV_VAL_STR)) { - LM_ERR("error - str value requred to set dst uri\n"); + LM_ERR("error - str value required to set dst uri\n"); goto error; } diff --git a/modules_k/regex/regex_mod.c b/modules_k/regex/regex_mod.c index d5b2ab0..51665aa 100644 --- a/modules_k/regex/regex_mod.c +++ b/modules_k/regex/regex_mod.c @@ -316,7 +316,7 @@ static int load_pcres(int action) i++; /* Check if there are more patterns than the max value */ if (i >= max_groups) { - LM_ERR("max patterns exceded\n"); + LM_ERR("max patterns exceeded\n"); fclose(f); goto err; } @@ -328,7 +328,7 @@ static int load_pcres(int action) /* Check if the patter size is too big (aprox) */ if (strlen(patterns[i]) + strlen(line) >= group_max_size - 2) { - LM_ERR("pattern max file exceded\n"); + LM_ERR("pattern max file exceeded\n"); fclose(f); goto err; } diff --git a/modules_k/seas/event_dispatcher.c b/modules_k/seas/event_dispatcher.c index 696a169..366d888 100644 --- a/modules_k/seas/event_dispatcher.c +++ b/modules_k/seas/event_dispatcher.c @@ -192,7 +192,7 @@ int dispatcher_main_loop(void) continue; } if(errno==EBADF){ - LM_ERR("invalid file descriptor pased to poll (%s)\n", + LM_ERR("invalid file descriptor passed to poll (%s)\n", strerror(errno)); return -1;/*??*/ } diff --git a/modules_s/domain/domain.c b/modules_s/domain/domain.c index cb5cb32..4abfc3c 100644 --- a/modules_s/domain/domain.c +++ b/modules_s/domain/domain.c @@ -182,7 +182,7 @@ int db_load_domain_attrs(domain_t* d) load_attrs_cmd->match[0].v.lstr = d->did; if (db_exec(&res, load_attrs_cmd) < 0) { - ERR("Error while quering database\n"); + ERR("Error while querying database\n"); return -1; } diff --git a/rvalue.c b/rvalue.c index 00dc19d..cb0db9c 100644 --- a/rvalue.c +++ b/rvalue.c @@ -335,7 +335,7 @@ char* rval_type_name(enum rval_type type) case RV_SEL: return "select"; } - return "error_unkown_type"; + return "error_unknown_type"; } diff --git a/socket_info.c b/socket_info.c index d439bce..1ccddfd 100644 --- a/socket_info.c +++ b/socket_info.c @@ -1171,7 +1171,7 @@ int add_interfaces_via_netlink(char* if_name, int family, unsigned short port, //if(! (ifaces[i].flags & IFF_UP) ) continue; for(tmp = ifaces[i].addresses; tmp; tmp = tmp->next){ - LM_DBG("\t in add_iface_via_netlink Name %s Adress %s\n", ifaces[i].name, tmp->addr); + LM_DBG("\t in add_iface_via_netlink Name %s Address %s\n", ifaces[i].name, tmp->addr); /* match family */ if (family == tmp->family){ /* check if loopback */ diff --git a/tcp_main.c b/tcp_main.c index 1c6344c..d629647 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -1716,7 +1716,7 @@ error: c->id, port); break; default: - LOG(L_ERR, "ERROR: tcpconn_add_alias: unkown error %d\n", ret); + LOG(L_ERR, "ERROR: tcpconn_add_alias: unknown error %d\n", ret); } return -1; } diff --git a/utils/kamctl/kamdbctl.8 b/utils/kamctl/kamdbctl.8 index 4c283ef..3933e87 100644 --- a/utils/kamctl/kamdbctl.8 +++ b/utils/kamctl/kamdbctl.8 @@ -54,7 +54,7 @@ Entirely deletes and than re-creates tables. Restores tables from a file. .SH NOTES -Not all databases scripts suport all commands. +Not all databases scripts support all commands. .SH FILES .PD 0

1 0

git:master: modules_k/permissions: added allow_trusted() transport protocol value "any"
by admin＠sip-router.org 21 Apr '12

21 Apr '12

Module: sip-router Branch: master Commit: 54d36ac52b0d5ea64abdb6fdb7f88a2ae2be5fd5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=54d36ac… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Apr 21 20:17:40 2012 +0300 modules_k/permissions: added allow_trusted() transport protocol value "any" - Transport protocol argument of allow_trusted() function call can now have value "any" meaning that any transport protocol is acceptable. --- modules_k/permissions/README | 2 +- modules_k/permissions/doc/permissions_admin.xml | 2 +- modules_k/permissions/hash.c | 57 +++++++++--------- modules_k/permissions/trusted.c | 75 +++++++++++++---------- 4 files changed, 73 insertions(+), 63 deletions(-) diff --git a/modules_k/permissions/README b/modules_k/permissions/README index 5613198..51fb4df 100644 --- a/modules_k/permissions/README +++ b/modules_k/permissions/README @@ -829,7 +829,7 @@ if ($var(group) != -1) { Source address and transport protocol given in pvar arguments must be in string format. Valid transport protocol values are (ignoring case) - "udp, "tcp", "tls", and "sctp". + "any", "udp, "tcp", "tls", and "sctp". This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. diff --git a/modules_k/permissions/doc/permissions_admin.xml b/modules_k/permissions/doc/permissions_admin.xml index b18040c..993ef64 100644 --- a/modules_k/permissions/doc/permissions_admin.xml +++ b/modules_k/permissions/doc/permissions_admin.xml @@ -1043,7 +1043,7 @@ if ($var(group) != -1) { <para> Source address and transport protocol given in pvar arguments must be in string format. Valid transport - protocol values are (ignoring case) "udp, "tcp", "tls", + protocol values are (ignoring case) "any", "udp, "tcp", "tls", and "sctp". </para> <para> diff --git a/modules_k/permissions/hash.c b/modules_k/permissions/hash.c index 4536e8a..467259b 100644 --- a/modules_k/permissions/hash.c +++ b/modules_k/permissions/hash.c @@ -1,7 +1,7 @@ /* * Hash functions for cached trusted and address tables * - * Copyright (C) 2003-2006 Juha Heinanen + * Copyright (C) 2003-2012 Juha Heinanen * * This file is part of Kamailio, a free SIP server. * @@ -228,37 +228,38 @@ int match_hash_table(struct trusted_list** table, struct sip_msg* msg, uri_string[uri.len] = (char)0; for (np = table[perm_hash(src_ip)]; np != NULL; np = np->next) { - if ((np->src_ip.len == src_ip.len) && - (strncmp(np->src_ip.s, src_ip.s, src_ip.len) == 0) && - ((np->proto == PROTO_NONE) || (np->proto == proto))) { - if (np->pattern) { - if (regcomp(&preg, np->pattern, REG_NOSUB)) { - LM_ERR("invalid regular expression\n"); - continue; - } - if (regexec(&preg, uri_string, 0, (regmatch_t *)0, 0)) { - regfree(&preg); - continue; - } - regfree(&preg); - } - /* Found a match */ - if (tag_avp.n && np->tag.s) { - val.s = np->tag; - if (add_avp(tag_avp_type|AVP_VAL_STR, tag_avp, val) != 0) { - LM_ERR("setting of tag_avp failed\n"); - return -1; - } - } - if (!peer_tag_mode) - return 1; - count++; + if ((np->src_ip.len == src_ip.len) && + (strncmp(np->src_ip.s, src_ip.s, src_ip.len) == 0) && + ((np->proto == PROTO_NONE) || (proto == PROTO_NONE) || + (np->proto == proto))) { + if (np->pattern) { + if (regcomp(&preg, np->pattern, REG_NOSUB)) { + LM_ERR("invalid regular expression\n"); + continue; + } + if (regexec(&preg, uri_string, 0, (regmatch_t *)0, 0)) { + regfree(&preg); + continue; + } + regfree(&preg); } + /* Found a match */ + if (tag_avp.n && np->tag.s) { + val.s = np->tag; + if (add_avp(tag_avp_type|AVP_VAL_STR, tag_avp, val) != 0) { + LM_ERR("setting of tag_avp failed\n"); + return -1; + } + } + if (!peer_tag_mode) + return 1; + count++; + } } if (!count) - return -1; + return -1; else - return count; + return count; } diff --git a/modules_k/permissions/trusted.c b/modules_k/permissions/trusted.c index 67d0a04..4e7953c 100644 --- a/modules_k/permissions/trusted.c +++ b/modules_k/permissions/trusted.c @@ -3,7 +3,7 @@ * * allow_trusted related functions * - * Copyright (C) 2003 Juha Heinanen + * Copyright (C) 2003-2012 Juha Heinanen * * This file is part of Kamailio, a free SIP server. * @@ -288,7 +288,9 @@ void clean_trusted(void) */ static inline int match_proto(const char *proto_string, int proto_int) { - if (strcasecmp(proto_string, "any") == 0) return 1; + if ((proto_int == PROTO_NONE) || + (strcasecmp(proto_string, "any") == 0)) + return 1; if (proto_int == PROTO_UDP) { if (strcasecmp(proto_string, "udp") == 0) { @@ -471,43 +473,50 @@ int allow_trusted_2(struct sip_msg* _msg, char* _src_ip_sp, char* _proto_sp) int proto_int; if (_src_ip_sp==NULL - || (fixup_get_svalue(_msg, (gparam_p)_src_ip_sp, &src_ip) != 0)) { - LM_ERR("src_ip param does not exist or has no value\n"); - return -1; + || (fixup_get_svalue(_msg, (gparam_p)_src_ip_sp, &src_ip) != 0)) { + LM_ERR("src_ip param does not exist or has no value\n"); + return -1; } if (_proto_sp==NULL - || (fixup_get_svalue(_msg, (gparam_p)_proto_sp, &proto) != 0)) { - LM_ERR("proto param does not exist or has no value\n"); - return -1; + || (fixup_get_svalue(_msg, (gparam_p)_proto_sp, &proto) != 0)) { + LM_ERR("proto param does not exist or has no value\n"); + return -1; } - if(proto.len!=3 && proto.len!=4) - goto error; - - switch(proto.s[0]) { - case 'u': case 'U': - if (proto.len==3 && strncasecmp(proto.s, "udp", 3) == 0) { - proto_int = PROTO_UDP; - } else goto error; - break; - case 't': case 'T': - if (proto.len==3 && strncasecmp(proto.s, "tcp", 3) == 0) { - proto_int = PROTO_TCP; - } else if (proto.len==3 && strncasecmp(proto.s, "tls", 3) == 0) { - proto_int = PROTO_TLS; - } else goto error; - break; - case 's': case 'S': - if (proto.len==4 && strncasecmp(proto.s, "sctp", 4) == 0) { - proto_int = PROTO_SCTP; - } else goto error; - break; - default: - goto error; + + if(proto.len!=3 && proto.len!=4) + goto error; + + switch(proto.s[0]) { + case 'a': case 'A': + if (proto.len==3 && strncasecmp(proto.s, "any", 3) == 0) { + proto_int = PROTO_NONE; + } else goto error; + break; + case 'u': case 'U': + if (proto.len==3 && strncasecmp(proto.s, "udp", 3) == 0) { + proto_int = PROTO_UDP; + } else goto error; + break; + case 't': case 'T': + if (proto.len==3 && strncasecmp(proto.s, "tcp", 3) == 0) { + proto_int = PROTO_TCP; + } else if (proto.len==3 && strncasecmp(proto.s, "tls", 3) == 0) { + proto_int = PROTO_TLS; + } else goto error; + break; + case 's': case 'S': + if (proto.len==4 && strncasecmp(proto.s, "sctp", 4) == 0) { + proto_int = PROTO_SCTP; + } else goto error; + break; + default: + goto error; } return allow_trusted(_msg, src_ip.s, proto_int); error: - LM_ERR("unknown protocol %.*s\n", proto.len, proto.s); - return -1; + LM_ERR("unknown protocol %.*s\n", proto.len, proto.s); + return -1; } +

1 0

git:master: modules_k/rls: Used db_begin() and db_commit() around blocks of related DB queries and updates
by Peter Dunkley 20 Apr '12

20 Apr '12

Module: sip-router Branch: master Commit: f71bdc3cbdf5acdf243217778e4159f2e6ab341d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f71bdc3… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Apr 20 14:00:22 2012 +0100 modules_k/rls: Used db_begin() and db_commit() around blocks of related DB queries and updates - This makes these related sets of DB queries a single transaction. As Klaus pointed out this if you don't do this you can get inconsistencies when using multiple presence servers. --- modules_k/rls/notify.c | 12 ++++++++++++ modules_k/rls/resource_notify.c | 24 ++++++++++++++++++++++++ modules_k/rls/rls_db.c | 21 +++++++++++++++++++++ 3 files changed, 57 insertions(+), 0 deletions(-) diff --git a/modules_k/rls/notify.c b/modules_k/rls/notify.c index 082fbfa..1836808 100644 --- a/modules_k/rls/notify.c +++ b/modules_k/rls/notify.c @@ -128,6 +128,12 @@ int send_full_notify(subs_t* subs, xmlNodePtr rl_node, str* rl_uri, goto error; } + if (db_begin(&rlpres_dbf, rlpres_db) < 0) + { + LM_ERR("in BEGIN\n"); + goto error; + } + if(rlpres_dbf.query(rlpres_db, query_cols, 0, query_vals, result_cols, 1, n_result_cols, &str_resource_uri_col, &result )< 0) { @@ -257,6 +263,12 @@ int send_full_notify(subs_t* subs, xmlNodePtr rl_node, str* rl_uri, goto error; } + if (db_commit(&rlpres_dbf, rlpres_db) < 0) + { + LM_ERR("in COMMIT\n"); + goto error; + } + xmlFree(rlmi_cont->s); pkg_free(rlmi_cont); diff --git a/modules_k/rls/resource_notify.c b/modules_k/rls/resource_notify.c index 29e0b11..87ce806 100644 --- a/modules_k/rls/resource_notify.c +++ b/modules_k/rls/resource_notify.c @@ -893,6 +893,12 @@ static void timer_send_full_state_notifies(int round) goto done; } + if (db_begin(&rls_dbf, rls_db) < 0) + { + LM_ERR("in BEGIN\n"); + goto done; + } + /* Step 1: Find rls_watchers that require full-state notification */ if (rls_dbf.query(rls_db, query_cols, 0, query_vals, result_cols, 1, n_result_cols, 0, &result) < 0) @@ -912,6 +918,12 @@ static void timer_send_full_state_notifies(int round) goto done; } + if (db_commit(&rls_dbf, rls_db) < 0) + { + LM_ERR("in COMMIT\n"); + goto done; + } + /* Step 3: Full-state notify each watcher we found */ rows = RES_ROWS(result); for (i = 0; i < RES_ROW_N(result); i++) @@ -1025,6 +1037,12 @@ static void timer_send_update_notifies(int round) goto done; } + if (db_begin(&rlpres_dbf, rlpres_db) < 0) + { + LM_ERR("in BEGIN\n"); + goto error; + } + if(rlpres_dbf.query(rlpres_db, query_cols, 0, query_vals, result_cols, 1, n_result_cols, &str_rlsubs_did_col, &result)< 0) { @@ -1042,6 +1060,12 @@ static void timer_send_update_notifies(int round) goto error; } + if (db_commit(&rlpres_dbf, rlpres_db) < 0) + { + LM_ERR("in COMMIT\n"); + goto error; + } + send_notifies(result, did_col, resource_uri_col, auth_state_col, reason_col, pres_state_col, content_type_col); error: diff --git a/modules_k/rls/rls_db.c b/modules_k/rls/rls_db.c index 6a00c21..46bda91 100644 --- a/modules_k/rls/rls_db.c +++ b/modules_k/rls/rls_db.c @@ -124,6 +124,7 @@ int delete_expired_subs_rlsdb( void ) int i; subs_t subs; str rlsubs_did = {0, 0}; + int transaction_started = 0; if(rls_db == NULL) { @@ -148,6 +149,13 @@ int delete_expired_subs_rlsdb( void ) result_cols[r_to_tag_col=n_result_cols++] = &str_to_tag_col; result_cols[r_from_tag_col=n_result_cols++] = &str_from_tag_col; + if (db_begin(&rls_dbf, rls_db) < 0) + { + LM_ERR("in BEGIN\n"); + goto error; + } + transaction_started = 1; + if(rls_dbf.query(rls_db, query_cols, query_ops, query_vals, result_cols, n_query_cols, n_result_cols, 0, &result )< 0) { @@ -213,12 +221,25 @@ int delete_expired_subs_rlsdb( void ) pkg_free(rlsubs_did.s); } + if (db_commit(&rls_dbf, rls_db) < 0) + { + LM_ERR("in COMMIT\n"); + goto error; + } + if(result) rls_dbf.free_result(rls_db, result); return 1; error: if (result) rls_dbf.free_result(rls_db, result); if (rlsubs_did.s) pkg_free(rlsubs_did.s); + + if (transaction_started) + { + if (db_commit(&rls_dbf, rls_db) < 0) + LM_ERR("in COMMIT\n"); + } + return -1; }

3 10

git:master: modules/lcr: same gateway may now belong all lcr instances
by admin＠sip-router.org 20 Apr '12

20 Apr '12

Module: sip-router Branch: master Commit: 3e6570dae9cf41a929abfc39b8b2a0cdafec49b9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3e6570d… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Apr 20 19:29:15 2012 +0300 modules/lcr: same gateway may now belong all lcr instances - Gateways with special lcr instance id 0 belong to all normal lcr instances. --- modules/lcr/README | 29 ++- modules/lcr/doc/lcr_admin.xml | 18 +- modules/lcr/lcr_mod.c | 504 ++++++++++++++++++++++------------------- 3 files changed, 295 insertions(+), 256 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=3e6…

1 0

git:master: lib/srdb1: Changed the creation of non-pooled DB connections from being URL based to function (C-code) based
by Peter Dunkley 20 Apr '12

20 Apr '12

Module: sip-router Branch: master Commit: b17945f76076114fbab5f2ee198daae5c7b96950 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b17945f… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Apr 20 17:17:24 2012 +0100 lib/srdb1: Changed the creation of non-pooled DB connections from being URL based to function (C-code) based --- lib/srdb1/db.c | 18 +++++------------- lib/srdb1/db.h | 27 ++++++++++++++++++++++++++- lib/srdb1/db_id.c | 26 +++++++------------------- lib/srdb1/db_id.h | 2 +- 4 files changed, 39 insertions(+), 34 deletions(-) diff --git a/lib/srdb1/db.c b/lib/srdb1/db.c index 5905bb0..ff7f837 100644 --- a/lib/srdb1/db.c +++ b/lib/srdb1/db.c @@ -182,17 +182,8 @@ int db_bind_mod(const str* mod, db_func_t* mydbf) return -1; } memcpy(name, "db_", 3); - - if (mod->s[0]=='*' ) - { - memcpy(name+3, (mod->s)+1, (mod->len)-1); - name[mod->len-1+3] = 0; - } - else - { - memcpy(name+3, mod->s, mod->len); - name[mod->len+3] = 0; - } + memcpy(name+3, mod->s, mod->len); + name[mod->len+3] = 0; /* for safety we initialize mydbf with 0 (this will cause * a segfault immediately if someone tries to call a function @@ -230,6 +221,7 @@ int db_bind_mod(const str* mod, db_func_t* mydbf) dbf.use_table = (db_use_table_f)find_mod_export(tmp, "db_use_table", 2, 0); dbf.init = (db_init_f)find_mod_export(tmp, "db_init", 1, 0); + dbf.init_nopool = (db_init_nopool_f)find_mod_export(tmp, "db_init_nopool", 1, 0); dbf.close = (db_close_f)find_mod_export(tmp, "db_close", 2, 0); dbf.query = (db_query_f)find_mod_export(tmp, "db_query", 2, 0); dbf.fetch_result = (db_fetch_result_f)find_mod_export(tmp, @@ -268,7 +260,7 @@ error: * Initialize database module * \note No function should be called before this */ -db1_con_t* db_do_init(const str* url, void* (*new_connection)()) +db1_con_t* db_do_init(const str* url, void* (*new_connection)(), int nopool) { struct db_id* id; void* con; @@ -296,7 +288,7 @@ db1_con_t* db_do_init(const str* url, void* (*new_connection)()) } memset(res, 0, con_size); - id = new_db_id(url); + id = new_db_id(url, nopool); if (!id) { LM_ERR("cannot parse URL '%.*s'\n", url->len, url->s); goto err; diff --git a/lib/srdb1/db.h b/lib/srdb1/db.h index 5258e2c..06ff8f3 100644 --- a/lib/srdb1/db.h +++ b/lib/srdb1/db.h @@ -89,6 +89,30 @@ typedef int (*db_use_table_f)(db1_con_t* _h, const str * _t); typedef db1_con_t* (*db_init_f) (const str* _sqlurl); /** + * \brief Initialize database connection and obtain a non-pooled connection handle. + * + * This function initialize the database API and open a new database + * connection. This function must be called after bind_dbmod but before any + * other database API function is called. + * + * The function takes one parameter, the parameter must contain the database + * connection URL. The URL is of the form + * mysql://username:password\@host:port/database where: + * + * username: Username to use when logging into database (optional). + * password: password if it was set (optional) + * host: Hosname or IP address of the host where database server lives (mandatory) + * port: Port number of the server if the port differs from default value (optional) + * database: If the database server supports multiple databases, you must specify the + * name of the database (optional). + * \see bind_dbmod + * \param _sqlurl database connection URL + * \return returns a pointer to the db1_con_t representing the connection if it was + * successful, otherwise 0 is returned + */ +typedef db1_con_t* (*db_init_nopool_f) (const str* _sqlurl); + +/** * \brief Close a database connection and free all memory used. * * The function closes previously open connection and frees all previously @@ -323,6 +347,7 @@ typedef struct db_func { unsigned int cap; /* Capability vector of the database transport */ db_use_table_f use_table; /* Specify table name */ db_init_f init; /* Initialize database connection */ + db_init_nopool_f init_nopool; /* Initialize database connection - no pooling */ db_close_f close; /* Close database connection */ db_query_f query; /* query a table */ db_fetch_result_f fetch_result; /* fetch result */ @@ -371,7 +396,7 @@ int db_bind_mod(const str* mod, db_func_t* dbf); * \return returns a pointer to the db1_con_t representing the connection if it was successful, otherwise 0 is returned. */ -db1_con_t* db_do_init(const str* url, void* (*new_connection)()); +db1_con_t* db_do_init(const str* url, void* (*new_connection)(), int nopool); /** diff --git a/lib/srdb1/db_id.c b/lib/srdb1/db_id.c index 4aa564b..b6227a2 100644 --- a/lib/srdb1/db_id.c +++ b/lib/srdb1/db_id.c @@ -65,13 +65,12 @@ static int dupl_string(char** dst, const char* begin, const char* end) * \param url parsed URL * \return 0 if parsing was successful and -1 otherwise */ -static int parse_db_url(struct db_id* id, const str* url, int *poolid ) +static int parse_db_url(struct db_id* id, const str* url) { #define SHORTEST_DB_URL "s://a/b" #define SHORTEST_DB_URL_LEN (sizeof(SHORTEST_DB_URL) - 1) enum state { - ST_NONPOOL, /* Non pooling flag */ ST_SCHEME, /* Scheme part */ ST_SLASH1, /* First slash */ ST_SLASH2, /* Second slash */ @@ -100,25 +99,11 @@ static int parse_db_url(struct db_id* id, const str* url, int *poolid ) /* Initialize all attributes to 0 */ memset(id, 0, sizeof(struct db_id)); - st = ST_NONPOOL; + st = ST_SCHEME; begin = url->s; for(i = 0; i < len; i++) { switch(st) { - case ST_NONPOOL: - st = ST_SCHEME; - switch(url->s[i]) { - case '*': - id->poolid = ++(*poolid); - begin++; - break; - - default: - id->poolid = 0; - break; - } - break; - case ST_SCHEME: switch(url->s[i]) { case ':': @@ -242,7 +227,7 @@ static int parse_db_url(struct db_id* id, const str* url, int *poolid ) * \param url database URL * \return connection identifier, or zero on error */ -struct db_id* new_db_id(const str* url) +struct db_id* new_db_id(const str* url, int nopool) { static int poolid=0; struct db_id* ptr; @@ -259,10 +244,13 @@ struct db_id* new_db_id(const str* url) } memset(ptr, 0, sizeof(struct db_id)); - if (parse_db_url(ptr, url, &poolid) < 0) { + if (parse_db_url(ptr, url) < 0) { LM_ERR("error while parsing database URL: '%.*s' \n", url->len, url->s); goto err; } + + if (nopool) ptr->poolid = ++poolid; + else ptr->poolid = 0; ptr->pid = my_pid(); return ptr; diff --git a/lib/srdb1/db_id.h b/lib/srdb1/db_id.h index b7427a7..df3f474 100644 --- a/lib/srdb1/db_id.h +++ b/lib/srdb1/db_id.h @@ -50,7 +50,7 @@ struct db_id { * \param url database URL * \return new allocated db_id structure, NULL on failure */ -struct db_id* new_db_id(const str* url); +struct db_id* new_db_id(const str* url, int nopool); /**

1 0

git:master: modules/db_postgres: Added support for creating new non-pooled DB connections
by Peter Dunkley 20 Apr '12

20 Apr '12

Module: sip-router Branch: master Commit: a03955fff9ec2d5cd1f4f668d387cb8df926e1eb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a03955f… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Apr 20 17:18:57 2012 +0100 modules/db_postgres: Added support for creating new non-pooled DB connections - There is a new dbf.init_nopool() function to be used instead of the current dbf.init() when you want a unique (non-pooled) connection. --- modules/db_postgres/km_db_postgres.c | 1 + modules/db_postgres/km_dbase.c | 12 +++++++++++- modules/db_postgres/km_dbase.h | 5 +++++ 3 files changed, 17 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/km_db_postgres.c b/modules/db_postgres/km_db_postgres.c index 9292319..74b1a96 100644 --- a/modules/db_postgres/km_db_postgres.c +++ b/modules/db_postgres/km_db_postgres.c @@ -85,6 +85,7 @@ int db_postgres_bind_api(db_func_t *dbb) dbb->use_table = db_postgres_use_table; dbb->init = db_postgres_init; + dbb->init_nopool = db_postgres_init_nopool; dbb->close = db_postgres_close; dbb->query = db_postgres_query; dbb->fetch_result = db_postgres_fetch_result; diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c index 216ca05..e664a69 100644 --- a/modules/db_postgres/km_dbase.c +++ b/modules/db_postgres/km_dbase.c @@ -130,9 +130,19 @@ static void db_postgres_free_query(const db1_con_t* _con); */ db1_con_t *db_postgres_init(const str* _url) { - return db_do_init(_url, (void*) db_postgres_new_connection); + return db_do_init(_url, (void*) db_postgres_new_connection, 0); } +/*! + * \brief Initialize database for future queries - no pooling + * \param _url URL of the database that should be opened + * \return database connection on success, NULL on error + * \note this function must be called prior to any database functions + */ +db1_con_t *db_postgres_init_nopool(const str* _url) +{ + return db_do_init(_url, (void*) db_postgres_new_connection, 1); +} /*! * \brief Close database when the database is no longer needed diff --git a/modules/db_postgres/km_dbase.h b/modules/db_postgres/km_dbase.h index bfdd5b1..c219a32 100644 --- a/modules/db_postgres/km_dbase.h +++ b/modules/db_postgres/km_dbase.h @@ -47,6 +47,11 @@ db1_con_t* db_postgres_init(const str* _url); /* + * Initialize database connection - no pooling + */ +db1_con_t* db_postgres_init_nopool(const str* _url); + +/* * Close a database connection */ void db_postgres_close(db1_con_t* _h);

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2012