From 08efcac80969c7419666a3924baa633979b7ca8a Mon Sep 17 00:00:00 2001 From: Thomas Ries Date: Mon, 17 Jul 2006 21:16:44 +0000 Subject: [PATCH] This commit was manufactured by cvs2svn to create tag 'rel_0_5_13'. --- ChangeLog | 1 + RELNOTES | 12 ++++++++++-- src/fwapi.c | 4 ++-- src/proxy.c | 2 +- src/register.c | 2 +- src/utils.c | 9 ++++++++- 6 files changed, 23 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 019d76d..34216dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 0.5.13 ====== + 20-Jun-2006: - Released 0.5.13 11-Jun-2006: - RTP timeout handling: allow unidirectional data w/o terminating connection after timeout. 20-May-2006: - Fixed compiling issue when building on MacOS (Georg Schwarz) diff --git a/RELNOTES b/RELNOTES index 157e763..94eca9c 100644 --- a/RELNOTES +++ b/RELNOTES @@ -2,6 +2,8 @@ Release Notes for siproxd-0.5.13 ================================ Major changes since 0.5.12: + Several issues related to 64 bit architectures have been fixed + and several minor bugfixes. General Overview: - SIP (RFC3261) Proxy for SIP based softphones hidden behind a @@ -52,7 +54,6 @@ Builds on: - FreeBSD: FreeBSD 4.10-BETA - OpenBSD: OpenBSD 3.4 GENERIC#18 - SunOS: SunOS 5.9 -- Mac OS X: Darwin 6.8 - Windows: Cygwin environment Reported interoperability with softphones: @@ -88,9 +89,16 @@ distribution I'd be happy to get a short notice. ----- -md5sum for siproxd-0.5.13.tar.gz: +md5sum for siproxd-0.5.13.tar.gz: af4126582e803ea6328f1e2d7e626479 GnuPG signature for siproxd-0.5.13.tar.gz archive: +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.2.3 (GNU/Linux) + +iD8DBQBEmDqoCfzBioe83JQRAu/nAJ9VBMoN6MdPJ1HrkgB5KfhemYS7YACfSX1k +vkF3+HdJmK2bKeHxnAg4U8k= +=w+Tt +-----END PGP SIGNATURE----- GnuPG: pub 1024D/87BCDC94 2000-03-19 Thomas Ries diff --git a/src/fwapi.c b/src/fwapi.c index af15a8e..d63dc8d 100644 --- a/src/fwapi.c +++ b/src/fwapi.c @@ -42,7 +42,7 @@ int fwapi_start_rtp(int rtp_direction, sts=custom_fw_control(fwdata); if (sts != STS_SUCCESS) { - ERROR("Custom firewall module returned error [START, sts=%s]",sts); + ERROR("Custom firewall module returned error [START, sts=%i]",sts); } #endif return STS_SUCCESS; @@ -63,7 +63,7 @@ int fwapi_stop_rtp(int rtp_direction, sts=custom_fw_control(fwdata); if (sts != STS_SUCCESS) { - ERROR("Custom firewall module returned error [STOP, sts=%s]",sts); + ERROR("Custom firewall module returned error [STOP, sts=%i]",sts); } #endif return STS_SUCCESS; diff --git a/src/proxy.c b/src/proxy.c index 5a7ee1c..b8b47fc 100644 --- a/src/proxy.c +++ b/src/proxy.c @@ -1022,7 +1022,7 @@ if (configuration.debuglevel) tmp=utils_inet_ntoa(ticket->from.sin_addr); strncpy(from_string, tmp, HOSTNAME_SIZE-1); from_string[HOSTNAME_SIZE-1]='\0'; - client_id=tmp; + client_id=from_string; } /* diff --git a/src/register.c b/src/register.c index c4f5930..6611afb 100644 --- a/src/register.c +++ b/src/register.c @@ -331,7 +331,7 @@ int register_client(sip_ticket_t *ticket, int force_lcl_masq) { (url1_contact->host) ? url1_contact->host : "*NULL*", (url2_to->username) ? url2_to->username : "*NULL*", (url2_to->host) ? url2_to->host : "*NULL*", - i, urlmap[i].expires-time_now); + i, (long)urlmap[i].expires-time_now); break; } } diff --git a/src/utils.c b/src/utils.c index 100edef..1a39df6 100644 --- a/src/utils.c +++ b/src/utils.c @@ -467,7 +467,14 @@ int get_ip_by_ifname(char *ifname, struct in_addr *retaddr) { * utils_inet_ntoa: * implements an inet_ntoa() * - * Returns pointer to a static character string. + * Returns pointer to a STATIC character string. + * NOte: BE AWARE OF THE STATIC NATURE of the string! Never pass it as + * calling argument to a function and use it immediately or strcpy() + * it into a buffer. + * !! Any subsequent call to this function will DESTROY the previous + * !! value - and may result in very strange effects like magically + * !! changing variable value (that has been passed to a function) + * Been there, seen that, so TAKE CARE! */ char *utils_inet_ntoa(struct in_addr in) { #if defined(HAVE_INET_NTOP)