updates.

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

diff --git a/lib/silcclient/protocol.c b/lib/silcclient/protocol.c
index f82bbbeb71805efa3d16ccf6b75789674f904de5..9231f8cf5ac7e3f5f0e7b8f06d6d69f8ce15cdfa 100644 (file)
--- a/lib/silcclient/protocol.c
+++ b/lib/silcclient/protocol.c
@@ -255,7 +255,7 @@ static void silc_client_protocol_ke_continue(SilcSKE ske,
     }
     
     protocol->state = SILC_PROTOCOL_STATE_ERROR;
-    protocol->execute(client->timeout_queue, 0, protocol, 0, 0, 0);
+    silc_protocol_execute(protocol, client->timeout_queue, 0, 0);
     return;
   }
 
@@ -275,7 +275,7 @@ static void silc_client_protocol_ke_continue(SilcSKE ske,
      function. */
   if (ctx->responder == TRUE) {
     protocol->state++;
-    protocol->execute(client->timeout_queue, 0, protocol, 0, 0, 100000);
+    silc_protocol_execute(protocol, client->timeout_queue, 0, 100000);
   }
 }
 
@@ -344,14 +344,14 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange)
                        status));
 
        protocol->state = SILC_PROTOCOL_STATE_ERROR;
-       protocol->execute(client->timeout_queue, 0, protocol, fd, 0, 0);
+       silc_protocol_execute(protocol, client->timeout_queue, 0, 0);
        return;
       }
 
       /* Advance protocol state and call the next state if we are responder */
       protocol->state++;
       if (ctx->responder == TRUE)
-       protocol->execute(client->timeout_queue, 0, protocol, fd, 0, 100000);
+       silc_protocol_execute(protocol, client->timeout_queue, 0, 100000);
     }
     break;
   case 2:
@@ -382,14 +382,14 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange)
                        status));
 
        protocol->state = SILC_PROTOCOL_STATE_ERROR;
-       protocol->execute(client->timeout_queue, 0, protocol, fd, 0, 0);
+       silc_protocol_execute(protocol, client->timeout_queue, 0, 0);
        return;
       }
 
       /* Advance protocol state and call next state if we are initiator */
       protocol->state++;
       if (ctx->responder == FALSE)
-       protocol->execute(client->timeout_queue, 0, protocol, fd, 0, 100000);
+       silc_protocol_execute(protocol, client->timeout_queue, 0, 100000);
     }
     break;
   case 3:
@@ -429,7 +429,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange)
                        status));
 
        protocol->state = SILC_PROTOCOL_STATE_ERROR;
-       protocol->execute(client->timeout_queue, 0, protocol, fd, 0, 0);
+       silc_protocol_execute(protocol, client->timeout_queue, 0, 0);
        return;
       }
     }
@@ -476,7 +476,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange)
                           ctx->sock->hostname);
         }
        protocol->state = SILC_PROTOCOL_STATE_ERROR;
-       protocol->execute(client->timeout_queue, 0, protocol, fd, 0, 0);
+       silc_protocol_execute(protocol, client->timeout_queue, 0, 0);
        return;
       }
     }
@@ -497,7 +497,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange)
                                             keymat);
       if (status != SILC_SKE_STATUS_OK) {
        protocol->state = SILC_PROTOCOL_STATE_ERROR;
-       protocol->execute(client->timeout_queue, 0, protocol, fd, 0, 300000);
+       silc_protocol_execute(protocol, client->timeout_queue, 0, 300000);
        silc_ske_free_key_material(keymat);
        return;
       }
@@ -516,7 +516,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange)
 
       /* Protocol has ended, call the final callback */
       if (protocol->final_callback)
-       protocol->execute_final(client->timeout_queue, 0, protocol, fd);
+       silc_protocol_execute_final(protocol, client->timeout_queue);
       else
        silc_protocol_free(protocol);
     }
@@ -533,7 +533,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange)
 
     /* On error the final callback is always called. */
     if (protocol->final_callback)
-      protocol->execute_final(client->timeout_queue, 0, protocol, fd);
+      silc_protocol_execute_final(protocol, client->timeout_queue);
     else
       silc_protocol_free(protocol);
     break;
@@ -551,7 +551,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_key_exchange)
 
     /* On error the final callback is always called. */
     if (protocol->final_callback)
-      protocol->execute_final(client->timeout_queue, 0, protocol, fd);
+      silc_protocol_execute_final(protocol, client->timeout_queue);
     else
       silc_protocol_free(protocol);
     break;
