/*
net_socket.c -- Handle various kinds of sockets.
Copyright (C) 1998-2005 Ivo Timmermans,
- 2000-2006 Guus Sliepen <guus@tinc-vpn.org>
+ 2000-2007 Guus Sliepen <guus@tinc-vpn.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "avl_tree.h"
#include "conf.h"
#include "connection.h"
-#include "event.h"
+#include "tevent.h"
#include "logger.h"
#include "meta.h"
#include "net.h"
if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0) {
logger(LOG_ERR, _("fcntl for %s: %s"), c->hostname, strerror(errno));
}
+#elif defined(WIN32)
+ unsigned long arg = 1;
+
+ if(ioctlsocket(c->socket, FIONBIO, &arg) != 0) {
+ logger(LOG_ERR, _("ioctlsocket for %s: WSA error %d"), c->hostname, WSAGetLastError());
+ }
#endif
#if defined(SOL_TCP) && defined(TCP_NODELAY)
return -1;
}
}
+#elif defined(WIN32)
+ {
+ unsigned long arg = 1;
+ if(ioctlsocket(nfd, FIONBIO, &arg) != 0) {
+ closesocket(nfd);
+ logger(LOG_ERR, _("Call to `%s' failed: WSA error %d"), "ioctlsocket",
+ WSAGetLastError());
+ return -1;
+ }
+ }
#endif
option = 1;
void retry_outgoing(outgoing_t *outgoing)
{
- event_t *event;
+ tevent_t *event;
cp();
if(outgoing->timeout > maxtimeout)
outgoing->timeout = maxtimeout;
- event = new_event();
+ event = new_tevent();
event->handler = (event_handler_t) setup_outgoing_connection;
event->time = now + outgoing->timeout;
event->data = outgoing;
- event_add(event);
+ tevent_add(event);
ifdebug(CONNECTIONS) logger(LOG_NOTICE,
_("Trying to re-establish outgoing connection in %d seconds"),
result = connect(c->socket, &c->address.sa, SALEN(c->address.sa));
if(result == -1) {
- if(errno == EINPROGRESS) {
+ if(errno == EINPROGRESS
+#if defined(WIN32) && !defined(O_NONBLOCK)
+ || WSAGetLastError() == WSAEWOULDBLOCK
+#endif
+ ) {
c->status.connecting = true;
return;
}
accept a new tcp connect and create a
new connection
*/
-bool handle_new_meta_connection(int sock)
+void handle_new_meta_connection(int sock, short events, void *data)
{
- int option;
connection_t *c;
sockaddr_t sa;
int fd;
if(fd < 0) {
logger(LOG_ERR, _("Accepting a new connection failed: %s"),
strerror(errno));
- return false;
}
sockaddrunmap(&sa);
c = new_connection();
- c->name = NULL;
+ c->name = xstrdup("<unknown>");
c->outcipher = myself->connection->outcipher;
c->outdigest = myself->connection->outdigest;
c->outmaclength = myself->connection->outmaclength;
c->allow_request = ID;
send_id(c);
-
- return true;
}
void try_outgoing_connections(void)