sr-dev August 2014

sr-dev@lists.kamailio.org

25 participants
196 discussions

git:master: lib/srutils: new files with wrappers around sha256 and other hashing functions
by Daniel-Constantin Mierla 14 Aug '14

14 Aug '14

Module: sip-router Branch: master Commit: b6bd830ea93024324354dc3fb5eceaddbd8d20a3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b6bd830… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 14 11:14:10 2014 +0200 lib/srutils: new files with wrappers around sha256 and other hashing functions --- lib/srutils/shautils.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ lib/srutils/shautils.h | 36 +++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 0 deletions(-) diff --git a/lib/srutils/shautils.c b/lib/srutils/shautils.c new file mode 100644 index 0000000..25f9e38 --- /dev/null +++ b/lib/srutils/shautils.c @@ -0,0 +1,63 @@ +/* + * sha and other hashing utilities + * + * Copyright (C) 2014 1&1 Germany + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "../../md5.h" +#include "../../ut.h" +#include "shautils.h" + +/*! \brief Compute MD5 checksum */ +void compute_md5(char *dst, char *src, int src_len) +{ + MD5_CTX context; + unsigned char digest[16]; + MD5Init (&context); + MD5Update (&context, src, src_len); + U_MD5Final (digest, &context); + string2hex(digest, 16, dst); +} + +/*! \brief Compute SHA256 checksum */ +void compute_sha256(char *dst, u_int8_t *src, int src_len) +{ + SHA256_CTX ctx256; + SHA256_Init(&ctx256); + SHA256_Update(&ctx256, src, src_len); + SHA256_End(&ctx256, dst); +} + +/*! \brief Compute SHA384 checksum */ +void compute_sha384(char *dst, u_int8_t *src, int src_len) +{ + SHA384_CTX ctx384; + SHA384_Init(&ctx384); + SHA384_Update(&ctx384, src, src_len); + SHA384_End(&ctx384, dst); +} + +/*! \brief Compute SHA512 checksum */ +void compute_sha512(char *dst, u_int8_t *src, int src_len) +{ + SHA512_CTX ctx512; + SHA512_Init(&ctx512); + SHA512_Update(&ctx512, src, src_len); + SHA512_End(&ctx512, dst); +} diff --git a/lib/srutils/shautils.h b/lib/srutils/shautils.h new file mode 100644 index 0000000..1d7b0e4 --- /dev/null +++ b/lib/srutils/shautils.h @@ -0,0 +1,36 @@ +/* + * sha and other hashing utilities + * + * Copyright (C) 2014 1&1 Germany + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef _SHAUTILS_H_ +#define _SHAUTILS_H_ + +#include "sha256.h" + +void compute_md5(char *dst, char *src, int src_len); + +void compute_sha256(char *dst, u_int8_t *src, int src_len); + +void compute_sha384(char *dst, u_int8_t *src, int src_len); + +void compute_sha512(char *dst, u_int8_t *src, int src_len); + +#endif

1 0

git:master: lib/kcore: moved wrappers around sha256 to srutils
by Daniel-Constantin Mierla 14 Aug '14

14 Aug '14

Module: sip-router Branch: master Commit: 1edbdbd53d2f5df0b47c8e9e892f35852362a5bd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1edbdbd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 14 11:12:43 2014 +0200 lib/kcore: moved wrappers around sha256 to srutils - the sha256 functions are in srutils and these created not necessary inter-library dependency, confusing some linkers --- lib/kcore/Makefile | 2 +- lib/kcore/strcommon.c | 38 -------------------------------------- lib/kcore/strcommon.h | 10 ---------- 3 files changed, 1 insertions(+), 49 deletions(-) diff --git a/lib/kcore/Makefile b/lib/kcore/Makefile index b3f43e0..2ac230d 100644 --- a/lib/kcore/Makefile +++ b/lib/kcore/Makefile @@ -7,6 +7,6 @@ BUGFIX_VER=0 LIBS= SERLIBPATH=.. -SER_LIBS=$(SERLIBPATH)/srutils/srutils +SER_LIBS= include ../../Makefile.libs diff --git a/lib/kcore/strcommon.c b/lib/kcore/strcommon.c index e831e1f..ce27ab3 100644 --- a/lib/kcore/strcommon.c +++ b/lib/kcore/strcommon.c @@ -110,44 +110,6 @@ int unescape_common(char *dst, char *src, int src_len) return j; } -/*! \brief Compute MD5 checksum */ -void compute_md5(char *dst, char *src, int src_len) -{ - MD5_CTX context; - unsigned char digest[16]; - MD5Init (&context); - MD5Update (&context, src, src_len); - U_MD5Final (digest, &context); - string2hex(digest, 16, dst); -} - -/*! \brief Compute SHA256 checksum */ -void compute_sha256(char *dst, u_int8_t *src, int src_len) -{ - SHA256_CTX ctx256; - SHA256_Init(&ctx256); - SHA256_Update(&ctx256, src, src_len); - SHA256_End(&ctx256, dst); -} - -/*! \brief Compute SHA384 checksum */ -void compute_sha384(char *dst, u_int8_t *src, int src_len) -{ - SHA384_CTX ctx384; - SHA384_Init(&ctx384); - SHA384_Update(&ctx384, src, src_len); - SHA384_End(&ctx384, dst); -} - -/*! \brief Compute SHA512 checksum */ -void compute_sha512(char *dst, u_int8_t *src, int src_len) -{ - SHA512_CTX ctx512; - SHA512_Init(&ctx512); - SHA512_Update(&ctx512, src, src_len); - SHA512_End(&ctx512, dst); -} - /*! \brief Unscape all printable ASCII characters */ int unescape_user(str *sin, str *sout) { diff --git a/lib/kcore/strcommon.h b/lib/kcore/strcommon.h index 80d636d..c3d0c70 100644 --- a/lib/kcore/strcommon.h +++ b/lib/kcore/strcommon.h @@ -29,8 +29,6 @@ #define _STRCOMMON_H_ #include "../../str.h" -#include "../../md5.h" -#include "../srutils/sha256.h" /* * add backslashes to special characters @@ -41,14 +39,6 @@ int escape_common(char *dst, char *src, int src_len); */ int unescape_common(char *dst, char *src, int src_len); -void compute_md5(char *dst, char *src, int src_len); - -void compute_sha256(char *dst, u_int8_t *src, int src_len); - -void compute_sha384(char *dst, u_int8_t *src, int src_len); - -void compute_sha512(char *dst, u_int8_t *src, int src_len); - int escape_user(str *sin, str *sout); int unescape_user(str *sin, str *sout);

1 0

git:master: Makefile: use one tab for install-cfg and added nop not to confuse some versions of shell
by Daniel-Constantin Mierla 14 Aug '14

14 Aug '14

Module: sip-router Branch: master Commit: 0039d7ea856e98c6c6c0c1ae6386e367ef36af1a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0039d7e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 14 11:09:36 2014 +0200 Makefile: use one tab for install-cfg and added nop not to confuse some versions of shell - apparently they evaluate wrongly the sequence: escape (\), new line, tab, done --- Makefile | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index d0e00b9..8786cc8 100644 --- a/Makefile +++ b/Makefile @@ -755,7 +755,7 @@ $(man_prefix)/$(man_dir)/man5: # note: sed with POSIX.1 regex doesn't support |, + or ? (darwin, solaris ...) install-cfg: $(cfg_prefix)/$(cfg_dir) - @if [ -f etc/$(CFG_NAME).cfg ]; then \ + @if [ -f etc/$(CFG_NAME).cfg ]; then \ sed $(foreach m,$(modules_dirs),\ -e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)$[:/\"]$#$($(m)_target)\1#g") \ -e "s#/usr/local/etc/$(CFG_NAME)/#$(cfg_target)#g" \ @@ -768,7 +768,7 @@ install-cfg: $(cfg_prefix)/$(cfg_dir) $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg; \ fi; \ fi - @if [ -f etc/$(CFG_NAME)-basic.cfg ]; then \ + @if [ -f etc/$(CFG_NAME)-basic.cfg ]; then \ sed $(foreach m,$(modules_dirs),\ -e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)$[:/\"]$#$($(m)_target)\1#g") \ -e "s#/usr/local/etc/$(CFG_NAME)/#$(cfg_target)#g" \ @@ -781,7 +781,7 @@ install-cfg: $(cfg_prefix)/$(cfg_dir) $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-basic.cfg; \ fi; \ fi - @if [ -f etc/$(CFG_NAME)-oob.cfg ]; then \ + @if [ -f etc/$(CFG_NAME)-oob.cfg ]; then \ sed $(foreach m,$(modules_dirs),\ -e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)$[:/\"]$#$($(m)_target)\1#g") \ -e "s#/usr/local/etc/$(CFG_NAME)/#$(cfg_target)#g" \ @@ -795,8 +795,8 @@ install-cfg: $(cfg_prefix)/$(cfg_dir) $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg; \ fi; \ fi - @# other configs - @for r in $(C_INSTALL_CFGS) ""; do \ + @# other configs + @for r in $(C_INSTALL_CFGS) ""; do \ if [ -n "$$r" ]; then \ if [ -f "$$r" ]; then \ n=`basename "$$r"` ; \ @@ -818,14 +818,15 @@ install-cfg: $(cfg_prefix)/$(cfg_dir) fi ; \ fi ; \ fi ; \ - done; true - # radius dictionary - $(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/dictionary.$(CFG_NAME) - $(INSTALL_CFG) etc/dictionary.$(CFG_NAME) $(cfg_prefix)/$(cfg_dir) + : ; done; true + @# radius dictionary + @$(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/dictionary.$(CFG_NAME) + @$(INSTALL_CFG) etc/dictionary.$(CFG_NAME) $(cfg_prefix)/$(cfg_dir) + @echo "config files installed" install-bin: $(bin_prefix)/$(bin_dir) $(NAME) - $(INSTALL_TOUCH) $(bin_prefix)/$(bin_dir)/$(NAME) - $(INSTALL_BIN) $(NAME) $(bin_prefix)/$(bin_dir) + $(INSTALL_TOUCH) $(bin_prefix)/$(bin_dir)/$(NAME) + $(INSTALL_BIN) $(NAME) $(bin_prefix)/$(bin_dir) install-share: $(share_prefix)/$(share_dir)

1 0

git:master: modules/ims_qos: Do not add MCD AVP to AAR if src or dst ports are 0
by Richard Good 14 Aug '14

14 Aug '14

Module: sip-router Branch: master Commit: b4e8f3f4c09b57ce6f60f542963a80b79fc0205b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b4e8f3f… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Thu Aug 14 10:48:16 2014 +0200 modules/ims_qos: Do not add MCD AVP to AAR if src or dst ports are 0 Check if src or dst ports in SDP are 0 and if so do not add an MCD AVP for this --- modules/ims_qos/rx_aar.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/modules/ims_qos/rx_aar.c b/modules/ims_qos/rx_aar.c index 5196d99..463845a 100644 --- a/modules/ims_qos/rx_aar.c +++ b/modules/ims_qos/rx_aar.c @@ -380,12 +380,17 @@ int add_media_components(AAAMessage* aar, struct sip_msg *req, //is this a stream to add to AAR. if (req_sdp_stream->is_rtp) { - rx_add_media_component_description_avp(aar, sdp_stream_num + 1, - &req_sdp_stream->media, &req_sdp_session->ip_addr, - &req_sdp_stream->port, &rpl_sdp_session->ip_addr, - &rpl_sdp_stream->port, &rpl_sdp_stream->transport, - &req_sdp_stream->raw_stream, - &rpl_sdp_stream->raw_stream, direction); + //check if the src or dst port is 0 and if so then don't add to rx + int intportA = atoi(req_sdp_stream->port.s); + int intportB = atoi(rpl_sdp_stream->port.s); + if(intportA != 0 && intportB != 0){ + rx_add_media_component_description_avp(aar, sdp_stream_num + 1, + &req_sdp_stream->media, &req_sdp_session->ip_addr, + &req_sdp_stream->port, &rpl_sdp_session->ip_addr, + &rpl_sdp_stream->port, &rpl_sdp_stream->transport, + &req_sdp_stream->raw_stream, + &rpl_sdp_stream->raw_stream, direction); + } } sdp_stream_num++; }

1 0

git:master: modules/ims_qos: Support Rx_AAR on AAR update
by Richard Good 14 Aug '14

14 Aug '14

Module: sip-router Branch: master Commit: f44dad86621685cf7fde45e4ad36f0f0bbcfb15a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f44dad8… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Thu Aug 14 10:46:59 2014 +0200 modules/ims_qos: Support Rx_AAR on AAR update Previously if Rx_AAR was called for an AAR update the function returned true Now this function gets the previous Rx session and sends an AAR update --- modules/ims_qos/mod.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/modules/ims_qos/mod.c b/modules/ims_qos/mod.c index c3d8d81..e87af76 100644 --- a/modules/ims_qos/mod.c +++ b/modules/ims_qos/mod.c @@ -552,10 +552,7 @@ static int w_rx_aar(struct sip_msg *msg, char *route, char* str1, char* bar) { LM_DBG("Attached CDP auth session [%.*s] for Rx to dialog in %s mode\n", auth_session->id.len, auth_session->id.s, direction); } else { LM_DBG("Update AAR session for this dialog in mode %s\n", direction); - if (saved_t_data) - free_saved_transaction_global_data(saved_t_data); //only free global data if no AARs were sent. if one was sent we have to rely on the callback (CDP) to free - create_return_code(CSCF_RETURN_TRUE); - return CSCF_RETURN_TRUE; + auth_session = cdpb.AAAGetAuthSession(*rx_session_id); } LM_DBG("Suspending SIP TM transaction\n");

1 0

git:master: corex: rpc corex.list_sockets and corex. list_aliases return array
by Daniel-Constantin Mierla 14 Aug '14

14 Aug '14

Module: sip-router Branch: master Commit: 3e7a7b19e2d524c100cd09b01cf277950cd01d9e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3e7a7b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 14 09:11:22 2014 +0200 corex: rpc corex.list_sockets and corex.list_aliases return array - type of return value set to RET_ARRAY --- modules/corex/corex_rpc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/corex/corex_rpc.c b/modules/corex/corex_rpc.c index 969ff31..77ef0d3 100644 --- a/modules/corex/corex_rpc.c +++ b/modules/corex/corex_rpc.c @@ -174,9 +174,9 @@ static void corex_rpc_shm_summary(rpc_t* rpc, void* ctx) rpc_export_t corex_rpc_cmds[] = { {"corex.list_sockets", corex_rpc_list_sockets, - corex_rpc_list_sockets_doc, 0}, + corex_rpc_list_sockets_doc, RET_ARRAY}, {"corex.list_aliases", corex_rpc_list_aliases, - corex_rpc_list_aliases_doc, 0}, + corex_rpc_list_aliases_doc, RET_ARRAY}, {"corex.shm_status", corex_rpc_shm_status, corex_rpc_shm_status_doc, 0}, {"corex.shm_summary", corex_rpc_shm_summary,

1 0

git:master: jsonrpc-s: new module implementing a JSONRPC server over HTTP
by Daniel-Constantin Mierla 14 Aug '14

14 Aug '14

Module: sip-router Branch: master Commit: 62b59b95bcc45c7ff87a95d7c7e796bf356913bf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=62b59b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 14 09:13:57 2014 +0200 jsonrpc-s: new module implementing a JSONRPC server over HTTP - it uses internal json library - requires xhttp module to handle http messages --- modules/jsonrpc-s/Makefile | 12 + modules/jsonrpc-s/README | 162 ++++++ modules/jsonrpc-s/doc/Makefile | 4 + modules/jsonrpc-s/doc/jsonrpc-s.xml | 37 ++ modules/jsonrpc-s/doc/jsonrpc-s_admin.xml | 159 ++++++ modules/jsonrpc-s/jsonrpc-s_mod.c | 846 +++++++++++++++++++++++++++++ modules/jsonrpc-s/jsonrpc-s_mod.h | 57 ++ 7 files changed, 1277 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=62b…

1 0

mysql_db and UPDATE
by Jason Penton 13 Aug '14

13 Aug '14

Hi, I have noticed that in some instances if you update a row in mysql via the mysql_db module and the actual row data does not change - affected_rows will return 0. This is the default behaviour for the mysql API as per - http://dev.mysql.com/doc/refman/5.0/en/mysql-real-connect.html There is a flag (CLIENT_FOUND_ROWS) that can be used in the mysql_real_connect function that will cause affected_rows to return the number of rows that were "matched" - ie in the WHERE clause, as opposed to whether or not any data was changed. If we don't it could be a problem for modules like usrloc where an update is done and if no row are "affected" and new row is added which would cause a duplicate. I understand that updating a row with zero changes is not ideal and prob. not a typical use case but this IMO is irrelevant. I understand affected rows to mean the number of rows that were matched and not the number of rows that had data changed... - seems like a case of MySQL being too clever here ;) Thoughts? Cheers Jason

4 5

git:4.1: core/parser: Free rr correctly in error cases
by Hugh Waite 13 Aug '14

13 Aug '14

Module: sip-router Branch: 4.1 Commit: 8ce72b602046e39c862c7db7eb885ca4b3ac960c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8ce72b6… Author: Hugh Waite <hugh.waite(a)acision.com> Committer: Hugh Waite <hugh.waite(a)acision.com> Date: Tue Aug 12 19:56:45 2014 +0100 core/parser: Free rr correctly in error cases - Fix potential memory leak if parameters are parsed into rr structure (cherry picked from commit b40d92962b680ac29dd38ffe3c8f1aa1e39d3a97) --- parser/parse_rr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/parser/parse_rr.c b/parser/parse_rr.c index d3a2938..e3df4f3 100644 --- a/parser/parse_rr.c +++ b/parser/parse_rr.c @@ -138,7 +138,7 @@ static inline int do_parse_rr_body(char *buf, int len, rr_t **head) } error: - if (r) pkg_free(r); + if (r) free_rr(r); free_rr(head); /* Free any contacts created so far */ return -1;

1 0

git:4.1: outbound: Fix memory leak
by Hugh Waite 13 Aug '14

13 Aug '14

Module: sip-router Branch: 4.1 Commit: 6c967cebd213d1820cd1af428db5449b1af9aec1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6c967ce… Author: Hugh Waite <hugh.waite(a)acision.com> Committer: Hugh Waite <hugh.waite(a)acision.com> Date: Tue Aug 12 19:52:27 2014 +0100 outbound: Fix memory leak - Free parameters parsed when checking for ob markers (cherry picked from commit 392689597376eb6f047c12504bcce367f5940260) --- modules/outbound/ob_mod.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules/outbound/ob_mod.c b/modules/outbound/ob_mod.c index 038c5fa..aae1e10 100644 --- a/modules/outbound/ob_mod.c +++ b/modules/outbound/ob_mod.c @@ -385,6 +385,8 @@ static int use_outbound_non_reg(struct sip_msg *msg) LM_ERR("parsing Route-URI parameters\n"); return 0; } + /* Not interested in param body - just the hooks */ + free_params(params); if (hooks.uri.ob) { @@ -450,6 +452,9 @@ static int use_outbound_non_reg(struct sip_msg *msg) LM_ERR("parsing Contact-URI parameters\n"); return 0; } + /* Not interested in param body - just the hooks */ + free_params(params); + if (hooks.contact.ob) { LM_DBG("found ;ob parameter on Contact-URI - outbound"

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
20
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 2014