From: Simon Josefsson <simon@josefsson.org>
Date: Wed, 20 May 2009 10:34:34 +0000 (+0200)
Subject: Fix gnutls-serv and gnutls-cli-debug on Windows.
X-Git-Tag: gnutls_2_7_12~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b5021eb53c959059603372fe85df4da5a7579ce8;p=thirdparty%2Fgnutls.git

Fix gnutls-serv and gnutls-cli-debug on Windows.
---

diff --git a/NEWS b/NEWS
index cccfa95aaa..79295bd7e4 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@ See the end for copying conditions.
 
 * Version 2.7.12 (unreleased)
 
+** gnutls-serv, gnutls-cli-debug: Make them work on Windows.
+
 ** tests/crq_key_id: Don't read entropy from /dev/random in self-test.
 Reported by Andreas Metzler <ametzler@downhill.at.eu.org> in
 <http://permalink.gmane.org/gmane.comp.encryption.gpg.gnutls.devel/3570>.
diff --git a/src/serv.c b/src/serv.c
index a07fcf3566..2ac75825b2 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -48,6 +48,7 @@
 #include "version-etc.h"
 #include "read-file.h"
 #include "minmax.h"
+#include "sockets.h"
 
 /* konqueror cannot handle sending the page in multiple
  * pieces.
@@ -1127,7 +1128,8 @@ main (int argc, char **argv)
 
 		j->tls_session = tls_session;
 		gnutls_transport_set_ptr (tls_session,
-					  (gnutls_transport_ptr_t) accept_fd);
+					  (gnutls_transport_ptr_t)
+					  gl_fd_to_handle (accept_fd));
 		j->handshake_ok = 0;
 
 		if (verbose == 0)
diff --git a/src/tls_test.c b/src/tls_test.c
index dae853c86a..9417c39cc6 100644
--- a/src/tls_test.c
+++ b/src/tls_test.c
@@ -32,8 +32,10 @@
 #include <common.h>
 #include <tls_test-gaa.h>
 
+/* Gnulib portability files. */
 #include <progname.h>
 #include <version-etc.h>
+#include "sockets.h"
 
 #define ERR(err,s) if (err==-1) {perror(s);return(1);}
 #define MAX_BUF 4096
@@ -259,7 +261,8 @@ main (int argc, char **argv)
 	    }
 	}
       ERR (err, "connect") gnutls_init (&state, GNUTLS_CLIENT);
-      gnutls_transport_set_ptr (state, (gnutls_transport_ptr_t) sd);
+      gnutls_transport_set_ptr (state, (gnutls_transport_ptr_t)
+				gl_fd_to_handle (sd));
 
       do
 	{