X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Fsilcd%2Fprotocol.c;h=a7a1b707d7d1a39000626dbf555ac8f20a52cd2d;hb=d47a87b03b846e2333ef57b2c0d81f1644992964;hp=e8f55d87c9080b43dc02aec8eba1081629ff0e77;hpb=6493ad0f849286d972031f20c6eed45140d5e0a7;p=silc.git

diff --git a/apps/silcd/protocol.c b/apps/silcd/protocol.c
index e8f55d87..a7a1b707 100644
--- a/apps/silcd/protocol.c
+++ b/apps/silcd/protocol.c
@@ -653,6 +653,11 @@ SILC_TASK_CALLBACK(silc_server_protocol_key_exchange)
       if (ctx->timeout_task)
 	silc_schedule_task_del(server->schedule, ctx->timeout_task);
 
+      /* Assure that after calling final callback there cannot be pending
+	 executions for this protocol anymore. This just unregisters any 
+	 timeout callbacks for this protocol. */
+      silc_protocol_cancel(protocol, server->schedule);
+
       /* Call the final callback */
       if (protocol->final_callback)
 	silc_protocol_execute_final(protocol, server->schedule);
@@ -675,6 +680,11 @@ SILC_TASK_CALLBACK(silc_server_protocol_key_exchange)
     if (ctx->timeout_task)
       silc_schedule_task_del(server->schedule, ctx->timeout_task);
 
+    /* Assure that after calling final callback there cannot be pending
+       executions for this protocol anymore. This just unregisters any 
+       timeout callbacks for this protocol. */
+    silc_protocol_cancel(protocol, server->schedule);
+
     /* On error the final callback is always called. */
     if (protocol->final_callback)
       silc_protocol_execute_final(protocol, server->schedule);
@@ -693,6 +703,11 @@ SILC_TASK_CALLBACK(silc_server_protocol_key_exchange)
     if (ctx->timeout_task)
       silc_schedule_task_del(server->schedule, ctx->timeout_task);
 
+    /* Assure that after calling final callback there cannot be pending
+       executions for this protocol anymore. This just unregisters any 
+       timeout callbacks for this protocol. */
+    silc_protocol_cancel(protocol, server->schedule);
+    
     /* On error the final callback is always called. */
     if (protocol->final_callback)
       silc_protocol_execute_final(protocol, server->schedule);
