sr-dev February 2012

sr-dev@lists.kamailio.org

24 participants
116 discussions

git:master: Proper parsing for PVs
by Ovidiu Sas 08 Feb '12

08 Feb '12

Module: sip-router Branch: master Commit: 8b9a98e8a8205b2214bf3503afea8aece20e2396 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8b9a98e… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Tue Feb 7 19:12:36 2012 -0500 Proper parsing for PVs Closes FS#202 - sr.pv.get fails for retrieving index header variable in Lua --- pvapi.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --… [View More]

1 0

[tracker] Comment added: Crash in presence_reginfo/presence.so
by sip-router 07 Feb '12

07 Feb '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#203 - Crash in presence_reginfo/presence.so User who did this - Carsten Bock (carstenbock) ---------- Strange: In my config i have: ####### Modules Section ######## # set paths to location of modules mpath="/usr/lib64/kamailio/modules_k/:/usr/lib64/kamailio/modules/" loadmodule "presence_reginfo.so" loadmodule "presence.so" And as a result, my Kamailio does not start: Feb 7 10:56:04 proxy1 /usr/sbin/… [View More]

1 0

[tracker] Comment added: Crash in presence_reginfo/presence.so
by sip-router 07 Feb '12

07 Feb '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#203 - Crash in presence_reginfo/presence.so User who did this - Carsten Bock (carstenbock) ---------- I will improve the module. That explains, why i couldn't reproduce it on my birthday.... :-) ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=203#comment496 You are receiving this message because you have requested it from … [View More]

1 0

[tracker] Comment added: Crash in presence_reginfo/presence.so
by sip-router 06 Feb '12

06 Feb '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#203 - Crash in presence_reginfo/presence.so User who did this - Olle Johansson (oej) ---------- I loaded presence_reginfo before presence. If I move the order, it doesn't core. So presence_reginfo should probably check for the presence module being loaded before using it ;-) ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=… [View More]

1 0

[tracker] User took ownership: Crash in presence_reginfo/presence.so
by sip-router 06 Feb '12

06 Feb '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Carsten Bock has taken ownership of the following task: FS#203 - Crash in presence_reginfo/presence.so More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=203 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

[tracker] Task opened: Crash in presence_reginfo/presence.so
by sip-router 05 Feb '12

05 Feb '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Olle Johansson (oej) Attached to Project - sip-router Summary - Crash in presence_reginfo/presence.so Task Type - Bug Report Category - Module Status - Unconfirmed Assigned To - Operating System - FreeBSD Severity - High Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Version 3.2.2 (doesn't exist in "Reported … [View More]

1 0

[tracker] Task opened: sr.pv.get fails for retrieving index header variable in Lua
by sip-router 05 Feb '12

05 Feb '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - C. Austin (vulpyne) Attached to Project - sip-router Summary - sr.pv.get fails for retrieving index header variable in Lua Task Type - Bug Report Category - Module Status - Unconfirmed Assigned To - Operating System - All Severity - Medium Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - For example: $(hdr(Remote-… [View More]

1 0

[tracker] Task opened: support for parsing URNs (Attachment added)
by sip-router 03 Feb '12

03 Feb '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Wolfgang Kampichler (wkampich) Attached to Project - sip-router Summary - support for parsing URNs Task Type - Improvement Category - Core Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - All Severity - Medium Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - The patch provides correct … [View More]

2 1

