Author: Pekka Riikonen <priikone@silcnet.org>
- Copyright (C) 1997 - 2001 Pekka Riikonen
+ Copyright (C) 1997 - 2005 Pekka Riikonen
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
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
*/
/* $Id$ */
-#include "silcincludes.h"
+/* XXX IPv6 support missing */
+
+#include "silc.h"
#include "silcnet.h"
/* This function creates server or daemon or listener or what ever. This
If argument `ip_addr' is NULL `any' address will be used. Returns
the created socket or -1 on error. */
-int silc_net_create_server(int port, char *ip_addr)
+int silc_net_create_server(int port, const char *ip_addr)
{
SOCKET sock;
int rval;
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;
}
connection returns directly. To get the result of the connect() one
must select() the socket and read the result after it's ready. */
-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;
/* 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;
}
/* Converts the IP number string from numbers-and-dots notation to
binary form. */
-bool silc_net_addr2bin(const char *addr, unsigned char *bin,
- uint32 bin_len)
+SilcBool silc_net_addr2bin(const char *addr, void *bin, SilcUInt32 bin_len)
{
unsigned long ret;
if (bin_len < 4)
return FALSE;
- SILC_PUT32_LSB(ret, bin);
-
+ memcpy(bin, (unsigned char *)&ret, 4);
return ret != INADDR_NONE;
}
/* Init Winsock2. */
-bool silc_net_win32_init(void)
+SilcBool silc_net_win32_init(void)
{
int ret, sopt = SO_SYNCHRONOUS_NONALERT;
WSADATA wdata;