updates.

[silc.git] / lib / silcclient / protocol.c

diff --git a/lib/silcclient/protocol.c b/lib/silcclient/protocol.c
index ecfa193cd729231badf5c00e86f387a678daf644..5ba28db6e17e507543753da37c5ec0e8539636e6 100644 (file)
--- a/lib/silcclient/protocol.c
+++ b/lib/silcclient/protocol.c
@@ -244,7 +244,7 @@ static void silc_client_protocol_ke_continue(SilcSKE ske,
     }
     
     protocol->state = SILC_PROTOCOL_STATE_ERROR;
-    silc_protocol_execute(protocol, client->timeout_queue, 0, 0);
+    silc_protocol_execute(protocol, client->schedule, 0, 0);
     return;
   }
 
@@ -264,7 +264,7 @@ static void silc_client_protocol_ke_continue(SilcSKE ske,
      function. */
   if (ctx->responder == TRUE) {
     protocol->state++;
-    silc_protocol_execute(protocol, client->timeout_queue, 0, 100000);
+    silc_protocol_execute(protocol, client->schedule, 0, 100000);
   }
 }
 
@@ -336,14 +336,14 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange)
                        status));
 
        protocol->state = SILC_PROTOCOL_STATE_ERROR;
-       silc_protocol_execute(protocol, client->timeout_queue, 0, 0);
+       silc_protocol_execute(protocol, client->schedule, 0, 0);
        return;
       }
 
       /* Advance protocol state and call the next state if we are responder */
       protocol->state++;
       if (ctx->responder == TRUE)
-       silc_protocol_execute(protocol, client->timeout_queue, 0, 100000);
+       silc_protocol_execute(protocol, client->schedule, 0, 100000);
     }
     break;
   case 2:
@@ -371,14 +371,14 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange)
                        status));
 
        protocol->state = SILC_PROTOCOL_STATE_ERROR;
-       silc_protocol_execute(protocol, client->timeout_queue, 0, 0);
+       silc_protocol_execute(protocol, client->schedule, 0, 0);
        return;
       }
 
       /* Advance protocol state and call next state if we are initiator */
       protocol->state++;
       if (ctx->responder == FALSE)
-       silc_protocol_execute(protocol, client->timeout_queue, 0, 100000);
+       silc_protocol_execute(protocol, client->schedule, 0, 100000);
     }
     break;
   case 3:
@@ -413,7 +413,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange)
                        status));
 
        protocol->state = SILC_PROTOCOL_STATE_ERROR;
-       silc_protocol_execute(protocol, client->timeout_queue, 0, 0);
+       silc_protocol_execute(protocol, client->schedule, 0, 0);
        return;
       }
     }
@@ -455,7 +455,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange)
                           ctx->sock->hostname);
         }
        protocol->state = SILC_PROTOCOL_STATE_ERROR;
-       silc_protocol_execute(protocol, client->timeout_queue, 0, 0);
+       silc_protocol_execute(protocol, client->schedule, 0, 0);
        return;
       }
     }
@@ -476,7 +476,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange)
                                             keymat);
       if (status != SILC_SKE_STATUS_OK) {
        protocol->state = SILC_PROTOCOL_STATE_ERROR;
-       silc_protocol_execute(protocol, client->timeout_queue, 0, 300000);
+       silc_protocol_execute(protocol, client->schedule, 0, 300000);
        silc_ske_free_key_material(keymat);
        return;
       }
@@ -491,11 +491,11 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange)
         This was the timeout task to be executed if the protocol is
         not completed fast enough. */
       if (ctx->timeout_task)
-       silc_task_unregister(client->timeout_queue, ctx->timeout_task);
+       silc_schedule_task_del(client->schedule, ctx->timeout_task);
 
       /* Protocol has ended, call the final callback */
       if (protocol->final_callback)
-       silc_protocol_execute_final(protocol, client->timeout_queue);
+       silc_protocol_execute_final(protocol, client->schedule);
       else
        silc_protocol_free(protocol);
     }
@@ -511,7 +511,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange)
 
     /* On error the final callback is always called. */
     if (protocol->final_callback)
-      silc_protocol_execute_final(protocol, client->timeout_queue);
+      silc_protocol_execute_final(protocol, client->schedule);
     else
       silc_protocol_free(protocol);
     break;
@@ -525,11 +525,11 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange)
        This was the timeout task to be executed if the protocol is
        not completed fast enough. */
     if (ctx->timeout_task)
-      silc_task_unregister(client->timeout_queue, ctx->timeout_task);
+      silc_schedule_task_del(client->schedule, ctx->timeout_task);
 
     /* On error the final callback is always called. */
     if (protocol->final_callback)
-      silc_protocol_execute_final(protocol, client->timeout_queue);
+      silc_protocol_execute_final(protocol, client->schedule);
     else
       silc_protocol_free(protocol);
     break;