git:master: modules_k:siptrace fixed function pipport2su. ( error if url doesn't have port)
by Alexandr Dubovikov 03 Feb '12

03 Feb '12

Module: sip-router Branch: master Commit: 830544e5b349bf808fb0f1ac12cf08610181c64d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=830544e… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Fri Feb 3 16:12:38 2012 +0100 modules_k:siptrace fixed function pipport2su. (error if url doesn't have port) Thanks David Kovarik for report. --- modules_k/siptrace/siptrace.c | … [View More]54 +++++++++++++++++++++++----------------- 1 files changed, 31 insertions(+), 23 deletions(-) diff --git a/modules_k/siptrace/siptrace.c b/modules_k/siptrace/siptrace.c index d85b4aa..2c2dc01 100644 --- a/modules_k/siptrace/siptrace.c +++ b/modules_k/siptrace/siptrace.c @@ -1648,6 +1648,7 @@ static int pipport2su (char *pipport, union sockaddr_union *tmp_su, unsigned int char *p, *host_s; str port_str, host_uri; unsigned len = 0; + char tmp_piport[256]; /*parse protocol */ if(strncmp(pipport, "udp:",4) == 0) *proto = IPPROTO_UDP; @@ -1661,42 +1662,49 @@ static int pipport2su (char *pipport, union sockaddr_union *tmp_su, unsigned int LM_ERR("bad protocol %s\n", pipport); return -1; } + + if((len = strlen(pipport)) > 256) { + LM_ERR("too big pipport\n"); + goto error; + } + + /* our tmp string */ + strncpy(tmp_piport, pipport, len); + + len = 0; /*separate proto and host */ - p = pipport+cutlen; + p = tmp_piport+cutlen; if( (*(p)) == '\0') { LM_ERR("malformed ip address\n"); - return -1; + goto error; } host_s=p; if( (p = strrchr(p+1, ':')) == 0 ) { - LM_ERR("no port specified\n"); - return -1; - } - /*the address contains a port number*/ - *p = '\0'; - p++; - port_str.s = p; - port_str.len = strlen(p); - LM_DBG("the port string is %s\n", p); - if(str2int(&port_str, &port_no) != 0 ) { - LM_ERR("there is not a valid number port\n"); - return -1; - } - *p = '\0'; - if (port_no<1024 || port_no>65536) - { - LM_ERR("invalid port number; must be in [1024,65536]\n"); - return -1; + LM_DBG("no port specified\n"); + port_no = 0; } - + else { + /*the address contains a port number*/ + *p = '\0'; + p++; + port_str.s = p; + port_str.len = strlen(p); + LM_DBG("the port string is %s\n", p); + if(str2int(&port_str, &port_no) != 0 ) { + LM_ERR("there is not a valid number port\n"); + goto error; + } + *p = '\0'; + } + /* now IPv6 address has no brakets. It should be fixed! */ if (host_s[0] == '[') { len = strlen(host_s + 1) - 1; if(host_s[len+1] != ']') { LM_ERR("bracket not closed\n"); - return -1; + goto error; } memmove(host_s, host_s + 1, len); host_s[len] = '\0'; @@ -1705,7 +1713,6 @@ static int pipport2su (char *pipport, union sockaddr_union *tmp_su, unsigned int host_uri.s = host_s; host_uri.len = strlen(host_s); - /* check if it's an ip address */ if (((ip=str2ip(&host_uri))!=0) #ifdef USE_IPV6 @@ -1717,5 +1724,6 @@ static int pipport2su (char *pipport, union sockaddr_union *tmp_su, unsigned int } +error: return -1; } [View Less]

1 0

git:master: modules:siptrace added HEPv2 protocol.
by Alexandr Dubovikov 03 Feb '12

03 Feb '12

Module: sip-router Branch: master Commit: dd7028a192333f313e7a4c4f84376c15ee65955a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dd7028a… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Fri Feb 3 15:37:07 2012 +0100 modules:siptrace added HEPv2 protocol. --- modules_k/siptrace/README | 37 ++++++++++++++++++++++- modules_k/siptrace/doc/… [View More]siptrace_admin.xml | 46 +++++++++++++++++++++++++++++ modules_k/siptrace/siptrace.c | 33 +++++++++++++++++++- 3 files changed, 112 insertions(+), 4 deletions(-) diff --git a/modules_k/siptrace/README b/modules_k/siptrace/README index 3baa6ae..7934f24 100644 --- a/modules_k/siptrace/README +++ b/modules_k/siptrace/README @@ -46,6 +46,8 @@ Daniel-Constantin Mierla 3.11. xheaders_write (integer) 3.12. xheaders_read (integer) 3.13. hep_mode_on (integer) + 3.14. hep_version (integer) + 3.15. hep_capture_id (integer) 4. Functions @@ -73,7 +75,9 @@ Daniel-Constantin Mierla 1.11. Set xheaders_write parameter 1.12. Set xheaders_read parameter 1.13. Set hep_mode_on parameter - 1.14. sip_trace() usage + 1.14. Set hep_version parameter + 1.15. Set hep_capture_id parameter + 1.16. sip_trace() usage Chapter 1. Admin Guide @@ -100,6 +104,8 @@ Chapter 1. Admin Guide 3.11. xheaders_write (integer) 3.12. xheaders_read (integer) 3.13. hep_mode_on (integer) + 3.14. hep_version (integer) + 3.15. hep_capture_id (integer) 4. Functions @@ -166,6 +172,8 @@ Chapter 1. Admin Guide 3.11. xheaders_write (integer) 3.12. xheaders_read (integer) 3.13. hep_mode_on (integer) + 3.14. hep_version (integer) + 3.15. hep_capture_id (integer) 3.1. db_url (str) @@ -347,6 +355,31 @@ modparam("siptrace", "xheaders_read", 0) modparam("siptrace", "hep_mode_on", 1) ... +3.14. hep_version (integer) + + The parameter indicate the version of HEP protocol. Can be 1 or 2. In + HEPv2 the timestamp and capture agent ID will be included to HEP + header. + + Default value is "1". + + Example 1.14. Set hep_version parameter +... +modparam("siptrace", "hep_version", 2) +... + +3.15. hep_capture_id (integer) + + The parameter indicate the capture agent ID for HEPv2 protocol. + Limitation: 16-bit integer. + + Default value is "1". + + Example 1.15. Set hep_capture_id parameter +... +modparam("siptrace", "hep_capture_id", 234) +... + 4. Functions 4.1. sip_trace() @@ -359,7 +392,7 @@ modparam("siptrace", "hep_mode_on", 1) This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE. - Example 1.14. sip_trace() usage + Example 1.16. sip_trace() usage ... sip_trace(); ... diff --git a/modules_k/siptrace/doc/siptrace_admin.xml b/modules_k/siptrace/doc/siptrace_admin.xml index 6f452d6..e6492e0 100644 --- a/modules_k/siptrace/doc/siptrace_admin.xml +++ b/modules_k/siptrace/doc/siptrace_admin.xml @@ -386,6 +386,52 @@ modparam("siptrace", "hep_mode_on", 1) </programlisting> </example> </section> + + <section> + <title><varname>hep_version</varname> (integer)</title> + <para> + The parameter indicate the version of HEP protocol. + Can be 1 or 2. In HEPv2 the timestamp and capture agent ID + will + be included to HEP header. + </para> + <para> + <emphasis> + Default value is "1". + </emphasis> + </para> + <example> + <title>Set <varname>hep_version</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("siptrace", "hep_version", 2) +... +</programlisting> + </example> + </section> + <section> + <title><varname>hep_capture_id</varname> (integer)</title> + <para> + The parameter indicate the capture agent ID for HEPv2 + protocol. + Limitation: 16-bit integer. + </para> + <para> + <emphasis> + Default value is "1". + </emphasis> + </para> + <example> + <title>Set <varname>hep_capture_id</varname> + parameter</title> + <programlisting format="linespecific"> +... +modparam("siptrace", "hep_capture_id", 234) +... +</programlisting> + </example> + </section> + </section> <section> diff --git a/modules_k/siptrace/siptrace.c b/modules_k/siptrace/siptrace.c index d845ae8..d85b4aa 100644 --- a/modules_k/siptrace/siptrace.c +++ b/modules_k/siptrace/siptrace.c @@ -129,6 +129,9 @@ int trace_sl_acks = 1; int trace_to_database = 1; +int hep_version = 1; +int hep_capture_id = 1; + int xheaders_write = 0; int xheaders_read = 0; @@ -193,6 +196,8 @@ static param_export_t params[] = { {"xheaders_write", INT_PARAM, &xheaders_write }, {"xheaders_read", INT_PARAM, &xheaders_read }, {"hep_mode_on", INT_PARAM, &hep_mode_on }, + {"hep_version", INT_PARAM, &hep_version }, + {"hep_capture_id", INT_PARAM, &hep_capture_id }, {0, 0, 0} }; @@ -309,6 +314,13 @@ static int mod_init(void) } } + if(hep_version != 1 && hep_version != 2) { + + LM_ERR("unsupported version of HEP"); + return -1; + } + + trace_on_flag = (int*)shm_malloc(sizeof(int)); if(trace_on_flag==NULL) { LM_ERR("no more shm memory left\n"); @@ -1458,6 +1470,10 @@ static int trace_send_hep_duplicate(str *body, str *from, str *to) unsigned int len, buflen, proto; struct hep_hdr hdr; struct hep_iphdr hep_ipheader; + struct hep_timehdr hep_time; + struct timeval tvb; + struct timezone tz; + #if USE_IPV6 struct hep_ip6hdr hep_ip6header; #endif @@ -1469,6 +1485,9 @@ static int trace_send_hep_duplicate(str *body, str *from, str *to) return 0; + gettimeofday( &tvb, &tz ); + + /* message length */ len = body->len #if USE_IPV6 @@ -1476,7 +1495,7 @@ static int trace_send_hep_duplicate(str *body, str *from, str *to) #else + sizeof(struct hep_iphdr) #endif - + sizeof(struct hep_hdr); + + sizeof(struct hep_hdr) + sizeof(struct hep_timehdr);; /* The packet is too big for us */ @@ -1517,7 +1536,7 @@ static int trace_send_hep_duplicate(str *body, str *from, str *to) /* Version && proto && length */ hdr.hp_l = sizeof(struct hep_hdr); - hdr.hp_v = 1; + hdr.hp_v = hep_version; hdr.hp_p = proto; /* AND the last */ @@ -1580,6 +1599,16 @@ static int trace_send_hep_duplicate(str *body, str *from, str *to) } #endif /* USE_IPV6 */ + if(hep_version == 2) { + + hep_time.tv_sec = tvb.tv_sec; + hep_time.tv_usec = tvb.tv_usec; + hep_time.captid = hep_capture_id; + + memcpy((void*)buffer+buflen, &hep_time, sizeof(struct hep_timehdr)); + buflen += sizeof(struct hep_timehdr); + } + /* PAYLOAD */ memcpy((void*)(buffer + buflen) , (void*)body->s, body->len); buflen +=body->len; [View Less]

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2012