@@ -891,7 +906,7 @@ SILC_TASK_CALLBACK(silc_server_protocol_connection_auth)
 
 	/* Remote end is client */
 	if (conn_type == SILC_SOCKET_TYPE_CLIENT) {
-	  SilcServerConfigSectionClientConnection *client = ctx->cconfig;
+	  SilcServerConfigSectionClient *client = ctx->cconfig;
 	  
 	  if (client) {
 	    switch(client->auth_meth) {
@@ -940,8 +955,8 @@ SILC_TASK_CALLBACK(silc_server_protocol_connection_auth)
 	      return;
 	    }
 	  } else {
-	    SILC_LOG_DEBUG(("No configuration for remote connection"));
-	    SILC_LOG_ERROR(("Remote connection not configured"));
+	    SILC_LOG_DEBUG(("No configuration for remote client connection"));
+	    SILC_LOG_ERROR(("Remote client connection not configured"));
 	    SILC_LOG_ERROR(("Authentication failed"));
 	    silc_free(auth_data);
 	    protocol->state = SILC_PROTOCOL_STATE_ERROR;
@@ -953,7 +968,7 @@ SILC_TASK_CALLBACK(silc_server_protocol_connection_auth)
 	
 	/* Remote end is server */
 	if (conn_type == SILC_SOCKET_TYPE_SERVER) {
-	  SilcServerConfigSectionServerConnection *serv = ctx->sconfig;
+	  SilcServerConfigSectionServer *serv = ctx->sconfig;
 	  
 	  if (serv) {
 	    switch(serv->auth_meth) {
@@ -1002,8 +1017,8 @@ SILC_TASK_CALLBACK(silc_server_protocol_connection_auth)
 	      return;
 	    }
 	  } else {
-	    SILC_LOG_DEBUG(("No configuration for remote connection"));
-	    SILC_LOG_ERROR(("Remote connection not configured"));
+	    SILC_LOG_DEBUG(("No configuration for remote server connection"));
+	    SILC_LOG_ERROR(("Remote server connection not configured"));
 	    SILC_LOG_ERROR(("Authentication failed"));
 	    protocol->state = SILC_PROTOCOL_STATE_ERROR;
 	    silc_protocol_execute(protocol, server->schedule, 
@@ -1015,7 +1030,7 @@ SILC_TASK_CALLBACK(silc_server_protocol_connection_auth)
 	
 	/* Remote end is router */
 	if (conn_type == SILC_SOCKET_TYPE_ROUTER) {
-	  SilcServerConfigSectionServerConnection *serv = ctx->rconfig;
+	  SilcServerConfigSectionRouter *serv = ctx->rconfig;
 
 	  if (serv) {
 	    switch(serv->auth_meth) {
@@ -1064,8 +1079,8 @@ SILC_TASK_CALLBACK(silc_server_protocol_connection_auth)
 	      return;
 	    }
 	  } else {
-	    SILC_LOG_DEBUG(("No configuration for remote connection"));
-	    SILC_LOG_ERROR(("Remote connection not configured"));
+	    SILC_LOG_DEBUG(("No configuration for remote router connection"));
+	    SILC_LOG_ERROR(("Remote router connection not configured"));
 	    SILC_LOG_ERROR(("Authentication failed"));
 	    silc_free(auth_data);
 	    protocol->state = SILC_PROTOCOL_STATE_ERROR;
@@ -1171,6 +1186,11 @@ SILC_TASK_CALLBACK(silc_server_protocol_connection_auth)
       if (ctx->timeout_task)
 	silc_schedule_task_del(server->schedule, ctx->timeout_task);
 
+      /* Assure that after calling final callback there cannot be pending
+	 executions for this protocol anymore. This just unregisters any 
+	 timeout callbacks for this protocol. */
+      silc_protocol_cancel(protocol, server->schedule);
+    
       /* Protocol has ended, call the final callback */
       if (protocol->final_callback)
 	silc_protocol_execute_final(protocol, server->schedule);
@@ -1197,6 +1217,11 @@ SILC_TASK_CALLBACK(silc_server_protocol_connection_auth)
       if (ctx->timeout_task)
 	silc_schedule_task_del(server->schedule, ctx->timeout_task);
 
+      /* Assure that after calling final callback there cannot be pending
+	 executions for this protocol anymore. This just unregisters any 
+	 timeout callbacks for this protocol. */
+      silc_protocol_cancel(protocol, server->schedule);
+    
       /* On error the final callback is always called. */
       if (protocol->final_callback)
 	silc_protocol_execute_final(protocol, server->schedule);
@@ -1216,6 +1241,11 @@ SILC_TASK_CALLBACK(silc_server_protocol_connection_auth)
     if (ctx->timeout_task)
       silc_schedule_task_del(server->schedule, ctx->timeout_task);
 
+    /* Assure that after calling final callback there cannot be pending
+       executions for this protocol anymore. This just unregisters any 
+       timeout callbacks for this protocol. */
+    silc_protocol_cancel(protocol, server->schedule);
+    
     /* On error the final callback is always called. */
     if (protocol->final_callback)
       silc_protocol_execute_final(protocol, server->schedule);
@@ -1585,6 +1615,11 @@ SILC_TASK_CALLBACK(silc_server_protocol_rekey)
        encrypted with the new key so set the decryption key to the new key */
     silc_server_protocol_rekey_generate(server, ctx, FALSE);
 
+    /* Assure that after calling final callback there cannot be pending
+       executions for this protocol anymore. This just unregisters any 
+       timeout callbacks for this protocol. */
+    silc_protocol_cancel(protocol, server->schedule);
+    
     /* Protocol has ended, call the final callback */
     if (protocol->final_callback)
       silc_protocol_execute_final(protocol, server->schedule);
@@ -1602,6 +1637,11 @@ SILC_TASK_CALLBACK(silc_server_protocol_rekey)
       silc_ske_abort(ctx->ske, ctx->ske->status);
     }
 
+    /* Assure that after calling final callback there cannot be pending
+       executions for this protocol anymore. This just unregisters any 
+       timeout callbacks for this protocol. */
+    silc_protocol_cancel(protocol, server->schedule);
+    
     /* On error the final callback is always called. */
     if (protocol->final_callback)
       silc_protocol_execute_final(protocol, server->schedule);
@@ -1614,6 +1654,11 @@ SILC_TASK_CALLBACK(silc_server_protocol_rekey)
      * We have received failure from remote
      */
 
+    /* Assure that after calling final callback there cannot be pending
+       executions for this protocol anymore. This just unregisters any 
+       timeout callbacks for this protocol. */
+    silc_protocol_cancel(protocol, server->schedule);
+    
     /* On error the final callback is always called. */
     if (protocol->final_callback)
       silc_protocol_execute_final(protocol, server->schedule);