This patch at least allows compilation. However, I am trying to run
GTKG with direct FB (it is working, but barfed quickly as it was
connecting to GNET). I doubt it is related to the code below, but I
would guess there are better ways to do what I did...
fwiw,
Bill Pringlemeir.
Index: src/core/tls_common.c
===================================================================
--- src/core/tls_common.c (revision 11440)
+++ src/core/tls_common.c (working copy)
@@ -701,13 +701,13 @@
#else /* !HAS_GNUTLS*/
enum tls_handshake_result
-tls_handshake(tls_context_t ctx)
+tls_handshake(struct gnutella_socket *s)
{
- (void) ctx;
+ (void) s;
return TLS_HANDSHAKE_FINISHED;
}
-tls_ctx_t
+tls_context_t
tls_init(gboolean is_incoming)
{
(void) is_incoming;
Index: src/core/sockets.c
===================================================================
--- src/core/sockets.c (revision 11440)
+++ src/core/sockets.c (working copy)
@@ -1202,13 +1202,14 @@
s->getline = NULL;
}
+#ifdef HAS_GNUTLS
if (s->tls.ctx) {
if (s->file_desc != -1) {
tls_bye(s->tls.ctx, SOCK_CONN_INCOMING == s->direction);
}
tls_free(&s->tls.ctx);
}
-
+#endif
if (s->file_desc != -1) {
if (s->corked)
sock_cork(s, FALSE);
@@ -1247,6 +1248,7 @@
static gboolean
socket_tls_setup(struct gnutella_socket *s)
{
+#ifdef HAS_GNUTLS
gboolean is_incoming;
if (!s->tls.enabled) {
@@ -1284,8 +1286,10 @@
destroy:
socket_destroy(s, "TLS handshake failed");
return FALSE;
+#else
+ return TRUE;
+#endif
}
-
/**
* Used for incoming connections, for outgoing too??
* Read bytes on an unknown incoming socket. When the first line
@@ -1950,6 +1954,7 @@
t->getline = getline_make(MAX_LINE_SIZE);
t->flags |= SOCK_F_TCP;
+#ifdef HAS_GNUTLS
t->tls.enabled = s->tls.enabled; /* Inherit from listening socket */
t->tls.stage = SOCK_TLS_NONE;
t->tls.ctx = NULL;
@@ -1957,7 +1962,8 @@
if (tls_debug)
g_message("Incoming connection");
-
+#endif
+
socket_wio_link(t);
t->flags |= SOCK_F_ESTABLISHED;
@@ -2352,11 +2358,13 @@
s->port = port;
s->flags |= SOCK_F_TCP;
+#ifdef HAS_GNUTLS
s->tls.enabled = tls_enforce || (CONNECT_F_TLS & flags);
s->tls.stage = SOCK_TLS_NONE;
s->tls.ctx = NULL;
s->tls.snarf = 0;
-
+#endif
+
socket_wio_link(s);
option = 1;
Index: src/core/sockets.h
===================================================================
--- src/core/sockets.h (revision 11440)
+++ src/core/sockets.h (working copy)
@@ -65,10 +65,15 @@
gpointer cb_data;
};
+#ifdef HAS_GNUTLS
#define SOCKET_WITH_TLS(s) \
((s)->tls.enabled && (s)->tls.stage >= SOCK_TLS_INITIALIZED)
#define SOCKET_USES_TLS(s) \
((s)->tls.enabled && (s)->tls.stage >= SOCK_TLS_ESTABLISHED)
+#else
+#define SOCKET_WITH_TLS(s) 0
+#define SOCKET_USES_TLS(s) 0
+#endif
struct sockaddr;
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Gtk-gnutella-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtk-gnutella-devel
