sr-dev February 2011

sr-dev@lists.kamailio.org

22 participants
124 discussions

git:alfredh/stun: ser_stun: update to RFC 5389
by Alfred E. Heggestad 22 Feb '11

22 Feb '11

Module: sip-router Branch: alfredh/stun Commit: d88efbcc410e5bdc16eb0df69d93fe16adf6b9e4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d88efbc… Author: Alfred E. Heggestad <aeh(a)db.org> Committer: Alfred E. Heggestad <aeh(a)db.org> Date: Tue Feb 22 11:13:14 2011 +0100 ser_stun: update to RFC 5389 - Removing checking/adding of FINGERPRINT attibute - Update some attribute values according to new spec - Fix endianess of XOR-MAPPED-ADDRESS --- … [View More]ser_stun.c | 153 ++++-------------------------------------------------------- ser_stun.h | 9 +-- 2 files changed, 13 insertions(+), 149 deletions(-) diff --git a/ser_stun.c b/ser_stun.c index 6957a88..7eb2cf5 100644 --- a/ser_stun.c +++ b/ser_stun.c @@ -64,9 +64,7 @@ int stun_add_address_attr(struct stun_msg* res, int do_xor); int add_unknown_attr(struct stun_msg* res, struct stun_unknown_att* unknown); int add_error_code(struct stun_msg* res, USHORT_T error_code); -int add_fingerprint(struct stun_buffer* msg); int copy_str_to_buffer(struct stun_msg* res, const char* data, UINT_T pad); -int validate_fingerprint(struct stun_msg* req, USHORT_T* error_code); int reallock_buffer(struct stun_buffer* buffer, UINT_T len); int buf_copy(struct stun_buffer* msg, void* source, UINT_T len); void clean_memory(struct stun_msg* req, @@ -231,11 +229,9 @@ int stun_parse_body( struct stun_unknown_att* tmp_unknown; struct stun_unknown_att* body; char* buf; - int fp_present; attr_size = sizeof(struct stun_attr); buf = &req->msg.buf.s[sizeof(struct stun_hdr)]; - fp_present = 0; /* * Mark the body lenght as unparsed. @@ -286,7 +282,6 @@ int stun_parse_body( case MAPPED_ADDRESS_ATTR: case XOR_MAPPED_ADDRESS_ATTR: case ALTERNATE_SERVER_ATTR: - case REFRESH_INTERVAL_ATTR: case RESPONSE_ADDRESS_ATTR: case SOURCE_ADDRESS_ATTR: case REFLECTED_FROM_ATTR: @@ -300,10 +295,9 @@ int stun_parse_body( /* following attributes must be padded to 4 bytes */ case USERNAME_ATTR: - case PASSWORD_ATTR: case ERROR_CODE_ATTR: case UNKNOWN_ATTRIBUTES_ATTR: - case SERVER_ATTR: + case SOFTWARE_ATTR: padded_len = PADDED_TO_FOUR(ntohs(attr.len)); #ifdef EXTRA_DEBUG LOG(L_DBG, "DEBUG: stun_parse_body: padded to four\n"); @@ -322,25 +316,8 @@ int stun_parse_body( #ifdef EXTRA_DEBUG LOG(L_DBG, "DEBUG: stun_parse_body: fingerprint attribute found\n"); #endif - fp_present = 1; - if (ntohs(attr.len) != SHA_DIGEST_LENGTH) { - LOG(L_WARN, - "WARNING: STUN: Incorrect fingerprint of request.\n"); - *error_code = BAD_REQUEST_ERR; - continue; - } - - memcpy(req->fp, buf, SHA_DIGEST_LENGTH); - if(stun_allow_fp) { - if (validate_fingerprint(req, error_code) != 0) { - LOG(L_WARN, - "WARNING: STUN: Incorrect fingerprint of request.\n"); - *error_code = BAD_REQUEST_ERR; - continue; - } - } - padded_len = SHA_DIGEST_LENGTH; + if (not_parsed > SHA_DIGEST_LENGTH) { #ifdef EXTRA_DEBUG LOG(L_DBG, "DEBUG: stun_parse_body: fingerprint is not the last attribute\n"); @@ -396,14 +373,6 @@ int stun_parse_body( *error_code = UNKNOWN_ATTRIBUTE_ERR; } - if (fp_present == 0 && req->old == 0) { -#ifdef EXTRA_DEBUG - LOG(L_DBG, "DEBUG: stun_parse_body: fingerprint is missing is this new request\n"); -#endif - /* missing mandatory attribute fingerprint */ - *error_code = BAD_REQUEST_ERR; - } - return 0; } @@ -431,7 +400,6 @@ int stun_create_response( struct stun_unknown_att* unknown, UINT_T error_code) { - UINT_T msg_len; /* * Alloc some space for response. * Optimalization? - maybe it would be better to use biggish static array. @@ -480,14 +448,6 @@ int stun_create_response( #endif return FATAL_ERROR; } - - if (stun_add_common_integer_attr(res, REFRESH_INTERVAL_ATTR, - stun_refresh_interval) != 0) { -#ifdef EXTRA_DEBUG - LOG(L_DBG, "DEBUG: stun_create_response: failed to common attributes\n"); -#endif - return FATAL_ERROR; - } } else { if (stun_add_address_attr(res, ri->src_ip.af, ri->src_port, @@ -532,10 +492,10 @@ int stun_create_response( if (req->old == 0) { /* - * add optional information about server; attribute SERVER is not a part of - * rfc3489.txt + * add optional information about server; attribute SOFTWARE is part of + * rfc5389.txt * */ - if (stun_add_common_text_attr(res, SERVER_ATTR, SERVER_HDR, PAD4)!=0) { + if (stun_add_common_text_attr(res, SOFTWARE_ATTR, SERVER_HDR, PAD4)!=0) { #ifdef EXTRA_DEBUG LOG(L_DBG, "DEBUG: stun_create_response: failed to add common text attribute\n"); #endif @@ -543,28 +503,9 @@ int stun_create_response( } } - if (req->old == 0 && stun_allow_fp) { - /* count length of body except header and fingerprint - * and copy message length at the beginning of buffer - */ - msg_len = res->msg.buf.len - sizeof(struct stun_hdr); - msg_len += SHA_DIGEST_LENGTH + sizeof(struct stun_attr); - res->hdr.len = htons(msg_len); - memcpy(&res->msg.buf.s[sizeof(USHORT_T)], (void *) &res->hdr.len, - sizeof(USHORT_T)); - - if (add_fingerprint(&res->msg) != 0) { -#ifdef EXTRA_DEBUG - LOG(L_DBG, "DEBUG: stun_create_response: failed to add fingerprint\n"); -#endif - return FATAL_ERROR; - } - } - else { - res->hdr.len = htons(res->msg.buf.len - sizeof(struct stun_hdr)); - memcpy(&res->msg.buf.s[sizeof(USHORT_T)], (void *) &res->hdr.len, - sizeof(USHORT_T)); - } + res->hdr.len = htons(res->msg.buf.len - sizeof(struct stun_hdr)); + memcpy(&res->msg.buf.s[sizeof(USHORT_T)], (void *) &res->hdr.len, + sizeof(USHORT_T)); return 0; } @@ -824,14 +765,14 @@ int stun_add_address_attr(struct stun_msg* res, ip_struct_len = 0; attr.type = htons(type); - res->ip_addr.port = (do_xor) ? htons(port) ^ MAGIC_COOKIE_2B : htons(port); + res->ip_addr.port = htons((do_xor) ? (port ^ MAGIC_COOKIE_2B) : port); switch(af) { case AF_INET: ip_struct_len = sizeof(struct stun_ip_addr) - 3*sizeof(UINT_T); res->ip_addr.family = htons(IPV4_FAMILY); memcpy(res->ip_addr.ip, ip_addr, IPV4_LEN); res->ip_addr.ip[0] = (do_xor) ? - res->ip_addr.ip[0] ^ MAGIC_COOKIE : res->ip_addr.ip[0]; + res->ip_addr.ip[0] ^ htonl(MAGIC_COOKIE) : res->ip_addr.ip[0]; break; #ifdef USE_IPV6 case AF_INET6: @@ -865,48 +806,6 @@ int stun_add_address_attr(struct stun_msg* res, } /* - * add_fingerprint() - * - msg: response buffer - * - * The function add_fingerprint ensures adding fingerprint attribute into - * response buffer. - * - * Return value: 0 if there is no environment error - * -1 if there is some enviroment error such as insufficiency - * of memory - */ -int add_fingerprint(struct stun_buffer* msg) -{ - struct stun_attr attr; - USHORT_T attr_type_size; - - attr_type_size = sizeof(struct stun_attr); - attr.type = htons(FINGERPRINT_ATTR); - attr.len = htons(SHA_DIGEST_LENGTH); - - if (msg->empty < (SHA_DIGEST_LENGTH + attr_type_size)) { - if (reallock_buffer(msg, SHA_DIGEST_LENGTH + attr_type_size) != 0) { - return FATAL_ERROR; - } - } - - memcpy(&msg->buf.s[msg->buf.len], (void *) &attr, attr_type_size); - msg->buf.len += attr_type_size; - msg->empty -= attr_type_size; - - if (SHA1((UCHAR_T *)msg->buf.s, msg->buf.len-attr_type_size, - (UCHAR_T *) &msg->buf.s[msg->buf.len]) == 0) { - LOG(L_ERR, "ERROR: STUN: SHA-1 algorithm failed.\n"); - return FATAL_ERROR; - } - - msg->buf.len += SHA_DIGEST_LENGTH; - msg->empty -= SHA_DIGEST_LENGTH; - - return 0; -} - -/* * stun_alloc_unknown_attr() * - type: type of unknown attribute * @@ -958,38 +857,6 @@ void stun_delete_unknown_attrs(struct stun_unknown_att* unknown) } /* - * validate_fingerprint() - * - req: structure representing request message - * - error_code: indication of any protocol error - * - * The function validate_fingerprint ensures validation of FINGERPRINT - * attribute. - * - * Return value: 0 if there is no environment error - * -1 if there is some enviroment error such as insufficiency - * of memory - */ -int validate_fingerprint(struct stun_msg* req, USHORT_T* error_code) -{ - UCHAR_T msg_digest[SHA_DIGEST_LENGTH]; - UINT_T buf_len; - - buf_len = req->hdr.len + sizeof(struct stun_hdr); - buf_len -= SHA_DIGEST_LENGTH + sizeof(struct stun_attr); - - if (SHA1((UCHAR_T *) req->msg.buf.s, buf_len, msg_digest) == 0) { - LOG(L_ERR, "ERROR: STUN: SHA-1 algorithm failed.\n"); - return FATAL_ERROR; - } - - if (memcmp((void *)req->fp, (void *)&msg_digest, SHA_DIGEST_LENGTH) != 0) { - *error_code = BAD_REQUEST_ERR; - } - - return 0; -} - -/* * buf_copy() * - msg: buffer where the data will be copy to * - source: source data buffer diff --git a/ser_stun.h b/ser_stun.h index 1e6051b..b287a78 100644 --- a/ser_stun.h +++ b/ser_stun.h @@ -56,19 +56,17 @@ typedef unsigned long ULONG_T; /* common STUN attributes */ #define MAPPED_ADDRESS_ATTR 0x0001 #define USERNAME_ATTR 0x0006 -#define PASSWORD_ATTR 0x0007 #define MESSAGE_INTEGRITY_ATTR 0x0008 #define ERROR_CODE_ATTR 0x0009 #define UNKNOWN_ATTRIBUTES_ATTR 0x000A -/* STUN attributes defined by rfc3489bis */ +/* STUN attributes defined by rfc5389 */ #define REALM_ATTR 0x0014 #define NONCE_ATTR 0x0015 #define XOR_MAPPED_ADDRESS_ATTR 0x0020 -#define FINGERPRINT_ATTR 0x0023 -#define SERVER_ATTR 0x8022 +#define FINGERPRINT_ATTR 0x8028 +#define SOFTWARE_ATTR 0x8022 #define ALTERNATE_SERVER_ATTR 0x8023 -#define REFRESH_INTERVAL_ATTR 0x8024 /* STUN attributes defined by rfc3489 */ #define RESPONSE_ADDRESS_ATTR 0x0002 @@ -167,7 +165,6 @@ struct stun_msg { struct stun_hdr hdr; struct stun_ip_addr ip_addr; /* XOR values for rfc3489bis, normal values for rfc3489 */ - char fp[SHA_DIGEST_LENGTH]; /* fingerprint value */ struct stun_buffer msg; UCHAR_T old; /* true: the format of message is in accordance with rfc3489 */ [View Less]

1 0

[tracker] Comment added: bug in dialplan or core re.c
by sip-router 22 Feb '11

22 Feb '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#115 - bug in dialplan or core re.c User who did this - Juha Heinanen (jh) ---------- i have made the tests with latest 3.1 from git. here is what happens with subst_exp ^(.+:)\+358(.+) and input uri sip:+35892345674@test.fi using various repl_exps: - if repl_exp is \1\2, i get what is expected, i.e., both \1 and \2 are replaced and consumed: Feb 22 09:40:39 sip /usr/sbin/sip-proxy[7323]: INFO: uri &… [View More]

1 0

git:master: core: proper return code for pvar assignment
by Daniel-Constantin Mierla 22 Feb '11

22 Feb '11

Module: sip-router Branch: master Commit: 1f698797ec4def503630563c06f5aef4a7b40871 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1f69879… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Feb 21 23:15:29 2011 +0100 core: proper return code for pvar assignment - in some case the value of the right expression was returned instead of proper >=0 for success cases - reported … [View More]

2 1

[tracker] Task closed: assignment statement emits bogus error message in sr 3.1
by sip-router 21 Feb '11

21 Feb '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#114 - assignment statement emits bogus error message in sr 3.1 User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: There was an inconsistency in returning code from a helper function used to assign the values for PVs, pretty harmless, but resulted in this error message -- revealed because I added the log message to spot failed assignments. Should be … [View More]

1 0

[tracker] User took ownership: assignment statement emits bogus error message in sr 3.1
by sip-router 21 Feb '11

21 Feb '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Daniel-Constantin Mierla has taken ownership of the following task: FS#114 - assignment statement emits bogus error message in sr 3.1 More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=114 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 … [View More]

1 0

git:3.1: core: proper return code for pvar assignment
by Daniel-Constantin Mierla 21 Feb '11

21 Feb '11

Module: sip-router Branch: 3.1 Commit: 4ace86df07c55eb66f902fda3f37d198346bfb4a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4ace86d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Feb 21 23:15:29 2011 +0100 core: proper return code for pvar assignment - in some case the value of the right expression was returned instead of proper >=0 for success cases - reported by … [View More]

1 0

[tracker] Comment added: bug in dialplan or core re.c
by sip-router 21 Feb '11

21 Feb '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#115 - bug in dialplan or core re.c User who did this - Daniel-Constantin Mierla (miconda) ---------- What version are you running? Is it only \1 appearing there, or also \2? There was a fix in 3.1 for variable substitutions, but I haven't seen this one at all so far... ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=115#… [View More]

1 0

[tracker] Comment added: assignment statement emits bogus error message in sr 3.1
by sip-router 21 Feb '11

21 Feb '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#114 - assignment statement emits bogus error message in sr 3.1 User who did this - Daniel-Constantin Mierla (miconda) ---------- OK, then it might be something I introduced while I added back the printing of line for failed assignments. I will double check it. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=114#comment163 … [View More]

1 0

Employment Proposition. OVERVIEW.
by serdev＠iptel.org 21 Feb '11

21 Feb '11

Spam detection software, running on the system "mail.iptel.org", has identified this incoming email as possible spam. The original message has been attached to this so you can view it (if it isn't spam) or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Flexible Shifts! Great Pay! Terrific Opportunity for a professional individual ready to move ahead in a great career. As a Representative/Admin Assistant/Admin … [View More]

1 0

NEWVacancies
by nils＠iptel.org 21 Feb '11

21 Feb '11

1 0

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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2011