@@ -724,7 +724,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_connection_auth)
 
       /* Protocol has ended, call the final callback */
       if (protocol->final_callback)
-       protocol->execute_final(client->timeout_queue, 0, protocol, fd);
+       silc_protocol_execute_final(protocol, client->timeout_queue);
       else
        silc_protocol_free(protocol);
     }
@@ -746,7 +746,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_connection_auth)
 
       /* On error the final callback is always called. */
       if (protocol->final_callback)
-       protocol->execute_final(client->timeout_queue, 0, protocol, fd);
+       silc_protocol_execute_final(protocol, client->timeout_queue);
       else
        silc_protocol_free(protocol);
     }
@@ -758,7 +758,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_connection_auth)
 
     /* On error the final callback is always called. */
     if (protocol->final_callback)
-      protocol->execute_final(client->timeout_queue, 0, protocol, fd);
+      silc_protocol_execute_final(protocol, client->timeout_queue);
     else
       silc_protocol_free(protocol);
     break;
@@ -948,8 +948,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;
-           protocol->execute(client->timeout_queue, 0, protocol, fd, 
-                             0, 300000);
+           silc_protocol_execute(protocol, client->timeout_queue, 0, 300000);
          }
 
          ctx->ske = silc_ske_alloc();
@@ -965,14 +964,13 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey)
                              status));
            
            protocol->state = SILC_PROTOCOL_STATE_ERROR;
-           protocol->execute(client->timeout_queue, 0, 
-                             protocol, fd, 0, 300000);
+           silc_protocol_execute(protocol, client->timeout_queue, 0, 300000);
            return;
          }
 
          /* Advance the protocol state */
          protocol->state++;
-         protocol->execute(client->timeout_queue, 0, protocol, fd, 0, 0);
+         silc_protocol_execute(protocol, client->timeout_queue, 0, 0);
        } else {
          /*
           * Do normal and simple re-key.
@@ -1022,8 +1020,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey)
                              status));
            
            protocol->state = SILC_PROTOCOL_STATE_ERROR;
-           protocol->execute(client->timeout_queue, 0, 
-                             protocol, fd, 0, 300000);
+           silc_protocol_execute(protocol, client->timeout_queue, 0, 300000);
            return;
          }
 
@@ -1073,8 +1070,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey)
                              status));
            
            protocol->state = SILC_PROTOCOL_STATE_ERROR;
-           protocol->execute(client->timeout_queue, 0, 
-                             protocol, fd, 0, 300000);
+           silc_protocol_execute(protocol, client->timeout_queue, 0, 300000);
            return;
          }
       }
@@ -1087,7 +1083,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;
-         protocol->execute(client->timeout_queue, 0, protocol, fd, 0, 300000);
+         silc_protocol_execute(protocol, client->timeout_queue, 0, 300000);
        }
        
        status = silc_ske_initiator_finish(ctx->ske, ctx->packet->buffer,
@@ -1097,8 +1093,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey)
                            status));
          
          protocol->state = SILC_PROTOCOL_STATE_ERROR;
-         protocol->execute(client->timeout_queue, 0, 
-                           protocol, fd, 0, 300000);
+         silc_protocol_execute(protocol, client->timeout_queue, 0, 300000);
          return;
        }
       }
@@ -1126,7 +1121,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;
-      protocol->execute(client->timeout_queue, 0, protocol, fd, 0, 0);
+      silc_protocol_execute(protocol, client->timeout_queue, 0, 0);
     }
 
     /* We received the REKEY_DONE packet and all packets after this is
@@ -1135,7 +1130,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey)
 
     /* Protocol has ended, call the final callback */
     if (protocol->final_callback)
-      protocol->execute_final(client->timeout_queue, 0, protocol, fd);
+      silc_protocol_execute_final(protocol, client->timeout_queue);
     else
       silc_protocol_free(protocol);
     break;
@@ -1154,7 +1149,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey)
 
     /* On error the final callback is always called. */
     if (protocol->final_callback)
-      protocol->execute_final(client->timeout_queue, 0, protocol, fd);
+      silc_protocol_execute_final(protocol, client->timeout_queue);
     else
       silc_protocol_free(protocol);
     break;
@@ -1166,7 +1161,7 @@ SILC_TASK_CALLBACK(silc_client_protocol_rekey)
 
     /* On error the final callback is always called. */
     if (protocol->final_callback)
-      protocol->execute_final(client->timeout_queue, 0, protocol, fd);
+      silc_protocol_execute_final(protocol, client->timeout_queue);
     else
       silc_protocol_free(protocol);
     break;