sr-dev August 2011

sr-dev@lists.kamailio.org

33 participants
292 discussions

git:master: htable: docs updated with db_expires parameter
by Daniel-Constantin Mierla 13 Aug '11

13 Aug '11

Module: sip-router Branch: master Commit: ab423c7f92dd3e977946db7f6c181fefea45e9ae URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ab423c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Aug 14 00:18:40 2011 +0200 htable: docs updated with db_expires parameter --- modules_k/htable/README | 47 ++++++++++++++++++++++---------- modules_k/htable/doc/htable_admin.xml | 21 ++++++++++++++ 2 files changed, 53 insertions(+), 15 deletions(-) diff --git a/modules_k/htable/README b/modules_k/htable/README index c973d6d..112adef 100644 --- a/modules_k/htable/README +++ b/modules_k/htable/README @@ -11,7 +11,7 @@ Elena-Ramona Modroiu <ramona(a)rosdev.ro> - Copyright © 2008-2011 http://www.asipto.com + Copyright � 2008-2011 http://www.asipto.com __________________________________________________________________ Table of Contents @@ -38,6 +38,7 @@ Elena-Ramona Modroiu 3.9. fetch_rows (integer) 3.10. timer_interval (integer) 3.11. timer_mode (integer) + 3.12. db_expires (integer) 4. Exported Functions @@ -70,9 +71,10 @@ Elena-Ramona Modroiu 1.11. Set fetch_rows parameter 1.12. Set timer_interval parameter 1.13. Set timer_mode parameter - 1.14. sht_print usage - 1.15. sht_rm_name_re usage - 1.16. sht_rm_value_re usage + 1.14. Set db_expires parameter + 1.15. sht_print usage + 1.16. sht_rm_name_re usage + 1.17. sht_rm_value_re usage Chapter 1. Admin Guide @@ -98,6 +100,7 @@ Chapter 1. Admin Guide 3.9. fetch_rows (integer) 3.10. timer_interval (integer) 3.11. timer_mode (integer) + 3.12. db_expires (integer) 4. Exported Functions @@ -133,7 +136,7 @@ Chapter 1. Admin Guide You can read more about hash tables at: http://en.wikipedia.org/wiki/Hash_table. - The “name” can be a static string or can include pseudo- variables that + The "name" can be a static string or can include pseudo- variables that will be replaced at runtime. Example 1.1. Accessing $sht(htname=>key) @@ -156,7 +159,7 @@ $sht(a=>$ci::srcip) = $si; the failed authentications per user and one for storing the time of last authentication attempt. To ensure unique name per user, the hash table uses a combination of authentication username and text - “::auth_count” and “::last_auth”. + "::auth_count" and "::last_auth". Example 1.2. Dictionary attack limitation ... @@ -247,6 +250,7 @@ if(is_present_hf("Authorization")) 3.9. fetch_rows (integer) 3.10. timer_interval (integer) 3.11. timer_mode (integer) + 3.12. db_expires (integer) 3.1. htable (str) @@ -396,13 +400,26 @@ modparam("htable", "timer_interval", 10) modparam("htable", "timer_mode", 1) ... +3.12. db_expires (integer) + + If set to 1, will load/save the expires values of the items in hash + table fromm/to database. It applies only to hash tables that have + auto-expires attribute defined. + + Default value is 0. + + Example 1.14. Set db_expires parameter +... +modparam("htable", "db_expires", 1) +... + 4. Exported Functions 4.1. sht_print() 4.2. sht_rm_name_re(htable=>regexp) 4.3. sht_rm_value_re(htable=>regexp) -4.1. sht_print() +4.1. sht_print() Dump content of hash table to L_ERR log level. Intended for debug purposes. @@ -410,12 +427,12 @@ modparam("htable", "timer_mode", 1) This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE. - Example 1.14. sht_print usage + Example 1.15. sht_print usage ... sht_print(); ... -4.2. sht_rm_name_re(htable=>regexp) +4.2. sht_rm_name_re(htable=>regexp) Delete all entries in the htable that match the name against regular expression. @@ -423,12 +440,12 @@ sht_print(); This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE. - Example 1.15. sht_rm_name_re usage + Example 1.16. sht_rm_name_re usage ... sht_rm_name_re("ha=>.*"); ... -4.3. sht_rm_value_re(htable=>regexp) +4.3. sht_rm_value_re(htable=>regexp) Delete all entries in the htable that match the value against regular expression. @@ -436,7 +453,7 @@ sht_rm_name_re("ha=>.*"); This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE. - Example 1.16. sht_rm_value_re usage + Example 1.17. sht_rm_value_re usage ... sht_rm_value_re("ha=>.*"); ... @@ -458,7 +475,7 @@ sht_rm_value_re("ha=>.*"); 6.1. sht_reload 6.2. sht_dump -6.1. sht_reload +6.1. sht_reload Reload a hash table from database. @@ -471,7 +488,7 @@ sht_rm_value_re("ha=>.*"); _hash_table_name_ _empty_line_ -6.2. sht_dump +6.2. sht_dump Dump content of a hash table via MI. @@ -488,7 +505,7 @@ sht_rm_value_re("ha=>.*"); 7.1. htable:mod-init -7.1. htable:mod-init +7.1. htable:mod-init When defined, the module calls event_route[htable:mod-init] after all modules have been initialised. A typical use case is to initialise diff --git a/modules_k/htable/doc/htable_admin.xml b/modules_k/htable/doc/htable_admin.xml index 2dc229e..3b14fa3 100644 --- a/modules_k/htable/doc/htable_admin.xml +++ b/modules_k/htable/doc/htable_admin.xml @@ -478,6 +478,27 @@ modparam("htable", "timer_mode", 1) </programlisting> </example> </section> + <section> + <title><varname>db_expires</varname> (integer)</title> + <para> + If set to 1, will load/save the expires values of the items in + hash table fromm/to database. It applies only to hash tables that + have auto-expires attribute defined. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>db_expires</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("htable", "db_expires", 1) +... +</programlisting> + </example> + </section> </section> <section> <title>Exported Functions</title>

