projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged silc_1_1_branch to trunk.
[silc.git]
/
lib
/
silcutil
/
unix
/
silcunixnet.c
diff --git
a/lib/silcutil/unix/silcunixnet.c
b/lib/silcutil/unix/silcunixnet.c
index 76eba36ea17fcb1b2df1fe2600d6b4a5f55c6df9..e0befdc19979ca325a83cd39b6da9015e34a28f8 100644
(file)
--- a/
lib/silcutil/unix/silcunixnet.c
+++ b/
lib/silcutil/unix/silcunixnet.c
@@
-114,7
+114,6
@@
SILC_TASK_CALLBACK(silc_net_accept)
return;
/* Set socket options */
return;
/* Set socket options */
- silc_net_set_socket_nonblock(sock);
silc_net_set_socket_opt(sock, SOL_SOCKET, SO_REUSEADDR, 1);
/* Create socket stream */
silc_net_set_socket_opt(sock, SOL_SOCKET, SO_REUSEADDR, 1);
/* Create socket stream */
@@
-165,8
+164,8
@@
silc_net_tcp_create_listener(const char **local_ip_addr,
/* Bind to local addresses */
for (i = 0; i < local_ip_count; i++) {
/* 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,
/* Set sockaddr for server */
if (!silc_net_set_sockaddr(&server,
@@
-298,9
+297,6
@@
silc_net_udp_connect(const char *local_ip_addr, int local_port,
goto err;
}
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 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))
@@
-595,6
+591,7
@@
static void silc_net_connect_wait_stream(SilcSocketStreamStatus status,
SilcStream stream, void *context)
{
SilcNetConnect conn = context;
SilcStream stream, void *context)
{
SilcNetConnect conn = context;
+ conn->sop = NULL;
conn->stream_status = status;
conn->stream = stream;
SILC_FSM_CALL_CONTINUE(&conn->fsm);
conn->stream_status = status;
conn->stream = stream;
SILC_FSM_CALL_CONTINUE(&conn->fsm);
@@
-631,20
+628,20
@@
SILC_FSM_STATE(silc_net_connect_st_connected)
}
#if defined(ECONNREFUSED)
}
#if defined(ECONNREFUSED)
- if (
errno
== ECONNREFUSED)
+ if (
opt
== ECONNREFUSED)
conn->status = SILC_NET_CONNECTION_REFUSED;
#endif /* ECONNREFUSED */
#if defined(ETIMEDOUT)
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)
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 */
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_fsm_next(fsm, silc_net_connect_st_finish);
return SILC_FSM_CONTINUE;
}
@@
-654,8
+651,7
@@
SILC_FSM_STATE(silc_net_connect_st_connected)
/** Connection created */
silc_fsm_next(fsm, silc_net_connect_st_stream);
SILC_FSM_CALL((conn->sop = silc_socket_tcp_stream_create(
/** 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)));
}
silc_net_connect_wait_stream, conn)));
}
@@
-681,11
+677,6
@@
SILC_FSM_STATE(silc_net_connect_st_stream)
return SILC_FSM_CONTINUE;
}
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, sock %d", conn->sock));
conn->status = SILC_NET_OK;
/** Stream created successfully */
SILC_LOG_DEBUG(("Connected successfully, sock %d", conn->sock));
conn->status = SILC_NET_OK;
@@
-702,8
+693,6
@@
SILC_FSM_STATE(silc_net_connect_st_finish)
conn->callback(conn->status, conn->stream, conn->context);
if (conn->op)
silc_async_free(conn->op);
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;
}
return SILC_FSM_FINISH;
@@
-715,8
+704,10
@@
static void silc_net_connect_abort(SilcAsyncOperation op, void *context)
conn->aborted = TRUE;
/* Abort underlaying stream creation too */
conn->aborted = TRUE;
/* Abort underlaying stream creation too */
- if (conn->sop)
+ if (conn->sop)
{
silc_async_abort(conn->sop, NULL, NULL);
silc_async_abort(conn->sop, NULL, NULL);
+ conn->sop = NULL;
+ }
}
static void silc_net_connect_destructor(SilcFSM fsm, void *fsm_context,
}
static void silc_net_connect_destructor(SilcFSM fsm, void *fsm_context,