socket or -1 on error. This blocks the process while trying to create
the connection. */
-int silc_net_create_connection(int port, char *host)
+int silc_net_create_connection(const char *local_ip, int port,
+ const char *host)
{
SOCKET sock;
int rval, err;
/* Do host lookup */
dest = gethostbyname(host);
if (!dest) {
- SILC_LOG_ERROR(("Network (%s) unreachable", host));
+ SILC_LOG_ERROR(("Network (%s) unreachable: could not resolve the "
+ "IP address", host));
return -1;
}
}
/* Set appropriate options */
+#if defined(TCP_NODELAY)
silc_net_set_socket_opt(sock, IPPROTO_TCP, TCP_NODELAY, 1);
+#endif
silc_net_set_socket_opt(sock, SOL_SOCKET, SO_KEEPALIVE, 1);
SILC_LOG_DEBUG(("Connection created"));
connection returns directly. To get the result of the connect() one
must select() the socket and read the result after it's ready. */
-/* XXX Is the socket on WIN32 always non-blocking? */
-
-int silc_net_create_connection_async(int port, char *host)
+int silc_net_create_connection_async(const char *local_ip, int port,
+ const char *host)
{
+ SOCKET sock;
+ int rval, err;
+ struct hostent *dest;
+ struct sockaddr_in desthost;
+
SILC_LOG_DEBUG(("Creating connection (async) to host %s port %d",
host, port));
- return silc_net_create_connection(port, host);
+ /* Do host lookup */
+ dest = gethostbyname(host);
+ if (!dest) {
+ SILC_LOG_ERROR(("Network (%s) unreachable: could not resolve the "
+ "IP address", host));
+ return -1;
+ }
+
+ /* Set socket information */
+ memset(&desthost, 0, sizeof(desthost));
+ desthost.sin_port = htons(port);
+ desthost.sin_family = AF_INET;
+ memcpy(&desthost.sin_addr, dest->h_addr_list[0], sizeof(desthost.sin_addr));
+
+ /* Create the connection socket */
+ sock = socket(AF_INET, SOCK_STREAM, 0);
+ if (sock == INVALID_SOCKET) {
+ SILC_LOG_ERROR(("Cannot create socket"));
+ return -1;
+ }
+
+ /* Connect to the host */
+ rval = connect(sock, (struct sockaddr *)&desthost, sizeof(desthost));
+ err = WSAGetLastError();
+ if (rval == SOCKET_ERROR && err != WSAEWOULDBLOCK) {
+ SILC_LOG_ERROR(("Cannot connect to remote host"));
+ shutdown(sock, 2);
+ closesocket(sock);
+ return -1;
+ }
+
+ /* Set socket to nonblocking mode */
+ silc_net_set_socket_nonblock(sock);
+
+ /* Set appropriate options */
+#if defined(TCP_NODELAY)
+ silc_net_set_socket_opt(sock, IPPROTO_TCP, TCP_NODELAY, 1);
+#endif
+ silc_net_set_socket_opt(sock, SOL_SOCKET, SO_KEEPALIVE, 1);
+
+ SILC_LOG_DEBUG(("Connection created"));
+
+ return sock;
}
/* Closes the connection by closing the socket connection. */
return ret != INADDR_NONE;
}
+/* Converts the IP number string from numbers-and-dots notation to
+ binary form in network byte order. */
+
+bool silc_net_addr2bin_ne(const char *addr, unsigned char *bin,
+ uint32 bin_len)
+{
+ unsigned long ret;
+
+ ret = inet_addr(addr);
+
+ if (bin_len < 4)
+ return FALSE;
+
+ SILC_PUT32_MSB(ret, bin);
+
+ return ret != INADDR_NONE;
+}
+
/* Set socket to non-blocking mode. */
int silc_net_set_socket_nonblock(int sock)
{
- return 0;
+ unsigned long on = 1;
+ return ioctlsocket(sock, FIONBIO, &on);
+}
+
+/* Init Winsock2. */
+
+bool silc_net_win32_init(void)
+{
+ int ret, sopt = SO_SYNCHRONOUS_NONALERT;
+ WSADATA wdata;
+ WORD ver = MAKEWORD(1, 1);
+
+ ret = WSAStartup(ver, &wdata);
+ if (ret)
+ return FALSE;
+
+ /* Allow using the SOCKET's as file descriptors so that we can poll
+ them with SILC Scheduler. */
+ ret = setsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE, (char *)&sopt,
+ sizeof(sopt));
+ if (ret)
+ return FALSE;
+
+ return TRUE;
+}
+
+/* Uninit Winsock2 */
+
+void silc_net_win32_uninit(void)
+{
+ WSACleanup();
}