1 0

git:master: srdb1: updated the definition of siptrace table to include time_us column
by Daniel-Constantin Mierla 13 Aug '11

13 Aug '11

Module: sip-router Branch: master Commit: 1aaf6bc3a28763a92baf398a594d2aac615a308a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1aaf6bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Aug 13 23:37:10 2011 +0200 srdb1: updated the definition of siptrace table to include time_us column - regenerated scripts to create the database schema based on latest xml schema definition --- lib/srdb1/schema/sip_trace.xml | 11 +++++++++-- utils/kamctl/db_berkeley/kamailio/htable | 4 ++-- utils/kamctl/db_berkeley/kamailio/sip_trace | 6 +++--- utils/kamctl/db_berkeley/kamailio/version | 8 ++++---- utils/kamctl/db_sqlite/htable-create.sql | 5 +++-- utils/kamctl/db_sqlite/pipelimit-create.sql | 1 - utils/kamctl/db_sqlite/presence-create.sql | 4 ++-- utils/kamctl/db_sqlite/rls-create.sql | 4 ++-- utils/kamctl/db_sqlite/siptrace-create.sql | 3 ++- utils/kamctl/dbtext/kamailio/htable | 2 +- utils/kamctl/dbtext/kamailio/sip_trace | 2 +- utils/kamctl/dbtext/kamailio/version | 8 ++++---- utils/kamctl/mysql/htable-create.sql | 5 +++-- utils/kamctl/mysql/pipelimit-create.sql | 1 - utils/kamctl/mysql/presence-create.sql | 4 ++-- utils/kamctl/mysql/rls-create.sql | 4 ++-- utils/kamctl/mysql/siptrace-create.sql | 6 +++--- utils/kamctl/oracle/htable-create.sql | 5 +++-- utils/kamctl/oracle/pipelimit-create.sql | 1 - utils/kamctl/oracle/presence-create.sql | 4 ++-- utils/kamctl/oracle/rls-create.sql | 4 ++-- utils/kamctl/oracle/siptrace-create.sql | 3 ++- utils/kamctl/postgres/htable-create.sql | 5 +++-- utils/kamctl/postgres/pipelimit-create.sql | 1 - utils/kamctl/postgres/presence-create.sql | 4 ++-- utils/kamctl/postgres/rls-create.sql | 4 ++-- utils/kamctl/postgres/siptrace-create.sql | 3 ++- 27 files changed, 61 insertions(+), 51 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=1aa…

1 0

git:master: modules_k/siptrace: Add column time_us
by Daniel-Constantin Mierla 13 Aug '11

13 Aug '11

