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

diff --git a/NEWS b/NEWS
index cccfa95aaa43ba64f286f30bf0d312724420bc38..79295bd7e471669bff0530c2fc3e350afc4d30cf 100644 (file)
--- 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 a07fcf35662c9f673cf4cc276e8da7f5de474044..2ac75825b29d17e63b4aa31a5130b6a998d81619 100644 (file)
--- 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 dae853c86ac16db012c9a47c97bb5f463a805fc4..9417c39cc671c21e5851dea6fdba797b1d9d2d21 100644 (file)
--- 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
        {