@@ -702,7 +702,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_connection_auth)
 
       /* Protocol has ended, call the final callback */
       if (protocol->final_callback)
-       silc_protocol_execute_final(protocol, client->timeout_queue);
+       silc_protocol_execute_final(protocol, client->schedule);
       else
        silc_protocol_free(protocol);
     }
@@ -724,7 +724,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_connection_auth)
 
       /* On error the final callback is always called. */
       if (protocol->final_callback)
-       silc_protocol_execute_final(protocol, client->timeout_queue);
+       silc_protocol_execute_final(protocol, client->schedule);
       else
        silc_protocol_free(protocol);
     }
@@ -736,7 +736,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_connection_auth)
 
     /* On error the final callback is always called. */
     if (protocol->final_callback)
-      silc_protocol_execute_final(protocol, client->timeout_queue);
+      silc_protocol_execute_final(protocol, client->schedule);
     else
       silc_protocol_free(protocol);
     break;
@@ -926,7 +926,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey)
          if (ctx->packet->type != SILC_PACKET_KEY_EXCHANGE_1) {
            /* Error in protocol */
            protocol->state = SILC_PROTOCOL_STATE_ERROR;
-           silc_protocol_execute(protocol, client->timeout_queue, 0, 300000);
+           silc_protocol_execute(protocol, client->schedule, 0, 300000);
          }
 
          ctx->ske = silc_ske_alloc();
@@ -946,13 +946,13 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey)
                              status));
            
            protocol->state = SILC_PROTOCOL_STATE_ERROR;
-           silc_protocol_execute(protocol, client->timeout_queue, 0, 300000);
+           silc_protocol_execute(protocol, client->schedule, 0, 300000);
            return;
          }
 
          /* Advance the protocol state */
          protocol->state++;
-         silc_protocol_execute(protocol, client->timeout_queue, 0, 0);
+         silc_protocol_execute(protocol, client->schedule, 0, 0);
        } else {
          /*
           * Do normal and simple re-key.
@@ -1003,7 +1003,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey)
                              status));
            
            protocol->state = SILC_PROTOCOL_STATE_ERROR;
-           silc_protocol_execute(protocol, client->timeout_queue, 0, 300000);
+           silc_protocol_execute(protocol, client->schedule, 0, 300000);
            return;
          }
 
@@ -1050,7 +1050,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey)
                              status));
            
            protocol->state = SILC_PROTOCOL_STATE_ERROR;
-           silc_protocol_execute(protocol, client->timeout_queue, 0, 300000);
+           silc_protocol_execute(protocol, client->schedule, 0, 300000);
            return;
          }
       }
@@ -1063,7 +1063,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey)
        if (ctx->packet->type != SILC_PACKET_KEY_EXCHANGE_2) {
          /* Error in protocol */
          protocol->state = SILC_PROTOCOL_STATE_ERROR;
-         silc_protocol_execute(protocol, client->timeout_queue, 0, 300000);
+         silc_protocol_execute(protocol, client->schedule, 0, 300000);
        }
        
        status = silc_ske_initiator_finish(ctx->ske, ctx->packet->buffer);
@@ -1072,7 +1072,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey)
                            status));
          
          protocol->state = SILC_PROTOCOL_STATE_ERROR;
-         silc_protocol_execute(protocol, client->timeout_queue, 0, 300000);
+         silc_protocol_execute(protocol, client->schedule, 0, 300000);
          return;
        }
       }
@@ -1100,7 +1100,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey)
     if (ctx->packet->type != SILC_PACKET_REKEY_DONE) {
       /* Error in protocol */
       protocol->state = SILC_PROTOCOL_STATE_ERROR;
-      silc_protocol_execute(protocol, client->timeout_queue, 0, 0);
+      silc_protocol_execute(protocol, client->schedule, 0, 0);
     }
 
     /* We received the REKEY_DONE packet and all packets after this is
@@ -1109,7 +1109,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey)
 
     /* Protocol has ended, call the final callback */
     if (protocol->final_callback)
-      silc_protocol_execute_final(protocol, client->timeout_queue);
+      silc_protocol_execute_final(protocol, client->schedule);
     else
       silc_protocol_free(protocol);
     break;
@@ -1126,7 +1126,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey)
 
     /* On error the final callback is always called. */
     if (protocol->final_callback)
-      silc_protocol_execute_final(protocol, client->timeout_queue);
+      silc_protocol_execute_final(protocol, client->schedule);
     else
       silc_protocol_free(protocol);
     break;
@@ -1138,7 +1138,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey)
 
     /* On error the final callback is always called. */
     if (protocol->final_callback)
-      silc_protocol_execute_final(protocol, client->timeout_queue);
+      silc_protocol_execute_final(protocol, client->schedule);
     else
       silc_protocol_free(protocol);
     break;