Author: Pekka Riikonen <priikone@silcnet.org>
- Copyright (C) 1997 - 2006 Pekka Riikonen
+ Copyright (C) 1997 - 2007 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
#include "silc.h"
#include "silcnet.h"
+/************************** Types and definitions ***************************/
+
#ifdef HAVE_IPV6
#define SIZEOF_SOCKADDR(so) ((so).sa.sa_family == AF_INET6 ? \
sizeof(so.sin6) : sizeof(so.sin))
#endif
} SilcSockaddr;
+/************************ Static utility functions **************************/
+
static SilcBool silc_net_set_sockaddr(SilcSockaddr *addr, const char *ip_addr,
int port)
{
return TRUE;
}
+/****************************** TCP Listener ********************************/
+
/* Deliver new stream to upper layer */
static void silc_net_accept_stream(SilcSocketStreamStatus status,
return;
/* Set socket options */
- silc_net_set_socket_nonblock(sock);
silc_net_set_socket_opt(sock, SOL_SOCKET, SO_REUSEADDR, 1);
/* Create socket stream */
goto err;
listener = silc_calloc(1, sizeof(*listener));
- if (!listener) {
- callback(SILC_NET_NO_MEMORY, NULL, context);
+ if (!listener)
return NULL;
- }
listener->schedule = schedule;
listener->callback = callback;
listener->context = context;
if (local_ip_count > 0) {
listener->socks = silc_calloc(local_ip_count, sizeof(*listener->socks));
- if (!listener->socks) {
- callback(SILC_NET_NO_MEMORY, NULL, context);
+ if (!listener->socks)
return NULL;
- }
} else {
listener->socks = silc_calloc(1, sizeof(*listener->socks));
- if (!listener->socks) {
- callback(SILC_NET_NO_MEMORY, NULL, context);
+ if (!listener->socks)
return NULL;
- }
local_ip_count = 1;
}
/* Bind to local addresses */
for (i = 0; i < local_ip_count; i++) {
- SILC_LOG_DEBUG(("Binding to local address %s",
- local_ip_addr ? local_ip_addr[i] : ipany));
+ SILC_LOG_DEBUG(("Binding to local address %s:%d",
+ local_ip_addr ? local_ip_addr[i] : ipany, port));
/* Set sockaddr for server */
if (!silc_net_set_sockaddr(&server,
rval = silc_net_set_socket_opt(sock, SOL_SOCKET, SO_REUSEADDR, 1);
if (rval < 0) {
SILC_LOG_ERROR(("Cannot set socket options: %s", strerror(errno)));
+ close(sock);
goto err;
}
/* Bind the listener socket */
rval = bind(sock, &server.sa, SIZEOF_SOCKADDR(server));
if (rval < 0) {
- SILC_LOG_DEBUG(("Cannot bind socket: %s", strerror(errno)));
+ SILC_LOG_ERROR(("Cannot bind socket: %s", strerror(errno)));
+ close(sock);
goto err;
}
/* Specify that we are listenning */
- rval = listen(sock, 5);
+ rval = listen(sock, 64);
if (rval < 0) {
SILC_LOG_ERROR(("Cannot set socket listenning: %s", strerror(errno)));
+ close(sock);
goto err;
}
return listener;
err:
- if (callback)
- callback(SILC_NET_ERROR, NULL, context);
if (listener)
silc_net_close_listener(listener);
return NULL;
silc_free(listener);
}
+/******************************* UDP Stream *********************************/
+
/* Create UDP stream */
SilcStream
goto err;
}
- /* Set socket to non-blocking mode */
- silc_net_set_socket_nonblock(sock);
-
/* Set to connected state if remote address is provided. */
if (remote_ip_addr && remote_port) {
if (!silc_net_set_sockaddr(&server, remote_ip_addr, remote_port))
/* Set send and receive buffer size */
#ifdef SO_SNDBUF
- rval = silc_net_set_socket_opt(sock, SOL_SOCKET, SO_SNDBUF, 65535);
+ rval = silc_net_set_socket_opt(sock, SOL_SOCKET, SO_SNDBUF, 765535);
if (rval < 0) {
- SILC_LOG_ERROR(("Cannot set socket options: %s", strerror(errno)));
- goto err;
+ rval = silc_net_set_socket_opt(sock, SOL_SOCKET, SO_SNDBUF, 65535);
+ if (rval < 0) {
+ SILC_LOG_ERROR(("Cannot set socket options: %s", strerror(errno)));
+ goto err;
+ }
}
#endif /* SO_SNDBUF */
#ifdef SO_RCVBUF
- rval = silc_net_set_socket_opt(sock, SOL_SOCKET, SO_RCVBUF, 65535);
+ rval = silc_net_set_socket_opt(sock, SOL_SOCKET, SO_RCVBUF, 765535);
if (rval < 0) {
- SILC_LOG_ERROR(("Cannot set socket options: %s", strerror(errno)));
- goto err;
+ rval = silc_net_set_socket_opt(sock, SOL_SOCKET, SO_RCVBUF, 65535);
+ if (rval < 0) {
+ SILC_LOG_ERROR(("Cannot set socket options: %s", strerror(errno)));
+ goto err;
+ }
}
#endif /* SO_RCVBUF */
remote_ip_addr_size);
}
- SILC_LOG_DEBUG(("UDP packet from %s:%d", remote_ip_addr, remote_port));
+ SILC_LOG_DEBUG(("UDP packet from %s:%d", remote_ip_addr, *remote_port));
}
return len;
}
SILC_LOG_DEBUG(("Sent data %d bytes", ret));
- silc_schedule_set_listen_fd(sock->schedule, sock->sock,
- SILC_TASK_READ, FALSE);
+ if (silc_schedule_get_fd_events(sock->schedule, sock->sock) &
+ SILC_TASK_WRITE)
+ silc_schedule_set_listen_fd(sock->schedule, sock->sock,
+ SILC_TASK_READ, FALSE);
return ret;
}
+/******************************* TCP Stream *********************************/
+
/* Asynchronous TCP/IP connecting */
typedef struct {
SilcSocketStreamStatus stream_status;
SilcStream stream;
SilcFSMStruct fsm;
- SilcFSMSemaStruct sema;
+ SilcFSMEventStruct event;
SilcAsyncOperation op;
SilcAsyncOperation sop;
char *local_ip;
SILC_TASK_CALLBACK(silc_net_connect_wait)
{
SilcNetConnect conn = context;
- SILC_FSM_SEMA_POST(&conn->sema);
- silc_schedule_task_del_by_fd(schedule, conn->sock);
+ SILC_FSM_EVENT_SIGNAL(&conn->event);
}
SILC_FSM_STATE(silc_net_connect_st_start)
rval = connect(sock, &desthost.sa, SIZEOF_SOCKADDR(desthost));
if (rval < 0) {
if (errno != EINPROGRESS) {
- /* retry using an IPv4 adress, if IPv6 didn't work */
- if (prefer_ipv6 && silc_net_is_ip6(conn->ip_addr)) {
- shutdown(sock, 2);
- close(sock);
+ shutdown(sock, 2);
+ close(sock);
+ /* Retry using an IPv4 adress, if IPv6 didn't work */
+ if (prefer_ipv6 && silc_net_is_ip6(conn->ip_addr)) {
prefer_ipv6 = FALSE;
goto retry;
}
- shutdown(sock, 2);
- close(sock);
-
/** Cannot connect to remote host */
SILC_LOG_ERROR(("Cannot connect to remote host: %s", strerror(errno)));
silc_fsm_next(fsm, silc_net_connect_st_finish);
/** Wait for connection */
silc_fsm_next(fsm, silc_net_connect_st_connected);
- silc_fsm_sema_init(&conn->sema, fsm, 0);
+ silc_fsm_event_init(&conn->event, fsm);
silc_schedule_task_add_fd(silc_fsm_get_schedule(fsm), sock,
silc_net_connect_wait, conn);
silc_schedule_set_listen_fd(silc_fsm_get_schedule(fsm), sock,
SILC_TASK_WRITE, FALSE);
- SILC_FSM_SEMA_WAIT(&conn->sema);
+ SILC_FSM_EVENT_WAIT(&conn->event);
return SILC_FSM_CONTINUE;
}
SilcStream stream, void *context)
{
SilcNetConnect conn = context;
+ conn->sop = NULL;
conn->stream_status = status;
conn->stream = stream;
SILC_FSM_CALL_CONTINUE(&conn->fsm);
if (conn->aborted) {
/** Aborted */
+ silc_schedule_unset_listen_fd(schedule, conn->sock);
+ silc_schedule_task_del_by_fd(schedule, conn->sock);
silc_fsm_next(fsm, silc_net_connect_st_finish);
return SILC_FSM_CONTINUE;
}
ret = silc_net_get_socket_opt(conn->sock, SOL_SOCKET, SO_ERROR,
&opt, &optlen);
- silc_schedule_task_del_by_fd(schedule, conn->sock);
silc_schedule_unset_listen_fd(schedule, conn->sock);
+ silc_schedule_task_del_by_fd(schedule, conn->sock);
if (ret != 0 || opt != 0) {
if (conn->retry) {
}
#if defined(ECONNREFUSED)
- if (errno == ECONNREFUSED)
+ if (opt == ECONNREFUSED)
conn->status = SILC_NET_CONNECTION_REFUSED;
#endif /* ECONNREFUSED */
#if defined(ETIMEDOUT)
- if (errno == ETIMEDOUT)
+ if (opt == ETIMEDOUT)
conn->status = SILC_NET_CONNECTION_TIMEOUT;
#endif /* ETIMEDOUT */
#if defined(ENETUNREACH)
- if (errno == ENETUNREACH)
+ if (opt == ENETUNREACH)
conn->status = SILC_NET_HOST_UNREACHABLE;
#endif /* ENETUNREACH */
/** Connecting failed */
- SILC_LOG_DEBUG(("Connecting failed"));
+ SILC_LOG_DEBUG(("Connecting failed, error %s", strerror(opt)));
silc_fsm_next(fsm, silc_net_connect_st_finish);
return SILC_FSM_CONTINUE;
}
+ SILC_LOG_DEBUG(("TCP connection established"));
+
/** Connection created */
silc_fsm_next(fsm, silc_net_connect_st_stream);
SILC_FSM_CALL((conn->sop = silc_socket_tcp_stream_create(
- conn->sock, FALSE, FALSE,
- schedule,
+ conn->sock, TRUE, FALSE, schedule,
silc_net_connect_wait_stream, conn)));
}
return SILC_FSM_CONTINUE;
}
- /* Set stream information */
- silc_socket_stream_set_info(conn->stream,
- !silc_net_is_ip(conn->remote) ? conn->remote :
- conn->ip_addr, conn->ip_addr, conn->port);
-
/** Stream created successfully */
- SILC_LOG_DEBUG(("Connected successfully"));
+ SILC_LOG_DEBUG(("Connected successfully, sock %d", conn->sock));
conn->status = SILC_NET_OK;
silc_fsm_next(fsm, silc_net_connect_st_finish);
return SILC_FSM_CONTINUE;
conn->callback(conn->status, conn->stream, conn->context);
if (conn->op)
silc_async_free(conn->op);
- if (conn->sop)
- silc_async_free(conn->sop);
}
return SILC_FSM_FINISH;
conn->aborted = TRUE;
/* Abort underlaying stream creation too */
- if (conn->sop)
- silc_async_abort(conn->op, NULL, NULL);
+ if (conn->sop) {
+ silc_async_abort(conn->sop, NULL, NULL);
+ conn->sop = NULL;
+ }
}
static void silc_net_connect_destructor(SilcFSM fsm, void *fsm_context,
/* Start async operation */
conn->op = silc_async_alloc(silc_net_connect_abort, NULL, conn);
if (!conn->op) {
+ silc_free(conn);
callback(SILC_NET_NO_MEMORY, NULL, context);
return NULL;
}
conn->local_ip = strdup(local_ip_addr);
conn->remote = strdup(remote_ip_addr);
if (!conn->remote) {
+ silc_async_free(conn->op);
+ silc_free(conn->local_ip);
+ silc_free(conn);
callback(SILC_NET_NO_MEMORY, NULL, context);
return NULL;
}
void silc_net_close_connection(int sock)
{
+ SILC_LOG_DEBUG(("Closing sock %d", sock));
close(sock);
}
/* Set's the socket to non-blocking mode. */
-int silc_net_set_socket_nonblock(int sock)
+int silc_net_set_socket_nonblock(SilcSocket sock)
{
- return fcntl(sock, F_SETFL, fcntl(sock, F_GETFL, 0) | O_NONBLOCK);
+ return fcntl((int)sock, F_SETFL, fcntl(sock, F_GETFL, 0) | O_NONBLOCK);
}
/* Converts the IP number string from numbers-and-dots notation to
projects / silc.git / blobdiff