From: Alan T. DeKok <aland@freeradius.org>
Date: Fri, 27 Jan 2012 09:26:04 +0000 (+0100)
Subject: Move dump_hex() function to tls_listen.c
X-Git-Tag: release_3_0_0_beta0~365
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e8ba1b74eca09e608cce33fc70fed35f0824f95;p=thirdparty%2Ffreeradius-server.git

Move dump_hex() function to tls_listen.c
---

diff --git a/src/main/tls.c b/src/main/tls.c
index a0dfa539279..e26a4c0456b 100644
--- a/src/main/tls.c
+++ b/src/main/tls.c
@@ -43,15 +43,6 @@ RCSID("$Id$")
 #include <openssl/ocsp.h>
 #endif
 
-#ifdef HAVE_PTHREAD_H
-#define PTHREAD_MUTEX_LOCK pthread_mutex_lock
-#define PTHREAD_MUTEX_UNLOCK pthread_mutex_unlock
-#else
-#define PTHREAD_MUTEX_LOCK(_x)
-#define PTHREAD_MUTEX_UNLOCK(_x)
-#endif
-
-
 /* record */
 static void 		record_init(record_t *buf);
 static void 		record_close(record_t *buf);
@@ -2460,22 +2451,4 @@ fr_tls_status_t tls_ack_handler(tls_session_t *ssn, REQUEST *request)
 	}
 }
 
-static void dump_hex(const char *msg, const uint8_t *data, size_t data_len)
-{
-	size_t i;
-
-	if (debug_flag < 3) return;
-
-	printf("%s %d\n", msg, (int) data_len);
-	if (data_len > 256) data_len = 256;
-
-	for (i = 0; i < data_len; i++) {
-		if ((i & 0x0f) == 0x00) printf ("%02x: ", (unsigned int) i);
-		printf("%02x ", data[i]);
-		if ((i & 0x0f) == 0x0f) printf ("\n");
-	}
-	printf("\n");
-	fflush(stdout);
-}
-
 #endif	/* WITH_TLS */
diff --git a/src/main/tls_listen.c b/src/main/tls_listen.c
index 7f4ea62b68a..772f87490f7 100644
--- a/src/main/tls_listen.c
+++ b/src/main/tls_listen.c
@@ -51,6 +51,24 @@ RCSID("$Id$")
 #define PTHREAD_MUTEX_UNLOCK(_x)
 #endif
 
+static void dump_hex(const char *msg, const uint8_t *data, size_t data_len)
+{
+	size_t i;
+
+	if (debug_flag < 3) return;
+
+	printf("%s %d\n", msg, (int) data_len);
+	if (data_len > 256) data_len = 256;
+
+	for (i = 0; i < data_len; i++) {
+		if ((i & 0x0f) == 0x00) printf ("%02x: ", (unsigned int) i);
+		printf("%02x ", data[i]);
+		if ((i & 0x0f) == 0x0f) printf ("\n");
+	}
+	printf("\n");
+	fflush(stdout);
+}
+
 static void tls_socket_close(rad_listen_t *listener)
 {
 	listen_socket_t *sock = listener->data;