const unsigned char *data,
SilcUInt32 data_len);
-static void silc_ske_notify_failure(SilcSKE ske);
+/*
+ * Notify the owner of the ske that we failed. Ensures that we don't make the
+ * same callout twice, as the notification callback routines are not designed
+ * to handle that case.
+ */
+static void silc_ske_notify_failure(SilcSKE ske)
+{
+ SILC_LOG_DEBUG(("Notifying SKE %p owner of failure (failure_notified = %d)",
+ ske, ske->failure_notified));
+
+ /*
+ * First, check if we have already made a failure callout. If so, then we
+ * will stop here.
+ */
+ if (ske->failure_notified)
+ return;
+
+ /*
+ * Mark ourselves as having already sent the failure notification here and
+ * now.
+ */
+ ske->failure_notified = TRUE;
+
+ SILC_LOG_DEBUG(("Deliver failure notification for SKE %p (%s)",
+ ske, ske->responder ? "responder" : "initiator"));
+
+ /*
+ * Finally, make the call to the owner's registered failure callback.
+ */
+ if (ske->responder)
+ silc_fsm_next(&ske->fsm, silc_ske_st_responder_failure);
+ else
+ silc_fsm_next(&ske->fsm, silc_ske_st_initiator_failure);
+}
+
/* Packet callback */
static SilcBool silc_ske_packet_receive(SilcPacketEngine engine,
}
/* See if received failure from remote */
- if (packet->type == SILC_PACKET_FAILURE) {
+ if (packet->type == SILC_PACKET_FAILURE)
silc_ske_notify_failure(ske);
- }
/* Handle rekey and SUCCESS packets synchronously. After SUCCESS packets
they keys are taken into use immediately, hence the synchronous
void *destructor_context)
{
SilcSKE ske = fsm_context;
- ske->fsm_finished = TRUE;
- silc_ske_free(ske);
+ silc_ske_free(ske);
}
/* Key exchange timeout task callback */
if (!ske)
return;
- SILC_LOG_DEBUG(("Freeing Key Exchange object %p: aborted=%u refcount=%hu", ske, ske->aborted, ske->refcnt));
-
- if (ske->aborted) {
- /*
- * If already aborted, destroy the session immediately. Only do the
- * notification work if we have not already though, as doing so twice
- * results in memory corruption. We may have silc_ske_free called
- * twice, once when the abort is requested, and then again when the
- * FSM finish routine is called. We have to be prepared to handle
- * that case.
- */
+ SILC_LOG_DEBUG(("Freeing Key Exchange object %p: aborted=%u refcount=%hu",
+ ske, ske->aborted, ske->refcnt));
- ske->packet = NULL;
- ske->status = SILC_SKE_STATUS_ERROR;
+ if (ske->aborted) {
+ /*
+ * If already aborted, destroy the session immediately. Only do the
+ * notification work if we have not already though, as doing so twice
+ * results in memory corruption. We may have silc_ske_free called
+ * twice, once when the abort is requested, and then again when the
+ * FSM finish routine is called. We have to be prepared to handle
+ * that case.
+ */
+ ske->packet = NULL;
+ ske->status = SILC_SKE_STATUS_ERROR;
- silc_ske_notify_failure(ske);
+ silc_ske_notify_failure(ske);
- if (!ske->fsm_finished)
- silc_fsm_continue_sync(&ske->fsm);
- else
- SILC_LOG_DEBUG(("Not continuing FSM as it's finished for SKE %p", ske));
- }
+ if (silc_fsm_is_started(&ske->fsm))
+ silc_fsm_continue_sync(&ske->fsm);
+ else
+ SILC_LOG_DEBUG(("Not continuing FSM as it's finished for SKE %p", ske));
+ }
ske->refcnt--;
if (ske->refcnt > 0)
if (ske->packet && silc_buffer_len(&ske->packet->buffer) == 4) {
SILC_GET32_MSB(error, ske->packet->buffer.data);
- ske->status = error;
silc_packet_free(ske->packet);
ske->packet = NULL;
}
+ ske->status = error;
SILC_LOG_DEBUG(("Error %s (%d) received during key exchange",
silc_ske_map_status(ske->status), ske->status));
SilcSKEParams params,
SilcSKEStartPayload start_payload)
{
- SILC_LOG_DEBUG(("Start SKE %p as initiator; stream=%p; params=%p; start_payload=%p", ske, stream, params, start_payload));
+ SILC_LOG_DEBUG(("Start SKE %p as initiator; stream=%p; params=%p; "
+ "start_payload=%p", ske, stream, params, start_payload));
if (!ske || !stream || !params || !params->version)
return NULL;
if (ske->packet && silc_buffer_len(&ske->packet->buffer) == 4) {
SILC_GET32_MSB(error, ske->packet->buffer.data);
- ske->status = error;
silc_packet_free(ske->packet);
ske->packet = NULL;
}
+ ske->status = error;
silc_packet_stream_unlink(ske->stream, &silc_ske_stream_cbs, ske);
silc_schedule_task_del_by_context(ske->schedule, ske);
{
return ske->keymat;
}
-
-/*
- * Notify the owner of the ske that we failed. Ensures that we don't make the
- * same callout twice, as the notification callback routines are not designed
- * to handle that case.
- */
-static void silc_ske_notify_failure(SilcSKE ske)
-{
- SILC_LOG_DEBUG(("Notifying SKE %p owner of failure (failure_notified = %lu)", ske, ske->failure_notified));
-
- /*
- * First, check if we have already made a failure callout. If so, then we
- * will stop here.
- */
-
- if (ske->failure_notified)
- return;
-
- /*
- * Mark ourselves as having already sent the failure notification here and
- * now.
- */
-
- ske->failure_notified = TRUE;
-
- SILC_LOG_DEBUG(("Actually calling real failure notify callback for SKE %p (responder = %s)", ske, ske->responder ? "TRUE" : "FALSE"));
-
- /*
- * Finally, make the call to the owner's registered failure callback.
- */
-
- if (ske->responder)
- silc_fsm_next(&ske->fsm, silc_ske_st_responder_failure);
- else
- silc_fsm_next(&ske->fsm, silc_ske_st_initiator_failure);
-}
-