projects
/
silc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e6e5104
)
Fixed FD task deleting in TCP connecting.
author
Pekka Riikonen
<priikone@silcnet.org>
Wed, 14 Feb 2007 14:45:41 +0000
(14:45 +0000)
committer
Pekka Riikonen
<priikone@silcnet.org>
Wed, 14 Feb 2007 14:45:41 +0000
(14:45 +0000)
lib/silcutil/unix/silcunixnet.c
patch
|
blob
|
history
diff --git
a/lib/silcutil/unix/silcunixnet.c
b/lib/silcutil/unix/silcunixnet.c
index f7ddb18db0449e86f623301246c150b295856dc2..ba1736ddee769a219d94ead785bbb0f0c7925760 100644
(file)
--- a/
lib/silcutil/unix/silcunixnet.c
+++ b/
lib/silcutil/unix/silcunixnet.c
@@
-476,7
+476,6
@@
SILC_TASK_CALLBACK(silc_net_connect_wait)
{
SilcNetConnect conn = context;
SILC_FSM_EVENT_SIGNAL(&conn->event);
{
SilcNetConnect conn = context;
SILC_FSM_EVENT_SIGNAL(&conn->event);
- silc_schedule_task_del_by_fd(schedule, conn->sock);
}
SILC_FSM_STATE(silc_net_connect_st_start)
}
SILC_FSM_STATE(silc_net_connect_st_start)
@@
-601,6
+600,8
@@
SILC_FSM_STATE(silc_net_connect_st_connected)
if (conn->aborted) {
/** Aborted */
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;
}
silc_fsm_next(fsm, silc_net_connect_st_finish);
return SILC_FSM_CONTINUE;
}
@@
-608,8
+609,8
@@
SILC_FSM_STATE(silc_net_connect_st_connected)
ret = silc_net_get_socket_opt(conn->sock, SOL_SOCKET, SO_ERROR,
&opt, &optlen);
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_unset_listen_fd(schedule, conn->sock);
+ silc_schedule_task_del_by_fd(schedule, conn->sock);
if (ret != 0 || opt != 0) {
if (conn->retry) {
if (ret != 0 || opt != 0) {
if (conn->retry) {