Module: sip-router Branch: master Commit: 4c7048cba6080dbb842bcdaee7749edabf8e5403 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4c7048c… Author: Tristan Bruns <bruns(a)decoit.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 5 09:26:54 2011 +0200 modules_k/siptrace: Add column time_us Signed-off-by: Tristan Bruns <bruns(a)decoit.de> Signed-off-by: Daniel-Constantin Mierla <miconda(a)gmail.com> --- modules_k/siptrace/siptrace.c | 17 +++++++++++++---- utils/kamctl/mysql/siptrace-create.sql | 3 ++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/modules_k/siptrace/siptrace.c b/modules_k/siptrace/siptrace.c index 939f290..fc63e22 100644 --- a/modules_k/siptrace/siptrace.c +++ b/modules_k/siptrace/siptrace.c @@ -70,6 +70,7 @@ struct _siptrace_data { str toip; char toip_buff[IP_ADDR_MAX_STR_SIZE+12]; char fromip_buff[IP_ADDR_MAX_STR_SIZE+12]; + struct timeval tv; #ifdef STATISTICS stat_var *stat; #endif @@ -110,8 +111,9 @@ static str fromip_column = str_init("fromip"); /* 06 */ static str toip_column = str_init("toip"); /* 07 */ static str fromtag_column = str_init("fromtag"); /* 08 */ static str direction_column = str_init("direction"); /* 09 */ +static str time_us_column = str_init("time_us"); /* 10 */ -#define NR_KEYS 10 +#define NR_KEYS 11 #define XHEADERS_BUFSIZE 512 @@ -648,6 +650,8 @@ static int sip_trace_store(struct _siptrace_data *sto) return -1; } + gettimeofday(&sto->tv, NULL); + if (sip_trace_xheaders_read(sto) != 0) return -1; int ret = sip_trace_store_db(sto); @@ -700,7 +704,7 @@ static int sip_trace_store_db(struct _siptrace_data *sto) db_keys[6] = &date_column; db_vals[6].type = DB1_DATETIME; db_vals[6].nul = 0; - db_vals[6].val.time_val = time(NULL); + db_vals[6].val.time_val = sto->tv.tv_sec; db_keys[7] = &direction_column; db_vals[7].type = DB1_STRING; @@ -712,11 +716,16 @@ static int sip_trace_store_db(struct _siptrace_data *sto) db_vals[8].nul = 0; db_vals[8].val.str_val = sto->fromtag; - db_funcs.use_table(db_con, siptrace_get_table()); - db_keys[9] = &traced_user_column; db_vals[9].type = DB1_STR; db_vals[9].nul = 0; + + db_keys[10] = &time_us_column; + db_vals[10].type = DB1_INT; + db_vals[10].nul = 0; + db_vals[10].val.int_val = sto->tv.tv_usec; + + db_funcs.use_table(db_con, siptrace_get_table()); if(trace_on_flag!=NULL && *trace_on_flag!=0) { db_vals[9].val.str_val.s = ""; diff --git a/utils/kamctl/mysql/siptrace-create.sql b/utils/kamctl/mysql/siptrace-create.sql index 806fc34..bff8652 100644 --- a/utils/kamctl/mysql/siptrace-create.sql +++ b/utils/kamctl/mysql/siptrace-create.sql @@ -10,7 +10,8 @@ CREATE TABLE sip_trace ( fromip VARCHAR(50) DEFAULT '' NOT NULL, toip VARCHAR(50) DEFAULT '' NOT NULL, fromtag VARCHAR(64) DEFAULT '' NOT NULL, - direction VARCHAR(4) DEFAULT '' NOT NULL + direction VARCHAR(4) DEFAULT '' NOT NULL, + time_us INT(10) UNSIGNED DEFAULT 0 NOT NULL ) ENGINE=MyISAM; CREATE INDEX traced_user_idx ON sip_trace (traced_user);

1 0

git:master: modules_k/siptrace: Add time to x-headers
by Daniel-Constantin Mierla 13 Aug '11

13 Aug '11

Module: sip-router Branch: master Commit: 0e384ed123deb82f9ddaee6bace4dd5aa76845ec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0e384ed… Author: Tristan Bruns <bruns(a)decoit.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 5 09:30:53 2011 +0200 modules_k/siptrace: Add time to x-headers Signed-off-by: Tristan Bruns <bruns(a)decoit.de> Signed-off-by: Daniel-Constantin Mierla <miconda(a)gmail.com> --- modules_k/siptrace/siptrace.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/modules_k/siptrace/siptrace.c b/modules_k/siptrace/siptrace.c index fc63e22..5869e27 100644 --- a/modules_k/siptrace/siptrace.c +++ b/modules_k/siptrace/siptrace.c @@ -526,10 +526,12 @@ static int sip_trace_xheaders_write(struct _siptrace_data *sto) int bytes_written = snprintf(eoh, XHEADERS_BUFSIZE, "X-Siptrace-Fromip: %.*s\r\n" "X-Siptrace-Toip: %.*s\r\n" + "X-Siptrace-Time: %llu %llu\r\n" "X-Siptrace-Method: %.*s\r\n" "X-Siptrace-Dir: %s\r\n", sto->fromip.len, sto->fromip.s, sto->toip.len, sto->toip.s, + (unsigned long long)sto->tv.tv_sec, (unsigned long long)sto->tv.tv_usec, sto->method.len, sto->method.s, sto->dir); if (bytes_written >= XHEADERS_BUFSIZE) { @@ -594,12 +596,15 @@ static int sip_trace_xheaders_read(struct _siptrace_data *sto) } // Parse the x-headers: scanf() + long long unsigned int tv_sec, tv_usec; if (sscanf(xheaders, "\r\n" "X-Siptrace-Fromip: %50s\r\n" "X-Siptrace-Toip: %50s\r\n" + "X-Siptrace-Time: %llu %llu\r\n" "X-Siptrace-Method: %50s\r\n" "X-Siptrace-Dir: %3s", sto->fromip.s, sto->toip.s, + &tv_sec, &tv_usec, sto->method.s, sto->dir) == EOF) { LM_ERR("sip_trace_xheaders_read: malformed x-headers\n"); @@ -607,6 +612,8 @@ static int sip_trace_xheaders_read(struct _siptrace_data *sto) } sto->fromip.len = strlen(sto->fromip.s); sto->toip.len = strlen(sto->toip.s); + sto->tv.tv_sec = (time_t)tv_sec; + sto->tv.tv_usec = (suseconds_t)tv_usec; sto->method.len = strlen(sto->method.s); // Remove the x-headers: the message body is shifted towards the beginning

1 0

git:master: modules_k/siptrace: Add "x-headers" feature
by Daniel-Constantin Mierla 13 Aug '11

13 Aug '11

Module: sip-router Branch: master Commit: 48ebf54389b103904c3f6f46cd2d652d3d632588 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=48ebf54… Author: Tristan Bruns <bruns(a)decoit.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 5 09:24:14 2011 +0200 modules_k/siptrace: Add "x-headers" feature The "x-headers" feature stores the fromip, toip, method and direction in the message body (using X-* headers). This allows to transmit them using duplicate_uri from one kamailio to an other. Signed-off-by: Tristan Bruns <bruns(a)decoit.de> Signed-off-by: Daniel-Constantin Mierla <miconda(a)gmail.com> --- modules_k/siptrace/doc/siptrace_admin.xml | 60 ++++++++++ modules_k/siptrace/siptrace.c | 175 ++++++++++++++++++++++++++++- 2 files changed, 234 insertions(+), 1 deletions(-) diff --git a/modules_k/siptrace/doc/siptrace_admin.xml b/modules_k/siptrace/doc/siptrace_admin.xml index cbca2e6..3924f1e 100644 --- a/modules_k/siptrace/doc/siptrace_admin.xml +++ b/modules_k/siptrace/doc/siptrace_admin.xml @@ -305,6 +305,66 @@ modparam("siptrace", "trace_sl_acks", 0) </programlisting> </example> </section> + <section> + <title><varname>xheaders_write</varname> (integer)</title> + <para> + Parameter to enable/disable writing of x-headers. + </para> + <para> + Stores fromip, toip, method and direction in X-Siptrace-* headers. + This allows to transmit them to a second kamailio server + using the duplicate_uri feature. + Because the headers are added after the data is written to the database, + the headers only show up in the packets sent by duplicate_uri. + </para> + <para> + See <varname>xheaders_read</varname>, it should be used on the receiving + side. + </para> + <para> + Note: The headers are first read, then written. This allows to relay + the information over more then two kamailio servers by setting both + <varname>xheaders_write</varname> and <varname>xheaders_read</varname> + to "1" on the servers in the middle. + </para> + <para> + <emphasis> + Default value is "0". + </emphasis> + </para> + <example> + <title>Set <varname>xheaders_write</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("siptrace", "xheaders_write", 0) +... +</programlisting> + </example> + </section> + <section> + <title><varname>xheaders_read</varname> (integer)</title> + <para> + Parameter to enable/disable reading of x-headers. + </para> + <para> + Reads and removes the X-Siptrace-* headers. Packets not containing the + headers are neither stored to the database nor relayed (duplicate_uri). + See <varname>xheaders_write</varname> for further information. + </para> + <para> + <emphasis> + Default value is "0". + </emphasis> + </para> + <example> + <title>Set <varname>xheaders_read</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("siptrace", "xheaders_read", 0) +... +</programlisting> + </example> + </section> </section> <section> diff --git a/modules_k/siptrace/siptrace.c b/modules_k/siptrace/siptrace.c index c970002..939f290 100644 --- a/modules_k/siptrace/siptrace.c +++ b/modules_k/siptrace/siptrace.c @@ -113,18 +113,26 @@ static str direction_column = str_init("direction"); /* 09 */ #define NR_KEYS 10 +#define XHEADERS_BUFSIZE 512 + int trace_flag = -1; int trace_on = 0; int trace_sl_acks = 1; int trace_to_database = 1; +int xheaders_write = 0; +int xheaders_read = 0; + str dup_uri_str = {0, 0}; struct sip_uri *dup_uri = 0; int *trace_on_flag = NULL; int *trace_to_database_flag = NULL; +int *xheaders_write_flag = NULL; +int *xheaders_read_flag = NULL; + static unsigned short traced_user_avp_type = 0; static int_str traced_user_avp; static str traced_user_avp_str = {NULL, 0}; @@ -172,6 +180,8 @@ static param_export_t params[] = { {"trace_to_database", INT_PARAM, &trace_to_database }, {"trace_local_ip", STR_PARAM, &trace_local_ip.s }, {"trace_sl_acks", INT_PARAM, &trace_sl_acks }, + {"xheaders_write", INT_PARAM, &xheaders_write }, + {"xheaders_read", INT_PARAM, &xheaders_read }, {0, 0, 0} }; @@ -294,6 +304,15 @@ static int mod_init(void) *trace_to_database_flag = trace_to_database; + xheaders_write_flag = (int*)shm_malloc(sizeof(int)); + xheaders_read_flag = (int*)shm_malloc(sizeof(int)); + if (!(xheaders_write_flag && xheaders_read_flag)) { + LM_ERR("no more shm memory left\n"); + return -1; + } + *xheaders_write_flag = xheaders_write; + *xheaders_read_flag = xheaders_read; + /* register callbacks to TM */ if (load_tm_api(&tmb)!=0) { @@ -474,6 +493,153 @@ error: return -1; } +// Appends x-headers to the message in sto->body containing data from sto +static int sip_trace_xheaders_write(struct _siptrace_data *sto) +{ + if(xheaders_write_flag==NULL || *xheaders_write_flag==0) + return 0; + + // Memory for the message with some additional headers. + // It gets free()ed in sip_trace_xheaders_free(). + char* buf = malloc(sto->body.len + XHEADERS_BUFSIZE); + if (buf == NULL) { + LM_ERR("sip_trace_xheaders_write: out of memory\n"); + return -1; + } + + // Copy the whole message to buf first; it must be \0-terminated for + // strstr() to work. Then search for the end-of-header sequence. + memcpy(buf, sto->body.s, sto->body.len); + buf[sto->body.len] = '\0'; + char* eoh = strstr(buf, "\r\n\r\n"); + if (eoh == NULL) { + LM_ERR("sip_trace_xheaders_write: malformed message\n"); + return -1; + } + eoh += 2; // the first \r\n belongs to the last header => skip it + + // Write the new headers a the end-of-header position. This overwrites + // the \r\n terminating the old headers and the beginning of the message + // body. Both will be recovered later. + int bytes_written = snprintf(eoh, XHEADERS_BUFSIZE, + "X-Siptrace-Fromip: %.*s\r\n" + "X-Siptrace-Toip: %.*s\r\n" + "X-Siptrace-Method: %.*s\r\n" + "X-Siptrace-Dir: %s\r\n", + sto->fromip.len, sto->fromip.s, + sto->toip.len, sto->toip.s, + sto->method.len, sto->method.s, + sto->dir); + if (bytes_written >= XHEADERS_BUFSIZE) { + LM_ERR("sip_trace_xheaders_write: string too long\n"); + return -1; + } + + // Copy the \r\n terminating the old headers and the message body from the + // old buffer in sto->body.s to the new end-of-header in buf. + int eoh_offset = eoh - buf; + char* new_eoh = eoh + bytes_written; + memcpy(new_eoh, sto->body.s + eoh_offset, sto->body.len - eoh_offset); + + // Change sto to point to the new buffer. + sto->body.s = buf; + sto->body.len += bytes_written; + return 0; +} + +// Parses x-headers, saves the data back to sto, and removes the x-headers +// from the message in sto->buf +static int sip_trace_xheaders_read(struct _siptrace_data *sto) +{ + if(xheaders_read_flag==NULL || *xheaders_read_flag==0) + return 0; + + // Find the end-of-header marker \r\n\r\n + char* searchend = sto->body.s + sto->body.len - 3; + char* eoh = memchr(sto->body.s, '\r', searchend - eoh); + while (eoh != NULL && eoh < searchend) { + if (memcmp(eoh, "\r\n\r\n", 4) == 0) + break; + eoh = memchr(eoh + 1, '\r', searchend - eoh); + } + if (eoh == NULL) { + LM_ERR("sip_trace_xheaders_read: malformed message\n"); + return -1; + } + + // Find x-headers: eoh will be overwritten by \0 to allow the use of + // strstr(). The byte at eoh will later be recovered, when the + // message body is shifted towards the beginning of the message + // to remove the x-headers. + *eoh = '\0'; + char* xheaders = strstr(sto->body.s, "\r\nX-Siptrace-Fromip: "); + if (xheaders == NULL) { + LM_ERR("sip_trace_xheaders_read: message without x-headers " + "from %.*s, callid %.*s\n", + sto->fromip.len, sto->fromip.s, sto->callid.len, sto->callid.s); + return -1; + } + + // Allocate memory for new strings in sto + // (gets free()ed in sip_trace_xheaders_free() ) + sto->fromip.s = malloc(51); + sto->toip.s = malloc(51); + sto->method.s = malloc(51); + sto->dir = malloc(4); + if (!(sto->fromip.s && sto->toip.s && sto->method.s && sto->dir)) { + LM_ERR("sip_trace_xheaders_read: out of memory\n"); + goto erroraftermalloc; + } + + // Parse the x-headers: scanf() + if (sscanf(xheaders, "\r\n" + "X-Siptrace-Fromip: %50s\r\n" + "X-Siptrace-Toip: %50s\r\n" + "X-Siptrace-Method: %50s\r\n" + "X-Siptrace-Dir: %3s", + sto->fromip.s, sto->toip.s, + sto->method.s, + sto->dir) == EOF) { + LM_ERR("sip_trace_xheaders_read: malformed x-headers\n"); + goto erroraftermalloc; + } + sto->fromip.len = strlen(sto->fromip.s); + sto->toip.len = strlen(sto->toip.s); + sto->method.len = strlen(sto->method.s); + + // Remove the x-headers: the message body is shifted towards the beginning + // of the message, overwriting the x-headers. Before that, the byte at eoh + // is recovered. + *eoh = '\r'; + memmove(xheaders, eoh, sto->body.len - (eoh - sto->body.s)); + sto->body.len -= eoh - xheaders; + + return 0; + +erroraftermalloc: + if (sto->fromip.s) free(sto->fromip.s); + if (sto->toip.s) free(sto->toip.s); + if (sto->method.s) free(sto->method.s); + if (sto->dir) free(sto->dir); + return -1; +} + +// Frees the memory allocated by sip_trace_xheaders_{write,read} +static int sip_trace_xheaders_free(struct _siptrace_data *sto) +{ + if (xheaders_write_flag != NULL && *xheaders_write_flag != 0) { + free(sto->body.s); + } + + if (xheaders_read_flag != NULL && *xheaders_read_flag != 0) { + free(sto->fromip.s); + free(sto->toip.s); + free(sto->dir); + } + + return 0; +} + static int sip_trace_store(struct _siptrace_data *sto) { if(sto==NULL) @@ -482,8 +648,15 @@ static int sip_trace_store(struct _siptrace_data *sto) return -1; } + if (sip_trace_xheaders_read(sto) != 0) return -1; + int ret = sip_trace_store_db(sto); + + if (sip_trace_xheaders_write(sto) != 0) return -1; trace_send_duplicate(sto->body.s, sto->body.len); - return sip_trace_store_db(sto); + + if (sip_trace_xheaders_free(sto) != 0) return -1; + + return ret; } static int sip_trace_store_db(struct _siptrace_data *sto)

1 0

git:master: modules_k/siptrace: separately store to db and/ or send duplicate
by Daniel-Constantin Mierla 13 Aug '11

13 Aug '11

Module: sip-router Branch: master Commit: 5894713429c86be0fdadc05b6982fa0571771cc6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5894713… Author: Tristan Bruns <bruns(a)decoit.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Aug 3 12:28:45 2011 +0200 modules_k/siptrace: separately store to db and/or send duplicate Signed-off-by: Tristan Bruns <bruns(a)decoit.de> Signed-off-by: Daniel-Constantin Mierla <miconda(a)gmail.com> --- modules_k/siptrace/siptrace.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/modules_k/siptrace/siptrace.c b/modules_k/siptrace/siptrace.c index d0d1789..68fd44c 100644 --- a/modules_k/siptrace/siptrace.c +++ b/modules_k/siptrace/siptrace.c @@ -86,6 +86,7 @@ static int child_init(int rank); static void destroy(void); static int sip_trace(struct sip_msg*, char*, char*); +static int sip_trace_store_db(struct _siptrace_data* sto); static int trace_send_duplicate(char *buf, int len); static void trace_onreq_in(struct cell* t, int type, struct tmcb_params *ps); @@ -463,14 +464,20 @@ error: static int sip_trace_store(struct _siptrace_data *sto) { - db_key_t db_keys[NR_KEYS]; - db_val_t db_vals[NR_KEYS]; - if(sto==NULL) { LM_DBG("invalid parameter\n"); return -1; } + + trace_send_duplicate(sto->body.s, sto->body.len); + return sip_trace_store_db(sto); +} + +static int sip_trace_store_db(struct _siptrace_data *sto) +{ + db_key_t db_keys[NR_KEYS]; + db_val_t db_vals[NR_KEYS]; db_keys[0] = &msg_column; db_vals[0].type = DB1_BLOB; @@ -540,9 +547,6 @@ static int sip_trace_store(struct _siptrace_data *sto) if(sto->avp==NULL) goto done; - trace_send_duplicate(db_vals[0].val.blob_val.s, - db_vals[0].val.blob_val.len); - db_vals[9].val.str_val = sto->avp_value.s; LM_DBG("storing info...\n");

1 0

git:master: modules_k/siptrace: Add trace_to_database configuration parameter
by Daniel-Constantin Mierla 13 Aug '11

13 Aug '11

Module: sip-router Branch: master Commit: 0314f73b8dde0b49f213abe5fea4495c6985bc31 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0314f73… Author: Tristan Bruns <bruns(a)decoit.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Aug 3 12:29:24 2011 +0200 modules_k/siptrace: Add trace_to_database configuration parameter Adding configuration parameter to disable writing to the database. We can use this to only duplicate the SIP messages without storing them in our database. Signed-off-by: Tristan Bruns <bruns(a)decoit.de> Signed-off-by: Daniel-Constantin Mierla <miconda(a)gmail.com> --- modules_k/siptrace/doc/siptrace_admin.xml | 25 +++++++++++++++++++++++++ modules_k/siptrace/siptrace.c | 15 +++++++++++++++ 2 files changed, 40 insertions(+), 0 deletions(-) diff --git a/modules_k/siptrace/doc/siptrace_admin.xml b/modules_k/siptrace/doc/siptrace_admin.xml index c02ec57..cbca2e6 100644 --- a/modules_k/siptrace/doc/siptrace_admin.xml +++ b/modules_k/siptrace/doc/siptrace_admin.xml @@ -233,6 +233,31 @@ modparam("siptrace", "duplicate_uri", "sip:10.1.1.1:5888") </example> </section> <section> + <title><varname>trace_to_database</varname> (integer)</title> + <para> + Parameter to enable/disable inserts to the Database from this + Kamailio. + </para> + <para> + In case we only want to send the SIP-Messages to the + duplicate_uri and not store the information to the local + database we can set this to "0". + </para> + <para> + <emphasis> + Default value is "1". + </emphasis> + </para> + <example> + <title>Set <varname>trace_to_database</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("siptrace", "trace_to_database", 0) +... +</programlisting> + </example> + </section> + <section> <title><varname>trace_local_ip</varname> (str)</title> <para> The address to be used in fromip field for local generated diff --git a/modules_k/siptrace/siptrace.c b/modules_k/siptrace/siptrace.c index 68fd44c..c970002 100644 --- a/modules_k/siptrace/siptrace.c +++ b/modules_k/siptrace/siptrace.c @@ -117,10 +117,13 @@ int trace_flag = -1; int trace_on = 0; int trace_sl_acks = 1; +int trace_to_database = 1; + str dup_uri_str = {0, 0}; struct sip_uri *dup_uri = 0; int *trace_on_flag = NULL; +int *trace_to_database_flag = NULL; static unsigned short traced_user_avp_type = 0; static int_str traced_user_avp; @@ -166,6 +169,7 @@ static param_export_t params[] = { {"traced_user_avp", STR_PARAM, &traced_user_avp_str.s}, {"trace_table_avp", STR_PARAM, &trace_table_avp_str.s}, {"duplicate_uri", STR_PARAM, &dup_uri_str.s }, + {"trace_to_database", INT_PARAM, &trace_to_database }, {"trace_local_ip", STR_PARAM, &trace_local_ip.s }, {"trace_sl_acks", INT_PARAM, &trace_sl_acks }, {0, 0, 0} @@ -282,6 +286,14 @@ static int mod_init(void) *trace_on_flag = trace_on; + trace_to_database_flag = (int*)shm_malloc(sizeof(int)); + if(trace_to_database_flag==NULL) { + LM_ERR("no more shm memory left\n"); + return -1; + } + + *trace_to_database_flag = trace_to_database; + /* register callbacks to TM */ if (load_tm_api(&tmb)!=0) { @@ -476,6 +488,9 @@ static int sip_trace_store(struct _siptrace_data *sto) static int sip_trace_store_db(struct _siptrace_data *sto) { + if(trace_to_database_flag==NULL || *trace_to_database_flag==0) + goto done; + db_key_t db_keys[NR_KEYS]; db_val_t db_vals[NR_KEYS];

1 0

git:master: pua_xmpp: fixes to SIP-XMPP presence status translations
by Daniel-Constantin Mierla 12 Aug '11

12 Aug '11

Module: sip-router Branch: master Commit: d1097d6ac9295c529ad6e682534ee4b3f0a9daae URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d1097d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 12 22:51:20 2011 +0200 pua_xmpp: fixes to SIP-XMPP presence status translations * patch by Laura Testi to fix: - the online/offline status is ok in both direction (SIP<-->XMPP) - other status (away/busy) is not ok from XMPP to SIP - busy status is not ok from SIP to XMPP - each time XMPP contact change the status, triger a new SUBSCRIBE in xmpp gateway which generate multiple same subscriptions with different callid in both active_watchers and pua tables. This also makes multiple NOTIFY generation from the main Presence Server to GW when the SIP contact change it's status --- modules_k/pua_xmpp/simple2xmpp.c | 15 +++++++++---- modules_k/pua_xmpp/xmpp2simple.c | 42 +++++++++++-------------------------- 2 files changed, 23 insertions(+), 34 deletions(-) diff --git a/modules_k/pua_xmpp/simple2xmpp.c b/modules_k/pua_xmpp/simple2xmpp.c index 040d36c..e041bcb 100644 --- a/modules_k/pua_xmpp/simple2xmpp.c +++ b/modules_k/pua_xmpp/simple2xmpp.c @@ -87,7 +87,7 @@ int Notify2Xmpp(struct sip_msg* msg, char* s1, char* s2) if(msg->to->parsed != NULL) { pto = (struct to_body*)msg->to->parsed; - LM_ERR("'To' header ALREADY PARSED:<%.*s>\n",pto->uri.len,pto->uri.s); + LM_DBG("'To' header ALREADY PARSED:<%.*s>\n",pto->uri.len,pto->uri.s); } else { @@ -415,7 +415,8 @@ int build_xmpp_content(str* to_uri, str* from_uri, str* body, str* id, goto error; } - if(xmlStrcasecmp((unsigned char*)note, (unsigned char*)"away")== 0) + if((xmlStrcasecmp((unsigned char*)note, (unsigned char*)"away")== 0)|| + (xmlStrcasecmp((unsigned char*)note, (unsigned char*)"On the phone")== 0)) { new_node = xmlNewChild(xmpp_root, NULL, BAD_CAST "show", BAD_CAST "away"); @@ -456,12 +457,14 @@ int build_xmpp_content(str* to_uri, str* from_uri, str* body, str* id, LM_ERR("while adding node: idle\n"); goto error; } - } - else */ + }*/ + else if((xmlStrcasecmp((unsigned char*)note, (unsigned char*)"dnd")== 0)|| (xmlStrcasecmp((unsigned char*)note, - (unsigned char*)"do not disturb")== 0)) + (unsigned char*)"do not disturb")== 0)|| + (xmlStrcasecmp((unsigned char*)note, + (unsigned char*)"Busy (DND)")== 0)) { new_node = xmlNewChild(xmpp_root, NULL, BAD_CAST "show", BAD_CAST "dnd"); @@ -471,6 +474,8 @@ int build_xmpp_content(str* to_uri, str* from_uri, str* body, str* id, goto error; } } + else + LM_DBG("Not Found Status\n"); /* adding status node */ diff --git a/modules_k/pua_xmpp/xmpp2simple.c b/modules_k/pua_xmpp/xmpp2simple.c index 43fa9a0..d0bdc1e 100644 --- a/modules_k/pua_xmpp/xmpp2simple.c +++ b/modules_k/pua_xmpp/xmpp2simple.c @@ -76,13 +76,13 @@ void pres_Xmpp2Sip(char *msg, int type, void *param) { LM_DBG("type attribut not present\n"); build_publish(pres_node, -1); - if(presence_subscribe(pres_node, 3600, XMPP_SUBSCRIBE)< 0) + /* if(presence_subscribe(pres_node, 3600, XMPP_SUBSCRIBE)< 0) { LM_ERR("when sending subscribe for presence"); xmlFree(pres_type); goto error; } - + */ /* send subscribe after publish because in xmpp subscribe message * comes only when a new contact is inserted in buddy list */ @@ -91,13 +91,13 @@ void pres_Xmpp2Sip(char *msg, int type, void *param) if(strcmp(pres_type, "unavailable")== 0) { build_publish(pres_node, 0); - if(presence_subscribe(pres_node, 3600, XMPP_SUBSCRIBE)< 0) - /* else subscribe for one hour*/ + /* if(presence_subscribe(pres_node, 0, XMPP_SUBSCRIBE)< 0) { LM_ERR("when unsubscribing for presence"); xmlFree(pres_type); goto error; } + */ } else @@ -243,13 +243,13 @@ str* build_pidf(xmlNodePtr pres_node, char* uri, char* resource) if(show_cont) { if(strcmp(show_cont, "xa")== 0) - status= "not available"; + status= "Away"; else if(strcmp(show_cont, "chat")== 0) - status= "free for chat"; + status= "Online"; else if(strcmp(show_cont, "dnd")== 0) - status= "do not disturb"; + status= "Busy (DND)"; else status= show_cont; } @@ -264,24 +264,25 @@ str* build_pidf(xmlNodePtr pres_node, char* uri, char* resource) goto error; } */ - node = xmlNewChild(root_node, NULL, BAD_CAST "note", - BAD_CAST status_cont); + node = xmlNewChild(tuple_node, NULL, BAD_CAST "note", + BAD_CAST status); if(node== NULL) { LM_ERR("while adding node\n"); goto error; } - }else + } else { if(show_cont) { - node = xmlNewChild(root_node, NULL, BAD_CAST "note", + node = xmlNewChild(tuple_node, NULL, BAD_CAST "note", BAD_CAST status); if(node== NULL) { LM_ERR("while adding node\n"); goto error; } - } + } + } if(show_cont) { @@ -295,23 +296,6 @@ str* build_pidf(xmlNodePtr pres_node, char* uri, char* resource) goto error; } } - node= xmlNewChild(person_node, NULL, BAD_CAST "activities", - BAD_CAST 0); - if(node== NULL) - { - LM_ERR("while adding node\n"); - goto error; - } - - - if( xmlNewChild(person_node, NULL, BAD_CAST "note", - BAD_CAST status )== NULL) - { - LM_ERR("while adding node\n"); - goto error; - } - - }

1 0

[tracker] Task closed: Received replies should get higher preference than locally generated ones
by sip-router 12 Aug '11

12 Aug '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#54 - Received replies should get higher preference than locally generated ones User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Implemented Additional comments about closing: Commit 6b2d6a3, which introduced a module parameter that allows to lower the priority of faked replies. More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=54 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

git:master: Merge branch 'pd/pua_fix'
by Peter Dunkley 12 Aug '11

12 Aug '11

Module: sip-router Branch: master Commit: f2086ceaf8753e75a2642bba330e54b586b9fb7c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f2086ce… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Fri Aug 12 17:28:16 2011 +0100 Merge branch 'pd/pua_fix' * pd/pua_fix: modules/tm, modules_k/pua: Fix for concurrency issue in PUA module ---

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
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 August 2011