projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New silcconfig library and server parser. Merged silc-newconfig-final.patch.
[silc.git]
/
apps
/
silcd
/
protocol.c
diff --git
a/apps/silcd/protocol.c
b/apps/silcd/protocol.c
index 64d40f1f26f493c508f403ca6b6c7764636314d0..a7a1b707d7d1a39000626dbf555ac8f20a52cd2d 100644
(file)
--- a/
apps/silcd/protocol.c
+++ b/
apps/silcd/protocol.c
@@
-131,12
+131,11
@@
silc_verify_public_key_internal(SilcServer server, SilcSocketConnection sock,
/* Save the key for future checking */
unlink(filename);
/* Save the key for future checking */
unlink(filename);
- silc_pkcs_save_public_key_data(filename, pk, pk_len,
- SILC_PKCS_FILE_PEM);
+ silc_pkcs_save_public_key_data(filename, pk, pk_len, SILC_PKCS_FILE_PEM);
return TRUE;
}
return TRUE;
}
- if (memcmp(
encpk,
pk, encpk_len)) {
+ if (memcmp(
pk, enc
pk, encpk_len)) {
SILC_LOG_WARNING(("%s (%s) port %d server public key does not match "
"with local copy", sock->hostname, sock->ip,
sock->port));
SILC_LOG_WARNING(("%s (%s) port %d server public key does not match "
"with local copy", sock->hostname, sock->ip,
sock->port));
@@
-654,6
+653,11
@@
SILC_TASK_CALLBACK(silc_server_protocol_key_exchange)
if (ctx->timeout_task)
silc_schedule_task_del(server->schedule, ctx->timeout_task);
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);
/* Call the final callback */
if (protocol->final_callback)
silc_protocol_execute_final(protocol, server->schedule);
@@
-676,6
+680,11
@@
SILC_TASK_CALLBACK(silc_server_protocol_key_exchange)
if (ctx->timeout_task)
silc_schedule_task_del(server->schedule, ctx->timeout_task);
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);
/* On error the final callback is always called. */
if (protocol->final_callback)
silc_protocol_execute_final(protocol, server->schedule);
@@
-694,6
+703,11
@@
SILC_TASK_CALLBACK(silc_server_protocol_key_exchange)
if (ctx->timeout_task)
silc_schedule_task_del(server->schedule, ctx->timeout_task);
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);
/* On error the final callback is always called. */
if (protocol->final_callback)
silc_protocol_execute_final(protocol, server->schedule);
@@
-711,13
+725,13
@@
SILC_TASK_CALLBACK(silc_server_protocol_key_exchange)
*/
static int
*/
static int
-silc_server_password_authentication(SilcServer server, char *
auth1
,
- char *
auth2
)
+silc_server_password_authentication(SilcServer server, char *
remote_auth
,
+ char *
local_auth
)
{
{
- if (!
auth1 || !auth2
)
+ if (!
remote_auth || !local_auth
)
return FALSE;
return FALSE;
- if (!memcmp(
auth1, auth2, strlen(auth1
)))
+ if (!memcmp(
remote_auth, local_auth, strlen(local_auth
)))
return TRUE;
return FALSE;
return TRUE;
return FALSE;
@@
-892,7
+906,7
@@
SILC_TASK_CALLBACK(silc_server_protocol_connection_auth)
/* Remote end is client */
if (conn_type == SILC_SOCKET_TYPE_CLIENT) {
/* Remote end is client */
if (conn_type == SILC_SOCKET_TYPE_CLIENT) {
- SilcServerConfigSectionClient
Connection
*client = ctx->cconfig;
+ SilcServerConfigSectionClient *client = ctx->cconfig;
if (client) {
switch(client->auth_meth) {
if (client) {
switch(client->auth_meth) {
@@
-941,8
+955,8
@@
SILC_TASK_CALLBACK(silc_server_protocol_connection_auth)
return;
}
} else {
return;
}
} else {
- SILC_LOG_DEBUG(("No configuration for remote connection"));
- SILC_LOG_ERROR(("Remote connection not configured"));
+ SILC_LOG_DEBUG(("No configuration for remote c
lient c
onnection"));
+ SILC_LOG_ERROR(("Remote c
lient c
onnection not configured"));
SILC_LOG_ERROR(("Authentication failed"));
silc_free(auth_data);
protocol->state = SILC_PROTOCOL_STATE_ERROR;
SILC_LOG_ERROR(("Authentication failed"));
silc_free(auth_data);
protocol->state = SILC_PROTOCOL_STATE_ERROR;
@@
-954,7
+968,7
@@
SILC_TASK_CALLBACK(silc_server_protocol_connection_auth)
/* Remote end is server */
if (conn_type == SILC_SOCKET_TYPE_SERVER) {
/* Remote end is server */
if (conn_type == SILC_SOCKET_TYPE_SERVER) {
- SilcServerConfigSectionServer
Connection
*serv = ctx->sconfig;
+ SilcServerConfigSectionServer *serv = ctx->sconfig;
if (serv) {
switch(serv->auth_meth) {
if (serv) {
switch(serv->auth_meth) {
@@
-1003,8
+1017,8
@@
SILC_TASK_CALLBACK(silc_server_protocol_connection_auth)
return;
}
} else {
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,
SILC_LOG_ERROR(("Authentication failed"));
protocol->state = SILC_PROTOCOL_STATE_ERROR;
silc_protocol_execute(protocol, server->schedule,
@@
-1016,7
+1030,7
@@
SILC_TASK_CALLBACK(silc_server_protocol_connection_auth)
/* Remote end is router */
if (conn_type == SILC_SOCKET_TYPE_ROUTER) {
/* Remote end is router */
if (conn_type == SILC_SOCKET_TYPE_ROUTER) {
- SilcServerConfigSection
ServerConnection
*serv = ctx->rconfig;
+ SilcServerConfigSection
Router
*serv = ctx->rconfig;
if (serv) {
switch(serv->auth_meth) {
if (serv) {
switch(serv->auth_meth) {
@@
-1065,8
+1079,8
@@
SILC_TASK_CALLBACK(silc_server_protocol_connection_auth)
return;
}
} else {
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;
SILC_LOG_ERROR(("Authentication failed"));
silc_free(auth_data);
protocol->state = SILC_PROTOCOL_STATE_ERROR;
@@
-1172,6
+1186,11
@@
SILC_TASK_CALLBACK(silc_server_protocol_connection_auth)
if (ctx->timeout_task)
silc_schedule_task_del(server->schedule, ctx->timeout_task);
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);
/* Protocol has ended, call the final callback */
if (protocol->final_callback)
silc_protocol_execute_final(protocol, server->schedule);
@@
-1198,6
+1217,11
@@
SILC_TASK_CALLBACK(silc_server_protocol_connection_auth)
if (ctx->timeout_task)
silc_schedule_task_del(server->schedule, ctx->timeout_task);
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);
/* On error the final callback is always called. */
if (protocol->final_callback)
silc_protocol_execute_final(protocol, server->schedule);
@@
-1217,6
+1241,11
@@
SILC_TASK_CALLBACK(silc_server_protocol_connection_auth)
if (ctx->timeout_task)
silc_schedule_task_del(server->schedule, ctx->timeout_task);
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);
/* On error the final callback is always called. */
if (protocol->final_callback)
silc_protocol_execute_final(protocol, server->schedule);
@@
-1586,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);
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);
/* Protocol has ended, call the final callback */
if (protocol->final_callback)
silc_protocol_execute_final(protocol, server->schedule);
@@
-1603,6
+1637,11
@@
SILC_TASK_CALLBACK(silc_server_protocol_rekey)
silc_ske_abort(ctx->ske, ctx->ske->status);
}
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);
/* On error the final callback is always called. */
if (protocol->final_callback)
silc_protocol_execute_final(protocol, server->schedule);
@@
-1615,6
+1654,11
@@
SILC_TASK_CALLBACK(silc_server_protocol_rekey)
* We have received failure from remote
*/
* 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);
/* On error the final callback is always called. */
if (protocol->final_callback)
silc_protocol_execute_final(protocol, server->schedule);