From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 20 Nov 2008 07:09:48 +0000 (+0000)
Subject: Provide rpl_malloc() for sntp for systems that need it
X-Git-Tag: NTP_4_2_5P145~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3efc591b350a0f63496885ea4e4cfe840141479e;p=thirdparty%2Fntp.git

Provide rpl_malloc() for sntp for systems that need it

bk: 49250d3c2ACw1PSeYDTxDS3ZVupnRg
---

diff --git a/ChangeLog b/ChangeLog
index a47b2fda8..5083e6e1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Provide rpl_malloc() for sntp for systems that need it.
 * Handle ss_len and socklen type for sntp.
 * Fixes to the sntp configure.ac script.
 * Provide INET6_ADDRSTRLEN if it is missing.
diff --git a/gsoc_sntp/main.c b/gsoc_sntp/main.c
index c3e03abbf..355c03423 100644
--- a/gsoc_sntp/main.c
+++ b/gsoc_sntp/main.c
@@ -27,6 +27,16 @@ int on_wire (struct addrinfo *host);
 int set_time (double offset);
 
 
+#if !HAVE_MALLOC
+void *
+rpl_malloc (size_t n)
+{
+	if (n == 0)
+	    n = 1;
+	return malloc (n);
+}
+#endif /* !HAVE_MALLOC */
+
 int 
 main (
 		int argc,
diff --git a/gsoc_sntp/networking.c b/gsoc_sntp/networking.c
index ee149f98e..a4472df1a 100644
--- a/gsoc_sntp/networking.c
+++ b/gsoc_sntp/networking.c
@@ -202,7 +202,7 @@ recvdata (
 		int rdata_length
 	 )
 {
-	socklen_t slen = SOCKLEN(&rsock);
+	GETSOCKNAME_SOCKLEN_TYPE slen = SOCKLEN(&rsock);
 
 #ifdef DEBUG
 	printf("sntp recvdata: Trying to receive data from...\n");
@@ -367,9 +367,9 @@ recv_bcst_data (
 			break;
 
 /*		default: */
-			socklen_t ss_len = SOCKLEN(ras);
+			GETSOCKNAME_SOCKLEN_TYPE ss_len = SOCKLEN(ras);
 
-			recv_bytes = recvfrom(rsock, rdata, rdata_len, 0, (struct sockaddr *) ras, (socklen_t *) &ss_len);
+			recv_bytes = recvfrom(rsock, rdata, rdata_len, 0, (struct sockaddr *) ras, (GETSOCKNAME_SOCKLEN_TYPE *) &ss_len);
 	}
 
 	if(recv_bytes == -1) {