projects
/
silc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5cf2f96
)
Destroy FSM in destructor.
author
Pekka Riikonen
<priikone@silcnet.org>
Fri, 30 Jun 2006 18:32:51 +0000
(18:32 +0000)
committer
Pekka Riikonen
<priikone@silcnet.org>
Fri, 30 Jun 2006 18:32:51 +0000
(18:32 +0000)
lib/silcske/silcconnauth.c
patch
|
blob
|
history
diff --git
a/lib/silcske/silcconnauth.c
b/lib/silcske/silcconnauth.c
index 368b2aa75b1ff8e608298a3209e58804595806dc..e47be82b56fcf9206098f5bb9b2f5604d055451c 100644
(file)
--- a/
lib/silcske/silcconnauth.c
+++ b/
lib/silcske/silcconnauth.c
@@
-31,7
+31,7
@@
static SilcBool silc_connauth_packet_receive(SilcPacketEngine engine,
/* Connection authentication context */
struct SilcConnAuthStruct {
SilcSKE ske;
/* Connection authentication context */
struct SilcConnAuthStruct {
SilcSKE ske;
- SilcFSM
Struct
fsm;
+ SilcFSM fsm;
SilcConnectionType conn_type;
SilcAuthMethod auth_method;
void *auth_data;
SilcConnectionType conn_type;
SilcAuthMethod auth_method;
void *auth_data;
@@
-66,7
+66,7
@@
static SilcBool silc_connauth_packet_receive(SilcPacketEngine engine,
{
SilcConnAuth connauth = callback_context;
connauth->packet = packet;
{
SilcConnAuth connauth = callback_context;
connauth->packet = packet;
- silc_fsm_continue(
&
connauth->fsm);
+ silc_fsm_continue(connauth->fsm);
return TRUE;
}
return TRUE;
}
@@
-172,7
+172,7
@@
SILC_TASK_CALLBACK(silc_connauth_timeout)
SilcConnAuth connauth = context;
SILC_LOG_DEBUG(("Protocol timeout"));
connauth->aborted = TRUE;
SilcConnAuth connauth = context;
SILC_LOG_DEBUG(("Protocol timeout"));
connauth->aborted = TRUE;
- silc_fsm_continue_sync(
&
connauth->fsm);
+ silc_fsm_continue_sync(connauth->fsm);
}
/* SKR callback */
}
/* SKR callback */
@@
-188,7
+188,15
@@
static void silc_connauth_skr_callback(SilcSKR skr, SilcSKRFind find,
connauth->public_keys = results;
connauth->skr_status = status;
connauth->public_keys = results;
connauth->skr_status = status;
- SILC_FSM_CALL_CONTINUE(&connauth->fsm);
+ SILC_FSM_CALL_CONTINUE(connauth->fsm);
+}
+
+/* FSM destructor */
+
+static void silc_connauth_fsm_destructor(SilcFSM fsm, void *fsm_context,
+ void *destructor_context)
+{
+ silc_fsm_free(fsm);
}
}
@@
-209,7
+217,9
@@
SilcConnAuth silc_connauth_alloc(SilcSchedule schedule,
if (!connauth)
return NULL;
if (!connauth)
return NULL;
- if (!silc_fsm_init(&connauth->fsm, connauth, NULL, NULL, schedule)) {
+ connauth->fsm = silc_fsm_alloc(connauth, silc_connauth_fsm_destructor,
+ NULL, schedule);
+ if (!connauth->fsm) {
silc_connauth_free(connauth);
return NULL;
}
silc_connauth_free(connauth);
return NULL;
}
@@
-344,13
+354,13
@@
SILC_FSM_STATE(silc_connauth_st_initiator_result)
}
silc_packet_free(connauth->packet);
}
silc_packet_free(connauth->packet);
- /* Call completion callback */
- connauth->completion(connauth, connauth->success, connauth->context);
-
silc_packet_stream_unlink(connauth->ske->stream,
&silc_connauth_stream_cbs, connauth);
silc_schedule_task_del_by_context(silc_fsm_get_schedule(fsm), connauth);
silc_packet_stream_unlink(connauth->ske->stream,
&silc_connauth_stream_cbs, connauth);
silc_schedule_task_del_by_context(silc_fsm_get_schedule(fsm), connauth);
+ /* Call completion callback */
+ connauth->completion(connauth, connauth->success, connauth->context);
+
return SILC_FSM_FINISH;
}
return SILC_FSM_FINISH;
}
@@
-412,7
+422,7
@@
silc_connauth_initiator(SilcConnAuth connauth,
/* Start the protocol */
op = silc_async_alloc(silc_connauth_abort, NULL, connauth);
/* Start the protocol */
op = silc_async_alloc(silc_connauth_abort, NULL, connauth);
- silc_fsm_start(
&
connauth->fsm, silc_connauth_st_initiator_start);
+ silc_fsm_start(connauth->fsm, silc_connauth_st_initiator_start);
return op;
}
return op;
}
@@
-688,7
+698,7
@@
silc_connauth_responder(SilcConnAuth connauth,
/* Start the protocol */
op = silc_async_alloc(silc_connauth_abort, NULL, connauth);
/* Start the protocol */
op = silc_async_alloc(silc_connauth_abort, NULL, connauth);
- silc_fsm_start(
&
connauth->fsm, silc_connauth_st_responder_start);
+ silc_fsm_start(connauth->fsm, silc_connauth_st_responder_start);
return op;
}
return op;
}