projects
/
silc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
68f0f5b
)
SILC_FSM_* macro changes.
author
Pekka Riikonen
<priikone@silcnet.org>
Tue, 23 Jan 2007 14:48:05 +0000
(14:48 +0000)
committer
Pekka Riikonen
<priikone@silcnet.org>
Tue, 23 Jan 2007 14:48:05 +0000
(14:48 +0000)
lib/silcserver/server.c
patch
|
blob
|
history
lib/silcserver/server_st_accept.c
patch
|
blob
|
history
lib/silcserver/server_st_command.c
patch
|
blob
|
history
lib/silcserver/server_st_command_reply.c
patch
|
blob
|
history
lib/silcserver/server_st_connect.c
patch
|
blob
|
history
lib/silcserver/server_st_notify.c
patch
|
blob
|
history
lib/silcserver/server_st_packet.c
patch
|
blob
|
history
lib/silcserver/server_st_query.c
patch
|
blob
|
history
diff --git
a/lib/silcserver/server.c
b/lib/silcserver/server.c
index 46baa97d6a6e4273e3e09c7fdcb789f4917ed67e..27609a5a4dce3aa71733a086398047fabb455330 100644
(file)
--- a/
lib/silcserver/server.c
+++ b/
lib/silcserver/server.c
@@
-223,7
+223,7
@@
SILC_FSM_STATE(silc_server_thread_st_start)
SILC_FSM_EVENT_SIGNAL(&thread->server->thread_up);
/* Wait here for this thread to finish */
SILC_FSM_EVENT_SIGNAL(&thread->server->thread_up);
/* Wait here for this thread to finish */
- SILC_FSM_WAIT;
+
return
SILC_FSM_WAIT;
}
/* Thread's machine's main state where we wait for various events. */
}
/* Thread's machine's main state where we wait for various events. */
@@
-262,7
+262,7
@@
SILC_FSM_STATE(silc_server_thread_st_run)
silc_list_init(thread->packet_queue, struct SilcPacketStruct, next);
thread->new_packet = FALSE;
silc_list_init(thread->packet_queue, struct SilcPacketStruct, next);
thread->new_packet = FALSE;
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
silc_mutex_lock(thread->server->lock);
}
silc_mutex_lock(thread->server->lock);
@@
-288,14
+288,14
@@
SILC_FSM_STATE(silc_server_thread_st_run)
thread->new_connection = FALSE;
silc_mutex_unlock(thread->server->lock);
thread->new_connection = FALSE;
silc_mutex_unlock(thread->server->lock);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* NOT REACHED */
#if defined(SILC_DEBUG)
assert(FALSE);
#endif /* SILC_DEBUG */
}
/* NOT REACHED */
#if defined(SILC_DEBUG)
assert(FALSE);
#endif /* SILC_DEBUG */
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
}
@@
-318,44
+318,44
@@
SILC_FSM_STATE(silc_server_st_run)
/* Call running callbcak back to application */
server->run_callback = FALSE;
server->running(server, server->running_context);
/* Call running callbcak back to application */
server->run_callback = FALSE;
server->running(server, server->running_context);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
if (server->new_connection) {
/** New connection */
silc_fsm_next(fsm, silc_server_st_new_connection);
}
if (server->new_connection) {
/** New connection */
silc_fsm_next(fsm, silc_server_st_new_connection);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
if (server->connect_router) {
/** Connect to router(s) */
silc_fsm_next(fsm, silc_server_st_connect_router);
}
if (server->connect_router) {
/** Connect to router(s) */
silc_fsm_next(fsm, silc_server_st_connect_router);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
if (server->get_statistics) {
/** Retrieve statistics */
silc_fsm_next(fsm, silc_server_st_get_stats);
}
if (server->get_statistics) {
/** Retrieve statistics */
silc_fsm_next(fsm, silc_server_st_get_stats);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
if (server->reconfigure) {
/** Reconfigure server */
silc_fsm_next(fsm, silc_server_st_reconfigure);
}
if (server->reconfigure) {
/** Reconfigure server */
silc_fsm_next(fsm, silc_server_st_reconfigure);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
if (server->server_shutdown) {
/** Shutdown server */
silc_fsm_next(fsm, silc_server_st_stop);
}
if (server->server_shutdown) {
/** Shutdown server */
silc_fsm_next(fsm, silc_server_st_stop);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* NOT REACHED */
#if defined(SILC_DEBUG)
assert(FALSE);
#endif /* SILC_DEBUG */
}
/* NOT REACHED */
#if defined(SILC_DEBUG)
assert(FALSE);
#endif /* SILC_DEBUG */
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* New connection received */
}
/* New connection received */
@@
-391,7
+391,7
@@
SILC_FSM_STATE(silc_server_st_new_connection)
}
silc_fsm_next(fsm, silc_server_st_wait_new_thread);
}
silc_fsm_next(fsm, silc_server_st_wait_new_thread);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
silc_list_del(server->new_conns, ac);
}
silc_list_del(server->new_conns, ac);
@@
-415,7
+415,7
@@
SILC_FSM_STATE(silc_server_st_new_connection)
/** Connections processed */
silc_fsm_next(fsm, silc_server_st_run);
/** Connections processed */
silc_fsm_next(fsm, silc_server_st_run);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* Wait here until newly created thread is up */
}
/* Wait here until newly created thread is up */
@@
-429,7
+429,7
@@
SILC_FSM_STATE(silc_server_st_wait_new_thread)
/** Process new connections */
silc_fsm_next(fsm, silc_server_st_new_connection);
/** Process new connections */
silc_fsm_next(fsm, silc_server_st_new_connection);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* Stops server */
}
/* Stops server */
@@
-493,7
+493,7
@@
SILC_FSM_STATE(silc_server_st_stop)
/** Wait events */
silc_fsm_next(fsm, silc_server_st_run);
/** Wait events */
silc_fsm_next(fsm, silc_server_st_run);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* Reconfigure server */
}
/* Reconfigure server */
@@
-507,7
+507,7
@@
SILC_FSM_STATE(silc_server_st_reconfigure)
/** Wait events */
server->reconfigure = FALSE;
silc_fsm_next(fsm, silc_server_st_run);
/** Wait events */
server->reconfigure = FALSE;
silc_fsm_next(fsm, silc_server_st_run);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* Get statistics */
}
/* Get statistics */
@@
-521,7
+521,7
@@
SILC_FSM_STATE(silc_server_st_get_stats)
/** Wait events */
server->get_statistics = FALSE;
silc_fsm_next(fsm, silc_server_st_run);
/** Wait events */
server->get_statistics = FALSE;
silc_fsm_next(fsm, silc_server_st_run);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
}
diff --git
a/lib/silcserver/server_st_accept.c
b/lib/silcserver/server_st_accept.c
index 7ad789a9554dd2e4a71a31190edc254d5b4b743c..5f40be9297a1369bb444805b66ec3eecc254a7a4 100644
(file)
--- a/
lib/silcserver/server_st_accept.c
+++ b/
lib/silcserver/server_st_accept.c
@@
-169,7
+169,7
@@
SILC_FSM_STATE(silc_server_st_accept_connection)
/** Cannot create packet stream */
ac->error = SILC_STATUS_ERR_RESOURCE_LIMIT;
silc_fsm_next(fsm, silc_server_st_accept_error);
/** Cannot create packet stream */
ac->error = SILC_STATUS_ERR_RESOURCE_LIMIT;
silc_fsm_next(fsm, silc_server_st_accept_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
silc_packet_set_context(ac->packet_stream, ac);
}
silc_packet_set_context(ac->packet_stream, ac);
@@
-180,7
+180,7
@@
SILC_FSM_STATE(silc_server_st_accept_connection)
/** Out of memory */
ac->error = SILC_STATUS_ERR_RESOURCE_LIMIT;
silc_fsm_next(fsm, silc_server_st_accept_error);
/** Out of memory */
ac->error = SILC_STATUS_ERR_RESOURCE_LIMIT;
silc_fsm_next(fsm, silc_server_st_accept_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
if (!silc_socket_stream_get_info(ac->stream, NULL, &ac->hostname,
}
if (!silc_socket_stream_get_info(ac->stream, NULL, &ac->hostname,
@@
-188,7
+188,7
@@
SILC_FSM_STATE(silc_server_st_accept_connection)
/** Bad socket stream */
ac->error = SILC_STATUS_ERR_RESOURCE_LIMIT;
silc_fsm_next(fsm, silc_server_st_accept_error);
/** Bad socket stream */
ac->error = SILC_STATUS_ERR_RESOURCE_LIMIT;
silc_fsm_next(fsm, silc_server_st_accept_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* Check whether this connection is denied to connect to us. */
}
/* Check whether this connection is denied to connect to us. */
@@
-198,7
+198,7
@@
SILC_FSM_STATE(silc_server_st_accept_connection)
SILC_LOG_INFO(("Connection %s (%s) is denied", ac->hostname, ac->ip));
ac->error = SILC_STATUS_ERR_BANNED_FROM_SERVER;
silc_fsm_next(fsm, silc_server_st_accept_error);
SILC_LOG_INFO(("Connection %s (%s) is denied", ac->hostname, ac->ip));
ac->error = SILC_STATUS_ERR_BANNED_FROM_SERVER;
silc_fsm_next(fsm, silc_server_st_accept_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
server->params->refcnt++;
}
server->params->refcnt++;
@@
-217,7
+217,7
@@
SILC_FSM_STATE(silc_server_st_accept_connection)
ac->ip));
ac->error = SILC_STATUS_ERR_BANNED_FROM_SERVER;
silc_fsm_next(fsm, silc_server_st_accept_error);
ac->ip));
ac->error = SILC_STATUS_ERR_BANNED_FROM_SERVER;
silc_fsm_next(fsm, silc_server_st_accept_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
SILC_LOG_INFO(("Incoming connection %s (%s)", ac->hostname, ac->ip));
}
SILC_LOG_INFO(("Incoming connection %s (%s)", ac->hostname, ac->ip));
@@
-241,7
+241,7
@@
SILC_FSM_STATE(silc_server_st_accept_connection)
/** Out of memory */
ac->error = SILC_STATUS_ERR_RESOURCE_LIMIT;
silc_fsm_next(fsm, silc_server_st_accept_error);
/** Out of memory */
ac->error = SILC_STATUS_ERR_RESOURCE_LIMIT;
silc_fsm_next(fsm, silc_server_st_accept_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
silc_ske_set_callbacks(ac->data.ske, silc_server_accept_verify_key,
silc_server_accept_completed, ac);
}
silc_ske_set_callbacks(ac->data.ske, silc_server_accept_verify_key,
silc_server_accept_completed, ac);
@@
-265,7
+265,7
@@
SILC_FSM_STATE(silc_server_st_accept_set_keys)
silc_ske_map_status(ac->status), ac->hostname, ac->ip));
ac->error = SILC_STATUS_ERR_KEY_EXCHANGE_FAILED;
silc_fsm_next(fsm, silc_server_st_accept_error);
silc_ske_map_status(ac->status), ac->hostname, ac->ip));
ac->error = SILC_STATUS_ERR_KEY_EXCHANGE_FAILED;
silc_fsm_next(fsm, silc_server_st_accept_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
SILC_LOG_DEBUG(("Setting keys into use"));
}
SILC_LOG_DEBUG(("Setting keys into use"));
@@
-277,7
+277,7
@@
SILC_FSM_STATE(silc_server_st_accept_set_keys)
/** Error setting keys */
ac->error = SILC_STATUS_ERR_KEY_EXCHANGE_FAILED;
silc_fsm_next(fsm, silc_server_st_accept_error);
/** Error setting keys */
ac->error = SILC_STATUS_ERR_KEY_EXCHANGE_FAILED;
silc_fsm_next(fsm, silc_server_st_accept_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
silc_packet_set_ciphers(ac->packet_stream, send_key, receive_key);
silc_packet_set_hmacs(ac->packet_stream, hmac_send, hmac_receive);
}
silc_packet_set_ciphers(ac->packet_stream, send_key, receive_key);
silc_packet_set_hmacs(ac->packet_stream, hmac_send, hmac_receive);
@@
-291,7
+291,7
@@
SILC_FSM_STATE(silc_server_st_accept_set_keys)
/** Error allocating auth protocol */
ac->error = SILC_STATUS_ERR_RESOURCE_LIMIT;
silc_fsm_next(fsm, silc_server_st_accept_error);
/** Error allocating auth protocol */
ac->error = SILC_STATUS_ERR_RESOURCE_LIMIT;
silc_fsm_next(fsm, silc_server_st_accept_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/** Waiting authentication completion */
}
/** Waiting authentication completion */
@@
-321,7
+321,7
@@
SILC_FSM_STATE(silc_server_st_accept_authenticated)
SILC_CONNTYPE_STRING(ac->data.type)));
ac->error = SILC_STATUS_ERR_AUTH_FAILED;
silc_fsm_next(fsm, silc_server_st_accept_error);
SILC_CONNTYPE_STRING(ac->data.type)));
ac->error = SILC_STATUS_ERR_AUTH_FAILED;
silc_fsm_next(fsm, silc_server_st_accept_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
SILC_LOG_DEBUG(("Checking whether connection is allowed"));
}
SILC_LOG_DEBUG(("Checking whether connection is allowed"));
@@
-372,7
+372,7
@@
SILC_FSM_STATE(silc_server_st_accept_authenticated)
ac->error = SILC_STATUS_ERR_BAD_VERSION;
ac->error_string = strdup("You support too old protocol version");
silc_fsm_next(fsm, silc_server_st_accept_error);
ac->error = SILC_STATUS_ERR_BAD_VERSION;
ac->error_string = strdup("You support too old protocol version");
silc_fsm_next(fsm, silc_server_st_accept_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* Match software version */
}
/* Match software version */
@@
-384,7
+384,7
@@
SILC_FSM_STATE(silc_server_st_accept_authenticated)
ac->error = SILC_STATUS_ERR_BAD_VERSION;
ac->error_string = strdup("You support too old software version");
silc_fsm_next(fsm, silc_server_st_accept_error);
ac->error = SILC_STATUS_ERR_BAD_VERSION;
ac->error_string = strdup("You support too old software version");
silc_fsm_next(fsm, silc_server_st_accept_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* Regex match vendor version */
}
/* Regex match vendor version */
@@
-396,7
+396,7
@@
SILC_FSM_STATE(silc_server_st_accept_authenticated)
ac->error = SILC_STATUS_ERR_BAD_VERSION;
ac->error_string = strdup("Your software is not supported");
silc_fsm_next(fsm, silc_server_st_accept_error);
ac->error = SILC_STATUS_ERR_BAD_VERSION;
ac->error_string = strdup("Your software is not supported");
silc_fsm_next(fsm, silc_server_st_accept_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
silc_free(r_vendor_version);
}
silc_free(r_vendor_version);
@@
-413,7
+413,7
@@
SILC_FSM_STATE(silc_server_st_accept_authenticated)
ac->error = SILC_STATUS_ERR_RESOURCE_LIMIT;
ac->error_string = strdup("Server is full, try again later");
silc_fsm_next(fsm, silc_server_st_accept_error);
ac->error = SILC_STATUS_ERR_RESOURCE_LIMIT;
ac->error_string = strdup("Server is full, try again later");
silc_fsm_next(fsm, silc_server_st_accept_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* XXX */
}
/* XXX */
@@
-425,7
+425,7
@@
SILC_FSM_STATE(silc_server_st_accept_authenticated)
ac->error = SILC_STATUS_ERR_RESOURCE_LIMIT;
ac->error_string = strdup("Too many connections from your host");
silc_fsm_next(fsm, silc_server_st_accept_error);
ac->error = SILC_STATUS_ERR_RESOURCE_LIMIT;
ac->error_string = strdup("Too many connections from your host");
silc_fsm_next(fsm, silc_server_st_accept_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* If we are waiting backup router connection, do not accept any other
}
/* If we are waiting backup router connection, do not accept any other
@@
-438,7
+438,7
@@
SILC_FSM_STATE(silc_server_st_accept_authenticated)
ac->error_string = strdup("We do not have connection to backup router "
"established, try later");
silc_fsm_next(fsm, silc_server_st_accept_error);
ac->error_string = strdup("We do not have connection to backup router "
"established, try later");
silc_fsm_next(fsm, silc_server_st_accept_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* If we are backup router and this is incoming server connection
}
/* If we are backup router and this is incoming server connection
@@
-454,10
+454,10
@@
SILC_FSM_STATE(silc_server_st_accept_authenticated)
ac->error_string = strdup("We do not have connection to primary router "
"established, try later");
silc_fsm_next(fsm, silc_server_st_accept_error);
ac->error_string = strdup("We do not have connection to primary router "
"established, try later");
silc_fsm_next(fsm, silc_server_st_accept_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
}
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
SILC_FSM_STATE(silc_server_st_accept_client)
}
SILC_FSM_STATE(silc_server_st_accept_client)
@@
-484,7
+484,7
@@
SILC_FSM_STATE(silc_server_st_accept_client)
ac->hostname, ac->ip));
ac->error = SILC_STATUS_ERR_NOT_REGISTERED;
silc_fsm_next(fsm, silc_server_st_accept_error);
ac->hostname, ac->ip));
ac->error = SILC_STATUS_ERR_NOT_REGISTERED;
silc_fsm_next(fsm, silc_server_st_accept_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
SILC_LOG_DEBUG(("Connection %s (%s) is client", ac->hostname, ac->ip));
}
SILC_LOG_DEBUG(("Connection %s (%s) is client", ac->hostname, ac->ip));
@@
-494,7
+494,7
@@
SILC_FSM_STATE(silc_server_st_accept_client)
if (ac->register_packet->type == SILC_PACKET_RESUME_CLIENT) {
/** Resume client connection */
silc_fsm_next(fsm, silc_server_st_accept_resume_client);
if (ac->register_packet->type == SILC_PACKET_RESUME_CLIENT) {
/** Resume client connection */
silc_fsm_next(fsm, silc_server_st_accept_resume_client);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* Get connection parameters */
}
/* Get connection parameters */
@@
-530,7
+530,7
@@
SILC_FSM_STATE(silc_server_st_accept_client)
ac->error = SILC_STATUS_ERR_INCOMPLETE_INFORMATION;
ac->error_string = strdup("Bad NEW_CLIENT packet");
silc_fsm_next(fsm, silc_server_st_accept_error);
ac->error = SILC_STATUS_ERR_INCOMPLETE_INFORMATION;
ac->error_string = strdup("Bad NEW_CLIENT packet");
silc_fsm_next(fsm, silc_server_st_accept_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
if (!username) {
}
if (!username) {
@@
-540,7
+540,7
@@
SILC_FSM_STATE(silc_server_st_accept_client)
ac->error = SILC_STATUS_ERR_INCOMPLETE_INFORMATION;
ac->error_string = strdup("You did not send username");
silc_fsm_next(fsm, silc_server_st_accept_error);
ac->error = SILC_STATUS_ERR_INCOMPLETE_INFORMATION;
ac->error_string = strdup("You did not send username");
silc_fsm_next(fsm, silc_server_st_accept_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
if (username_len > 128) {
}
if (username_len > 128) {
@@
-566,7
+566,7
@@
SILC_FSM_STATE(silc_server_st_accept_client)
ac->error = SILC_STATUS_ERR_INCOMPLETE_INFORMATION;
ac->error_string = strdup("You sent wrong hostname string");
silc_fsm_next(fsm, silc_server_st_accept_error);
ac->error = SILC_STATUS_ERR_INCOMPLETE_INFORMATION;
ac->error_string = strdup("You sent wrong hostname string");
silc_fsm_next(fsm, silc_server_st_accept_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
silc_snprintf(n, sizeof(n), "%s", u);
silc_snprintf(u, sizeof(u) - 1, "%s@%s", n, h);
}
silc_snprintf(n, sizeof(n), "%s", u);
silc_snprintf(u, sizeof(u) - 1, "%s@%s", n, h);
@@
-586,7
+586,7
@@
SILC_FSM_STATE(silc_server_st_accept_client)
/** Out of memory */
ac->error = SILC_STATUS_ERR_RESOURCE_LIMIT;
silc_fsm_next(fsm, silc_server_st_accept_error);
/** Out of memory */
ac->error = SILC_STATUS_ERR_RESOURCE_LIMIT;
silc_fsm_next(fsm, silc_server_st_accept_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
username_len = strlen(scramble);
}
username_len = strlen(scramble);
@@
-610,7
+610,7
@@
SILC_FSM_STATE(silc_server_st_accept_client)
ac->error = SILC_STATUS_ERR_BAD_NICKNAME;
ac->error_string = strdup("Bad nickname");
silc_fsm_next(fsm, silc_server_st_accept_error);
ac->error = SILC_STATUS_ERR_BAD_NICKNAME;
ac->error_string = strdup("Bad nickname");
silc_fsm_next(fsm, silc_server_st_accept_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* Create client entry */
}
/* Create client entry */
@@
-621,7
+621,7
@@
SILC_FSM_STATE(silc_server_st_accept_client)
SILC_LOG_ERROR(("Could not create new client entry"));
ac->error = SILC_STATUS_ERR_RESOURCE_LIMIT;
silc_fsm_next(fsm, silc_server_st_accept_error);
SILC_LOG_ERROR(("Could not create new client entry"));
ac->error = SILC_STATUS_ERR_RESOURCE_LIMIT;
silc_fsm_next(fsm, silc_server_st_accept_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* Save entry data */
}
/* Save entry data */
@@
-636,7
+636,7
@@
SILC_FSM_STATE(silc_server_st_accept_client)
/** Out of memory */
ac->error = SILC_STATUS_ERR_RESOURCE_LIMIT;
silc_fsm_next(fsm, silc_server_st_accept_error);
/** Out of memory */
ac->error = SILC_STATUS_ERR_RESOURCE_LIMIT;
silc_fsm_next(fsm, silc_server_st_accept_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* Send the new client ID to the client. */
}
/* Send the new client ID to the client. */
@@
-671,7
+671,7
@@
SILC_FSM_STATE(silc_server_st_accept_client)
/** Connection accepted */
silc_fsm_next(fsm, silc_server_st_accept_finish);
/** Connection accepted */
silc_fsm_next(fsm, silc_server_st_accept_finish);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
SILC_FSM_STATE(silc_server_st_accept_resume_client)
}
SILC_FSM_STATE(silc_server_st_accept_resume_client)
@@
-679,7
+679,7
@@
SILC_FSM_STATE(silc_server_st_accept_resume_client)
/** Connection accepted */
silc_fsm_next(fsm, silc_server_st_accept_finish);
/** Connection accepted */
silc_fsm_next(fsm, silc_server_st_accept_finish);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
SILC_FSM_STATE(silc_server_st_accept_server)
}
SILC_FSM_STATE(silc_server_st_accept_server)
@@
-712,7
+712,7
@@
SILC_FSM_STATE(silc_server_st_accept_server)
ac->hostname, ac->ip));
ac->error = SILC_STATUS_ERR_NOT_REGISTERED;
silc_fsm_next(fsm, silc_server_st_accept_error);
ac->hostname, ac->ip));
ac->error = SILC_STATUS_ERR_NOT_REGISTERED;
silc_fsm_next(fsm, silc_server_st_accept_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* Get connection parameters */
}
/* Get connection parameters */
@@
-780,7
+780,7
@@
SILC_FSM_STATE(silc_server_st_accept_server)
ac->error = SILC_STATUS_ERR_INCOMPLETE_INFORMATION;
ac->error_string = strdup("Bad NEW_SERVER packet");
silc_fsm_next(fsm, silc_server_st_accept_error);
ac->error = SILC_STATUS_ERR_INCOMPLETE_INFORMATION;
ac->error_string = strdup("Bad NEW_SERVER packet");
silc_fsm_next(fsm, silc_server_st_accept_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
if (name_len > 256) {
}
if (name_len > 256) {
@@
-798,7
+798,7
@@
SILC_FSM_STATE(silc_server_st_accept_server)
ac->error = SILC_STATUS_ERR_INCOMPLETE_INFORMATION;
ac->error_string = strdup("Bad Server ID");
silc_fsm_next(fsm, silc_server_st_accept_error);
ac->error = SILC_STATUS_ERR_INCOMPLETE_INFORMATION;
ac->error_string = strdup("Bad Server ID");
silc_fsm_next(fsm, silc_server_st_accept_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* Check for valid server ID */
}
/* Check for valid server ID */
@@
-811,7
+811,7
@@
SILC_FSM_STATE(silc_server_st_accept_server)
ac->error_string = strdup("Your Server ID is not based on your real "
"IP address. Check your configuration.");
silc_fsm_next(fsm, silc_server_st_accept_error);
ac->error_string = strdup("Your Server ID is not based on your real "
"IP address. Check your configuration.");
silc_fsm_next(fsm, silc_server_st_accept_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* Create server entry */
}
/* Create server entry */
@@
-825,7
+825,7
@@
SILC_FSM_STATE(silc_server_st_accept_server)
SILC_LOG_ERROR(("Could not create new server entry"));
ac->error = SILC_STATUS_ERR_RESOURCE_LIMIT;
silc_fsm_next(fsm, silc_server_st_accept_error);
SILC_LOG_ERROR(("Could not create new server entry"));
ac->error = SILC_STATUS_ERR_RESOURCE_LIMIT;
silc_fsm_next(fsm, silc_server_st_accept_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* Save entry data */
}
/* Save entry data */
@@
-840,7
+840,7
@@
SILC_FSM_STATE(silc_server_st_accept_server)
/** Out of memory */
ac->error = SILC_STATUS_ERR_RESOURCE_LIMIT;
silc_fsm_next(fsm, silc_server_st_accept_error);
/** Out of memory */
ac->error = SILC_STATUS_ERR_RESOURCE_LIMIT;
silc_fsm_next(fsm, silc_server_st_accept_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* If the incoming connection is router and marked as backup router
}
/* If the incoming connection is router and marked as backup router
@@
-953,7
+953,7
@@
SILC_FSM_STATE(silc_server_st_accept_server)
/** Connection accepted */
silc_fsm_next(fsm, silc_server_st_accept_finish);
/** Connection accepted */
silc_fsm_next(fsm, silc_server_st_accept_finish);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
SILC_FSM_STATE(silc_server_st_accept_finish)
}
SILC_FSM_STATE(silc_server_st_accept_finish)
@@
-963,7
+963,7
@@
SILC_FSM_STATE(silc_server_st_accept_finish)
SILC_LOG_DEBUG(("New connection accepted"));
SILC_LOG_DEBUG(("New connection accepted"));
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
SILC_FSM_STATE(silc_server_st_accept_error)
}
SILC_FSM_STATE(silc_server_st_accept_error)
@@
-985,5
+985,5
@@
SILC_FSM_STATE(silc_server_st_accept_error)
if (ac->connauth)
server->stat.auth_failures++;
if (ac->connauth)
server->stat.auth_failures++;
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
diff --git
a/lib/silcserver/server_st_command.c
b/lib/silcserver/server_st_command.c
index 39baac420d1ba47a18fc03ba612be7c0ac4e943b..48e49e8dac1e86a97e1c3fb67e07b102d6524314 100644
(file)
--- a/
lib/silcserver/server_st_command.c
+++ b/
lib/silcserver/server_st_command.c
@@
-37,7
+37,7
@@
do { \
SILC_STATUS_ERR_NOT_ENOUGH_PARAMS, \
0); \
silc_server_command_free(cmd); \
SILC_STATUS_ERR_NOT_ENOUGH_PARAMS, \
0); \
silc_server_command_free(cmd); \
-
SILC_FSM_FINISH;
\
+
return SILC_FSM_FINISH;
\
} \
if (_argc > max) { \
SILC_LOG_DEBUG(("Too many parameters in command")); \
} \
if (_argc > max) { \
SILC_LOG_DEBUG(("Too many parameters in command")); \
@@
-46,7
+46,7
@@
do { \
SILC_STATUS_ERR_TOO_MANY_PARAMS, \
0); \
silc_server_command_free(cmd); \
SILC_STATUS_ERR_TOO_MANY_PARAMS, \
0); \
silc_server_command_free(cmd); \
-
SILC_FSM_FINISH;
\
+
return SILC_FSM_FINISH;
\
} \
} while(0)
} \
} while(0)
@@
-325,7
+325,7
@@
SILC_FSM_STATE(silc_server_st_packet_command)
cmd = silc_server_command_alloc(thread);
if (!cmd) {
silc_packet_free(packet);
cmd = silc_server_command_alloc(thread);
if (!cmd) {
silc_packet_free(packet);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
cmd->packet = packet;
}
cmd->packet = packet;
@@
-336,7
+336,7
@@
SILC_FSM_STATE(silc_server_st_packet_command)
if (!cmd->payload) {
SILC_LOG_ERROR(("Bad command payload"));
silc_server_command_free(cmd);
if (!cmd->payload) {
SILC_LOG_ERROR(("Bad command payload"));
silc_server_command_free(cmd);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
/* If client executes commands more frequently than once in 2 seconds,
}
/* If client executes commands more frequently than once in 2 seconds,
@@
-506,14
+506,14
@@
SILC_FSM_STATE(silc_server_st_packet_command)
default:
SILC_LOG_DEBUG(("Unknown command %d", silc_command_get(cmd->payload)));
silc_server_command_free(cmd);
default:
SILC_LOG_DEBUG(("Unknown command %d", silc_command_get(cmd->payload)));
silc_server_command_free(cmd);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
break;
}
/* Statistics */
thread->server->stat.commands_received++;
break;
}
/* Statistics */
thread->server->stat.commands_received++;
- return timeout ? SILC_FSM_WAIT : SILC_FSM_CONTINUE;
+ return timeout ? SILC_FSM_WAIT :
return
SILC_FSM_CONTINUE;
}
/********************************* WHOIS ************************************/
}
/********************************* WHOIS ************************************/
@@
-528,7
+528,7
@@
SILC_FSM_STATE(silc_server_st_command_whois)
/** WHOIS query */
silc_fsm_next(fsm, silc_server_st_query_whois);
/** WHOIS query */
silc_fsm_next(fsm, silc_server_st_query_whois);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
}
@@
-544,7
+544,7
@@
SILC_FSM_STATE(silc_server_st_command_whowas)
/** WHOWAS query */
silc_fsm_next(fsm, silc_server_st_query_whowas);
/** WHOWAS query */
silc_fsm_next(fsm, silc_server_st_query_whowas);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
}
@@
-560,7
+560,7
@@
SILC_FSM_STATE(silc_server_st_command_identify)
/** IDENTIFY query */
silc_fsm_next(fsm, silc_server_st_query_identify);
/** IDENTIFY query */
silc_fsm_next(fsm, silc_server_st_query_identify);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
}
@@
-664,7
+664,7
@@
SILC_FSM_STATE(silc_server_st_command_nick)
out:
silc_server_command_free(cmd);
out:
silc_server_command_free(cmd);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-676,7
+676,7
@@
SILC_FSM_STATE(silc_server_st_command_list)
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-688,7
+688,7
@@
SILC_FSM_STATE(silc_server_st_command_topic)
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-700,7
+700,7
@@
SILC_FSM_STATE(silc_server_st_command_invite)
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-712,7
+712,7
@@
SILC_FSM_STATE(silc_server_st_command_quit)
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-724,7
+724,7
@@
SILC_FSM_STATE(silc_server_st_command_kill)
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-732,7
+732,7
@@
SILC_FSM_STATE(silc_server_st_command_kill)
SILC_FSM_STATE(silc_server_st_command_info)
{
SILC_FSM_STATE(silc_server_st_command_info)
{
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-744,7
+744,7
@@
SILC_FSM_STATE(silc_server_st_command_stats)
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-789,7
+789,7
@@
SILC_FSM_STATE(silc_server_st_command_ping)
out:
silc_server_command_free(cmd);
out:
silc_server_command_free(cmd);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-801,7
+801,7
@@
SILC_FSM_STATE(silc_server_st_command_oper)
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-813,7
+813,7
@@
SILC_FSM_STATE(silc_server_st_command_join)
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-825,7
+825,7
@@
SILC_FSM_STATE(silc_server_st_command_motd)
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-837,7
+837,7
@@
SILC_FSM_STATE(silc_server_st_command_umode)
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-849,7
+849,7
@@
SILC_FSM_STATE(silc_server_st_command_cmode)
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-861,7
+861,7
@@
SILC_FSM_STATE(silc_server_st_command_cumode)
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-873,7
+873,7
@@
SILC_FSM_STATE(silc_server_st_command_kick)
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-885,7
+885,7
@@
SILC_FSM_STATE(silc_server_st_command_ban)
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-897,7
+897,7
@@
SILC_FSM_STATE(silc_server_st_command_detach)
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-909,7
+909,7
@@
SILC_FSM_STATE(silc_server_st_command_watch)
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-921,7
+921,7
@@
SILC_FSM_STATE(silc_server_st_command_silcoper)
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-933,7
+933,7
@@
SILC_FSM_STATE(silc_server_st_command_leave)
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-945,7
+945,7
@@
SILC_FSM_STATE(silc_server_st_command_users)
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-957,7
+957,7
@@
SILC_FSM_STATE(silc_server_st_command_getkey)
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-969,5
+969,5
@@
SILC_FSM_STATE(silc_server_st_command_service)
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
SilcServerCommand cmd = state_context;
SilcArgumentPayload args = silc_command_get_args(cmd->payload);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
diff --git
a/lib/silcserver/server_st_command_reply.c
b/lib/silcserver/server_st_command_reply.c
index 558d2f492b6448f957c75f96168708443e5d0696..83ddfd0686895d4411b75be508085c932a8b31ae 100644
(file)
--- a/
lib/silcserver/server_st_command_reply.c
+++ b/
lib/silcserver/server_st_command_reply.c
@@
-71,7
+71,7
@@
SILC_FSM_STATE(silc_server_st_packet_command_reply)
cmd = silc_server_command_alloc(thread);
if (!cmd) {
silc_packet_free(packet);
cmd = silc_server_command_alloc(thread);
if (!cmd) {
silc_packet_free(packet);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
cmd->packet = packet;
}
cmd->packet = packet;
@@
-82,14
+82,14
@@
SILC_FSM_STATE(silc_server_st_packet_command_reply)
if (!cmd->payload) {
SILC_LOG_DEBUG(("Bad command reply payload"));
silc_server_command_reply_free(cmd);
if (!cmd->payload) {
SILC_LOG_DEBUG(("Bad command reply payload"));
silc_server_command_reply_free(cmd);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
/* Client is allowed to send reply only to WHOIS command. */
if (data->type == SILC_CONN_CLIENT &&
silc_command_get(cmd->payload) != SILC_COMMAND_WHOIS) {
silc_server_command_reply_free(cmd);
}
/* Client is allowed to send reply only to WHOIS command. */
if (data->type == SILC_CONN_CLIENT &&
silc_command_get(cmd->payload) != SILC_COMMAND_WHOIS) {
silc_server_command_reply_free(cmd);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
/* Get all command pending for this reply */
}
/* Get all command pending for this reply */
@@
-171,13
+171,13
@@
SILC_FSM_STATE(silc_server_st_packet_command_reply)
SILC_LOG_DEBUG(("Unknown command %d", silc_command_get(cmd->payload)));
cmd->pending = NULL;
silc_server_command_reply_free(cmd);
SILC_LOG_DEBUG(("Unknown command %d", silc_command_get(cmd->payload)));
cmd->pending = NULL;
silc_server_command_reply_free(cmd);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
break;
}
/* Statistics */
break;
}
/* Statistics */
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
}
@@
-196,7
+196,7
@@
SILC_FSM_STATE(silc_server_st_command_reply_whois)
err:
silc_server_command_reply_free(cmd);
err:
silc_server_command_reply_free(cmd);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-215,7
+215,7
@@
SILC_FSM_STATE(silc_server_st_command_reply_whowas)
err:
silc_server_command_reply_free(cmd);
err:
silc_server_command_reply_free(cmd);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-234,7
+234,7
@@
SILC_FSM_STATE(silc_server_st_command_reply_identify)
err:
silc_server_command_reply_free(cmd);
err:
silc_server_command_reply_free(cmd);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-253,7
+253,7
@@
SILC_FSM_STATE(silc_server_st_command_reply_list)
err:
silc_server_command_reply_free(cmd);
err:
silc_server_command_reply_free(cmd);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-272,7
+272,7
@@
SILC_FSM_STATE(silc_server_st_command_reply_info)
err:
silc_server_command_reply_free(cmd);
err:
silc_server_command_reply_free(cmd);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-319,7
+319,7
@@
SILC_FSM_STATE(silc_server_st_command_reply_stats)
err:
silc_server_command_reply_free(cmd);
err:
silc_server_command_reply_free(cmd);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-338,7
+338,7
@@
SILC_FSM_STATE(silc_server_st_command_reply_ping)
err:
silc_server_command_reply_free(cmd);
err:
silc_server_command_reply_free(cmd);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-357,7
+357,7
@@
SILC_FSM_STATE(silc_server_st_command_reply_join)
err:
silc_server_command_reply_free(cmd);
err:
silc_server_command_reply_free(cmd);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-376,7
+376,7
@@
SILC_FSM_STATE(silc_server_st_command_reply_motd)
err:
silc_server_command_reply_free(cmd);
err:
silc_server_command_reply_free(cmd);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-395,7
+395,7
@@
SILC_FSM_STATE(silc_server_st_command_reply_watch)
err:
silc_server_command_reply_free(cmd);
err:
silc_server_command_reply_free(cmd);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-414,7
+414,7
@@
SILC_FSM_STATE(silc_server_st_command_reply_users)
err:
silc_server_command_reply_free(cmd);
err:
silc_server_command_reply_free(cmd);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-493,7
+493,7
@@
SILC_FSM_STATE(silc_server_st_command_reply_getkey)
err:
silc_server_command_reply_free(cmd);
err:
silc_server_command_reply_free(cmd);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
@@
-512,5
+512,5
@@
SILC_FSM_STATE(silc_server_st_command_reply_service)
err:
silc_server_command_reply_free(cmd);
err:
silc_server_command_reply_free(cmd);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
diff --git
a/lib/silcserver/server_st_connect.c
b/lib/silcserver/server_st_connect.c
index e29de086e3c2e444a84bd2ea10f5018beca6493f..aeca05996ba2658c4a6ab14f7654483c394abb97 100644
(file)
--- a/
lib/silcserver/server_st_connect.c
+++ b/
lib/silcserver/server_st_connect.c
@@
-32,5
+32,5
@@
SILC_FSM_STATE(silc_server_st_connect_router)
/** Wait events */
server->connect_router = FALSE;
silc_fsm_next(fsm, silc_server_st_run);
/** Wait events */
server->connect_router = FALSE;
silc_fsm_next(fsm, silc_server_st_run);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
}
diff --git
a/lib/silcserver/server_st_notify.c
b/lib/silcserver/server_st_notify.c
index 06b57dfb0e0126eac20a4e40950e48ceb02a79e6..73c7aea0c2e3a3c2c21b3754d305a4e65e6b23b0 100644
(file)
--- a/
lib/silcserver/server_st_notify.c
+++ b/
lib/silcserver/server_st_notify.c
@@
-27,5
+27,5
@@
SILC_FSM_STATE(silc_server_st_packet_notify)
SilcPacket packet = state_context;
SilcEntryData data = silc_packet_get_context(packet->stream);
SilcPacket packet = state_context;
SilcEntryData data = silc_packet_get_context(packet->stream);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
diff --git
a/lib/silcserver/server_st_packet.c
b/lib/silcserver/server_st_packet.c
index 5f0f3caf158bc795ee012a8ba10d25572b44afc4..9756670be60ec61649eba5814e8a2e2892fbf2fe 100644
(file)
--- a/
lib/silcserver/server_st_packet.c
+++ b/
lib/silcserver/server_st_packet.c
@@
-34,7
+34,7
@@
SILC_FSM_STATE(silc_server_st_packet_disconnect)
SilcPacket packet = fsm_context;
SilcEntryData data = silc_packet_get_context(packet->stream);
SilcPacket packet = fsm_context;
SilcEntryData data = silc_packet_get_context(packet->stream);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
SILC_FSM_STATE(silc_server_st_packet_channel_message)
}
SILC_FSM_STATE(silc_server_st_packet_channel_message)
@@
-51,7
+51,7
@@
SILC_FSM_STATE(silc_server_st_packet_channel_message)
silc_server_channel_message(server, sock, packet);
#endif
silc_server_channel_message(server, sock, packet);
#endif
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
SILC_FSM_STATE(silc_server_st_packet_channel_key)
}
SILC_FSM_STATE(silc_server_st_packet_channel_key)
@@
-68,7
+68,7
@@
SILC_FSM_STATE(silc_server_st_packet_channel_key)
silc_server_channel_key(server, sock, packet);
#endif
silc_server_channel_key(server, sock, packet);
#endif
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
SILC_FSM_STATE(silc_server_st_packet_private_message)
}
SILC_FSM_STATE(silc_server_st_packet_private_message)
@@
-84,7
+84,7
@@
SILC_FSM_STATE(silc_server_st_packet_private_message)
silc_server_private_message(server, sock, packet);
#endif
silc_server_private_message(server, sock, packet);
#endif
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
SILC_FSM_STATE(silc_server_st_packet_private_message_key)
}
SILC_FSM_STATE(silc_server_st_packet_private_message_key)
@@
-98,7
+98,7
@@
SILC_FSM_STATE(silc_server_st_packet_private_message_key)
silc_server_private_message_key(server, sock, packet);
#endif
silc_server_private_message_key(server, sock, packet);
#endif
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
SILC_FSM_STATE(silc_server_st_packet_new_id)
}
SILC_FSM_STATE(silc_server_st_packet_new_id)
@@
-116,7
+116,7
@@
SILC_FSM_STATE(silc_server_st_packet_new_id)
silc_server_new_id(server, sock, packet);
#endif
silc_server_new_id(server, sock, packet);
#endif
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
SILC_FSM_STATE(silc_server_st_packet_new_channel)
}
SILC_FSM_STATE(silc_server_st_packet_new_channel)
@@
-132,7
+132,7
@@
SILC_FSM_STATE(silc_server_st_packet_new_channel)
silc_server_new_channel(server, sock, packet);
#endif
silc_server_new_channel(server, sock, packet);
#endif
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
SILC_FSM_STATE(silc_server_st_packet_key_agreement)
}
SILC_FSM_STATE(silc_server_st_packet_key_agreement)
@@
-143,7
+143,7
@@
SILC_FSM_STATE(silc_server_st_packet_key_agreement)
silc_server_key_agreement(server, sock, packet);
#endif
silc_server_key_agreement(server, sock, packet);
#endif
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
SILC_FSM_STATE(silc_server_st_packet_ftp)
}
SILC_FSM_STATE(silc_server_st_packet_ftp)
@@
-155,7
+155,7
@@
SILC_FSM_STATE(silc_server_st_packet_ftp)
silc_server_ftp(server, sock, packet);
#endif
silc_server_ftp(server, sock, packet);
#endif
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
SILC_FSM_STATE(silc_server_st_packet_resume_router)
}
SILC_FSM_STATE(silc_server_st_packet_resume_router)
@@
-168,7
+168,7
@@
SILC_FSM_STATE(silc_server_st_packet_resume_router)
silc_server_backup_resume_router(server, sock, packet);
#endif
silc_server_backup_resume_router(server, sock, packet);
#endif
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
SILC_FSM_STATE(silc_server_st_packet_received)
}
SILC_FSM_STATE(silc_server_st_packet_received)
@@
-186,7
+186,7
@@
SILC_FSM_STATE(silc_server_st_packet_received)
if (packet->flags & SILC_PACKET_FLAG_LIST)
break;
silc_fsm_next(fsm, silc_server_st_packet_channel_message);
if (packet->flags & SILC_PACKET_FLAG_LIST)
break;
silc_fsm_next(fsm, silc_server_st_packet_channel_message);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
break;
case SILC_PACKET_PRIVATE_MESSAGE:
break;
case SILC_PACKET_PRIVATE_MESSAGE:
@@
-194,13
+194,13
@@
SILC_FSM_STATE(silc_server_st_packet_received)
if (packet->flags & SILC_PACKET_FLAG_LIST)
break;
silc_fsm_next(fsm, silc_server_st_packet_private_message);
if (packet->flags & SILC_PACKET_FLAG_LIST)
break;
silc_fsm_next(fsm, silc_server_st_packet_private_message);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
break;
case SILC_PACKET_NOTIFY:
/** Packet NOTIFY */
silc_fsm_next(fsm, silc_server_st_packet_notify);
break;
case SILC_PACKET_NOTIFY:
/** Packet NOTIFY */
silc_fsm_next(fsm, silc_server_st_packet_notify);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
break;
case SILC_PACKET_COMMAND:
break;
case SILC_PACKET_COMMAND:
@@
-208,7
+208,7
@@
SILC_FSM_STATE(silc_server_st_packet_received)
if (packet->flags & SILC_PACKET_FLAG_LIST)
break;
silc_fsm_next(fsm, silc_server_st_packet_command);
if (packet->flags & SILC_PACKET_FLAG_LIST)
break;
silc_fsm_next(fsm, silc_server_st_packet_command);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
break;
case SILC_PACKET_COMMAND_REPLY:
break;
case SILC_PACKET_COMMAND_REPLY:
@@
-216,7
+216,7
@@
SILC_FSM_STATE(silc_server_st_packet_received)
if (packet->flags & SILC_PACKET_FLAG_LIST)
break;
silc_fsm_next(fsm, silc_server_st_packet_command_reply);
if (packet->flags & SILC_PACKET_FLAG_LIST)
break;
silc_fsm_next(fsm, silc_server_st_packet_command_reply);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
break;
case SILC_PACKET_CHANNEL_KEY:
break;
case SILC_PACKET_CHANNEL_KEY:
@@
-224,13
+224,13
@@
SILC_FSM_STATE(silc_server_st_packet_received)
if (packet->flags & SILC_PACKET_FLAG_LIST)
break;
silc_fsm_next(fsm, silc_server_st_packet_channel_key);
if (packet->flags & SILC_PACKET_FLAG_LIST)
break;
silc_fsm_next(fsm, silc_server_st_packet_channel_key);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
break;
case SILC_PACKET_NEW_ID:
/** Packet NEW_ID */
silc_fsm_next(fsm, silc_server_st_packet_new_id);
break;
case SILC_PACKET_NEW_ID:
/** Packet NEW_ID */
silc_fsm_next(fsm, silc_server_st_packet_new_id);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
break;
case SILC_PACKET_NEW_CLIENT:
break;
case SILC_PACKET_NEW_CLIENT:
@@
-238,7
+238,7
@@
SILC_FSM_STATE(silc_server_st_packet_received)
if (packet->flags & SILC_PACKET_FLAG_LIST)
break;
silc_fsm_next(fsm, silc_server_st_packet_new_client);
if (packet->flags & SILC_PACKET_FLAG_LIST)
break;
silc_fsm_next(fsm, silc_server_st_packet_new_client);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
break;
case SILC_PACKET_NEW_SERVER:
break;
case SILC_PACKET_NEW_SERVER:
@@
-246,13
+246,13
@@
SILC_FSM_STATE(silc_server_st_packet_received)
if (packet->flags & SILC_PACKET_FLAG_LIST)
break;
silc_fsm_next(fsm, silc_server_st_packet_new_server);
if (packet->flags & SILC_PACKET_FLAG_LIST)
break;
silc_fsm_next(fsm, silc_server_st_packet_new_server);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
break;
case SILC_PACKET_NEW_CHANNEL:
/** Packet NEW_CHANNEL */
silc_fsm_next(fsm, silc_server_st_packet_new_channel);
break;
case SILC_PACKET_NEW_CHANNEL:
/** Packet NEW_CHANNEL */
silc_fsm_next(fsm, silc_server_st_packet_new_channel);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
break;
case SILC_PACKET_KEY_AGREEMENT:
break;
case SILC_PACKET_KEY_AGREEMENT:
@@
-260,7
+260,7
@@
SILC_FSM_STATE(silc_server_st_packet_received)
if (packet->flags & SILC_PACKET_FLAG_LIST)
break;
silc_fsm_next(fsm, silc_server_st_packet_key_agreement);
if (packet->flags & SILC_PACKET_FLAG_LIST)
break;
silc_fsm_next(fsm, silc_server_st_packet_key_agreement);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
break;
case SILC_PACKET_FTP:
break;
case SILC_PACKET_FTP:
@@
-268,7
+268,7
@@
SILC_FSM_STATE(silc_server_st_packet_received)
if (packet->flags & SILC_PACKET_FLAG_LIST)
break;
silc_fsm_next(fsm, silc_server_st_packet_ftp);
if (packet->flags & SILC_PACKET_FLAG_LIST)
break;
silc_fsm_next(fsm, silc_server_st_packet_ftp);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
break;
case SILC_PACKET_RESUME_CLIENT:
break;
case SILC_PACKET_RESUME_CLIENT:
@@
-276,7
+276,7
@@
SILC_FSM_STATE(silc_server_st_packet_received)
if (packet->flags & SILC_PACKET_FLAG_LIST)
break;
silc_fsm_next(fsm, silc_server_st_packet_resume_client);
if (packet->flags & SILC_PACKET_FLAG_LIST)
break;
silc_fsm_next(fsm, silc_server_st_packet_resume_client);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
break;
case SILC_PACKET_RESUME_ROUTER:
break;
case SILC_PACKET_RESUME_ROUTER:
@@
-284,7
+284,7
@@
SILC_FSM_STATE(silc_server_st_packet_received)
if (packet->flags & SILC_PACKET_FLAG_LIST)
break;
silc_fsm_next(fsm, silc_server_st_packet_resume_router);
if (packet->flags & SILC_PACKET_FLAG_LIST)
break;
silc_fsm_next(fsm, silc_server_st_packet_resume_router);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
break;
case SILC_PACKET_DISCONNECT:
break;
case SILC_PACKET_DISCONNECT:
@@
-292,7
+292,7
@@
SILC_FSM_STATE(silc_server_st_packet_received)
if (packet->flags & SILC_PACKET_FLAG_LIST)
break;
silc_fsm_next(fsm, silc_server_st_packet_disconnect);
if (packet->flags & SILC_PACKET_FLAG_LIST)
break;
silc_fsm_next(fsm, silc_server_st_packet_disconnect);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
break;
case SILC_PACKET_PRIVATE_MESSAGE_KEY:
break;
case SILC_PACKET_PRIVATE_MESSAGE_KEY:
@@
-300,7
+300,7
@@
SILC_FSM_STATE(silc_server_st_packet_received)
if (packet->flags & SILC_PACKET_FLAG_LIST)
break;
silc_fsm_next(fsm, silc_server_st_packet_private_message_key);
if (packet->flags & SILC_PACKET_FLAG_LIST)
break;
silc_fsm_next(fsm, silc_server_st_packet_private_message_key);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
break;
case SILC_PACKET_HEARTBEAT:
break;
case SILC_PACKET_HEARTBEAT:
@@
-323,7
+323,7
@@
SILC_FSM_STATE(silc_server_st_packet_received)
}
silc_packet_free(packet);
}
silc_packet_free(packet);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
/* Received NEW_CLIENT packet, used to register client to SILC network. */
}
/* Received NEW_CLIENT packet, used to register client to SILC network. */
@@
-336,14
+336,14
@@
SILC_FSM_STATE(silc_server_st_packet_new_client)
if (!ac || ac->register_packet) {
silc_packet_free(packet);
if (!ac || ac->register_packet) {
silc_packet_free(packet);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
/* Signal that client registers to network */
ac->register_packet = packet;
SILC_FSM_EVENT_SIGNAL(&ac->wait_register);
}
/* Signal that client registers to network */
ac->register_packet = packet;
SILC_FSM_EVENT_SIGNAL(&ac->wait_register);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
/* Received NEW_SERVER packet, used to register server to SILC network. */
}
/* Received NEW_SERVER packet, used to register server to SILC network. */
@@
-356,14
+356,14
@@
SILC_FSM_STATE(silc_server_st_packet_new_server)
if (!ac || ac->register_packet) {
silc_packet_free(packet);
if (!ac || ac->register_packet) {
silc_packet_free(packet);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
/* Signal that server registers to network */
ac->register_packet = packet;
SILC_FSM_EVENT_SIGNAL(&ac->wait_register);
}
/* Signal that server registers to network */
ac->register_packet = packet;
SILC_FSM_EVENT_SIGNAL(&ac->wait_register);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
/* Received RESUME_CLIENT packet, used to resume detached session. */
}
/* Received RESUME_CLIENT packet, used to resume detached session. */
@@
-376,12
+376,12
@@
SILC_FSM_STATE(silc_server_st_packet_resume_client)
if (!ac || ac->register_packet) {
silc_packet_free(packet);
if (!ac || ac->register_packet) {
silc_packet_free(packet);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
/* Signal that client resumes session */
ac->register_packet = packet;
SILC_FSM_EVENT_SIGNAL(&ac->wait_register);
}
/* Signal that client resumes session */
ac->register_packet = packet;
SILC_FSM_EVENT_SIGNAL(&ac->wait_register);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
}
diff --git
a/lib/silcserver/server_st_query.c
b/lib/silcserver/server_st_query.c
index 8c9a1aab6b10b8ae42749e395cef67b158af26f9..6ee135e9e8be4070308d16c5e9ffaba759ba1833 100644
(file)
--- a/
lib/silcserver/server_st_query.c
+++ b/
lib/silcserver/server_st_query.c
@@
-90,7
+90,7
@@
SILC_FSM_STATE(silc_server_st_query_whois)
query = silc_calloc(1, sizeof(*query));
if (!query) {
silc_server_command_free(cmd);
query = silc_calloc(1, sizeof(*query));
if (!query) {
silc_server_command_free(cmd);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
query->querycmd = SILC_COMMAND_WHOIS;
}
query->querycmd = SILC_COMMAND_WHOIS;
@@
-109,12
+109,12
@@
SILC_FSM_STATE(silc_server_st_query_whois)
silc_argument_get_arg_type(args, 3, NULL)))) {
/** Send query to router */
silc_fsm_next(fsm, silc_server_st_query_send_router);
silc_argument_get_arg_type(args, 3, NULL)))) {
/** Send query to router */
silc_fsm_next(fsm, silc_server_st_query_send_router);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/** Parse WHOIS query */
silc_fsm_next(fsm, silc_server_st_query_parse);
}
/** Parse WHOIS query */
silc_fsm_next(fsm, silc_server_st_query_parse);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
}
@@
-130,7
+130,7
@@
SILC_FSM_STATE(silc_server_st_query_whowas)
query = silc_calloc(1, sizeof(*query));
if (!query) {
silc_server_command_free(cmd);
query = silc_calloc(1, sizeof(*query));
if (!query) {
silc_server_command_free(cmd);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
query->querycmd = SILC_COMMAND_WHOWAS;
}
query->querycmd = SILC_COMMAND_WHOWAS;
@@
-143,12
+143,12
@@
SILC_FSM_STATE(silc_server_st_query_whowas)
cmd->packet->stream != SILC_PRIMARY_ROUTE(server)) {
/** Send query to router */
silc_fsm_next(fsm, silc_server_st_query_send_router);
cmd->packet->stream != SILC_PRIMARY_ROUTE(server)) {
/** Send query to router */
silc_fsm_next(fsm, silc_server_st_query_send_router);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/** Parse WHOWAS query */
silc_fsm_next(fsm, silc_server_st_query_parse);
}
/** Parse WHOWAS query */
silc_fsm_next(fsm, silc_server_st_query_parse);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
}
@@
-165,7
+165,7
@@
SILC_FSM_STATE(silc_server_st_query_identify)
query = silc_calloc(1, sizeof(*query));
if (!query) {
silc_server_command_free(cmd);
query = silc_calloc(1, sizeof(*query));
if (!query) {
silc_server_command_free(cmd);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
query->querycmd = SILC_COMMAND_IDENTIFY;
}
query->querycmd = SILC_COMMAND_IDENTIFY;
@@
-180,12
+180,12
@@
SILC_FSM_STATE(silc_server_st_query_identify)
!silc_argument_get_arg_type(args, 5, NULL)) {
/** Send query to router */
silc_fsm_next(fsm, silc_server_st_query_send_router);
!silc_argument_get_arg_type(args, 5, NULL)) {
/** Send query to router */
silc_fsm_next(fsm, silc_server_st_query_send_router);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/** Parse IDENTIFY query */
silc_fsm_next(fsm, silc_server_st_query_parse);
}
/** Parse IDENTIFY query */
silc_fsm_next(fsm, silc_server_st_query_parse);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
}
@@
-216,7
+216,7
@@
SILC_FSM_STATE(silc_server_st_query_send_router)
silc_server_query_send_error(server, query,
SILC_STATUS_ERR_RESOURCE_LIMIT, 0);
silc_fsm_next(fsm, silc_server_st_query_error);
silc_server_query_send_error(server, query,
SILC_STATUS_ERR_RESOURCE_LIMIT, 0);
silc_fsm_next(fsm, silc_server_st_query_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
silc_command_set_ident(query->cmd->payload, old_ident);
}
silc_command_set_ident(query->cmd->payload, old_ident);
@@
-232,13
+232,13
@@
SILC_FSM_STATE(silc_server_st_query_send_router)
silc_server_query_send_error(server, query,
SILC_STATUS_ERR_RESOURCE_LIMIT, 0);
silc_fsm_next(fsm, silc_server_st_query_error);
silc_server_query_send_error(server, query,
SILC_STATUS_ERR_RESOURCE_LIMIT, 0);
silc_fsm_next(fsm, silc_server_st_query_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/** Wait router reply */
query->resolved = TRUE;
silc_fsm_next(fsm, silc_server_st_query_router_reply)
}
/** Wait router reply */
query->resolved = TRUE;
silc_fsm_next(fsm, silc_server_st_query_router_reply)
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* Wait for router reply and process the reply when it arrives. */
}
/* Wait for router reply and process the reply when it arrives. */
@@
-259,7
+259,7
@@
SILC_FSM_STATE(silc_server_st_query_router_reply)
silc_server_command_pending_free(thread, pending);
silc_server_query_send_error(server, query, SILC_STATUS_ERR_TIMEDOUT, 0);
silc_fsm_next(fsm, silc_server_st_query_error);
silc_server_command_pending_free(thread, pending);
silc_server_query_send_error(server, query, SILC_STATUS_ERR_TIMEDOUT, 0);
silc_fsm_next(fsm, silc_server_st_query_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* Check if the query failed */
}
/* Check if the query failed */
@@
-285,14
+285,14
@@
SILC_FSM_STATE(silc_server_st_query_router_reply)
/** Query error received */
silc_server_command_pending_free(thread, pending);
silc_fsm_next(fsm, silc_server_st_query_error);
/** Query error received */
silc_server_command_pending_free(thread, pending);
silc_fsm_next(fsm, silc_server_st_query_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
silc_server_command_pending_free(thread, pending);
/** Parse query command */
silc_fsm_next(fsm, silc_server_st_query_parse);
}
silc_server_command_pending_free(thread, pending);
/** Parse query command */
silc_fsm_next(fsm, silc_server_st_query_parse);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/***************************** Query processing *****************************/
}
/***************************** Query processing *****************************/
@@
-335,7
+335,7
@@
SILC_FSM_STATE(silc_server_st_query_parse)
/** Not enough arguments */
silc_fsm_next(fsm, silc_server_st_query_error);
/** Not enough arguments */
silc_fsm_next(fsm, silc_server_st_query_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* Get the nickname@server string and parse it */
}
/* Get the nickname@server string and parse it */
@@
-346,7
+346,7
@@
SILC_FSM_STATE(silc_server_st_query_parse)
silc_server_query_send_error(server, query,
SILC_STATUS_ERR_BAD_NICKNAME, 0);
silc_fsm_next(fsm, silc_server_st_query_error);
silc_server_query_send_error(server, query,
SILC_STATUS_ERR_BAD_NICKNAME, 0);
silc_fsm_next(fsm, silc_server_st_query_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* Check nickname */
}
/* Check nickname */
@@
-358,7
+358,7
@@
SILC_FSM_STATE(silc_server_st_query_parse)
silc_server_query_send_error(server, query,
SILC_STATUS_ERR_BAD_NICKNAME, 0);
silc_fsm_next(fsm, silc_server_st_query_error);
silc_server_query_send_error(server, query,
SILC_STATUS_ERR_BAD_NICKNAME, 0);
silc_fsm_next(fsm, silc_server_st_query_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* XXX why free nickname */
silc_free(query->nickname);
}
/* XXX why free nickname */
silc_free(query->nickname);
@@
-373,7
+373,7
@@
SILC_FSM_STATE(silc_server_st_query_parse)
silc_server_query_send_error(server, query,
SILC_STATUS_ERR_RESOURCE_LIMIT, 0);
silc_fsm_next(fsm, silc_server_st_query_error);
silc_server_query_send_error(server, query,
SILC_STATUS_ERR_RESOURCE_LIMIT, 0);
silc_fsm_next(fsm, silc_server_st_query_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
for (i = 0; i < argc - 3; i++) {
}
for (i = 0; i < argc - 3; i++) {
@@
-397,7
+397,7
@@
SILC_FSM_STATE(silc_server_st_query_parse)
query->ids = NULL;
query->ids_count = 0;
silc_fsm_next(fsm, silc_server_st_query_send_router);
query->ids = NULL;
query->ids_count = 0;
silc_fsm_next(fsm, silc_server_st_query_send_router);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
query->ids[query->ids_count] = id;
}
query->ids[query->ids_count] = id;
@@
-419,7
+419,7
@@
SILC_FSM_STATE(silc_server_st_query_parse)
silc_server_query_send_error(server, query,
SILC_STATUS_ERR_NOT_ENOUGH_PARAMS, 0);
silc_fsm_next(fsm, silc_server_st_query_error);
silc_server_query_send_error(server, query,
SILC_STATUS_ERR_NOT_ENOUGH_PARAMS, 0);
silc_fsm_next(fsm, silc_server_st_query_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* Get the nickname@server string and parse it */
}
/* Get the nickname@server string and parse it */
@@
-429,7
+429,7
@@
SILC_FSM_STATE(silc_server_st_query_parse)
silc_server_query_send_error(server, query,
SILC_STATUS_ERR_BAD_NICKNAME, 0);
silc_fsm_next(fsm, silc_server_st_query_error);
silc_server_query_send_error(server, query,
SILC_STATUS_ERR_BAD_NICKNAME, 0);
silc_fsm_next(fsm, silc_server_st_query_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* Check nickname */
}
/* Check nickname */
@@
-440,7
+440,7
@@
SILC_FSM_STATE(silc_server_st_query_parse)
silc_server_query_send_error(server, query,
SILC_STATUS_ERR_BAD_NICKNAME, 0);
silc_fsm_next(fsm, silc_server_st_query_error);
silc_server_query_send_error(server, query,
SILC_STATUS_ERR_BAD_NICKNAME, 0);
silc_fsm_next(fsm, silc_server_st_query_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* XXX why free nickname */
silc_free(query->nickname);
}
/* XXX why free nickname */
silc_free(query->nickname);
@@
-475,7
+475,7
@@
SILC_FSM_STATE(silc_server_st_query_parse)
silc_server_query_send_error(server, query,
SILC_STATUS_ERR_BAD_NICKNAME, 0);
silc_fsm_next(fsm, silc_server_st_query_error);
silc_server_query_send_error(server, query,
SILC_STATUS_ERR_BAD_NICKNAME, 0);
silc_fsm_next(fsm, silc_server_st_query_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* XXX why free nickname */
silc_free(query->nickname);
}
/* XXX why free nickname */
silc_free(query->nickname);
@@
-493,7
+493,7
@@
SILC_FSM_STATE(silc_server_st_query_parse)
silc_server_query_send_error(server, query,
SILC_STATUS_ERR_BAD_SERVER, 0);
silc_fsm_next(fsm, silc_server_st_query_error);
silc_server_query_send_error(server, query,
SILC_STATUS_ERR_BAD_SERVER, 0);
silc_fsm_next(fsm, silc_server_st_query_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
query->server_name = tmp;
}
}
query->server_name = tmp;
}
@@
-509,7
+509,7
@@
SILC_FSM_STATE(silc_server_st_query_parse)
silc_server_query_send_error(server, query,
SILC_STATUS_ERR_BAD_CHANNEL, 0);
silc_fsm_next(fsm, silc_server_st_query_error);
silc_server_query_send_error(server, query,
SILC_STATUS_ERR_BAD_CHANNEL, 0);
silc_fsm_next(fsm, silc_server_st_query_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
query->channel_name = tmp;
}
}
query->channel_name = tmp;
}
@@
-519,7
+519,7
@@
SILC_FSM_STATE(silc_server_st_query_parse)
silc_server_query_send_error(server, query,
SILC_STATUS_ERR_NOT_ENOUGH_PARAMS, 0);
silc_fsm_next(fsm, silc_server_st_query_error);
silc_server_query_send_error(server, query,
SILC_STATUS_ERR_NOT_ENOUGH_PARAMS, 0);
silc_fsm_next(fsm, silc_server_st_query_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
} else {
}
} else {
@@
-547,7
+547,7
@@
SILC_FSM_STATE(silc_server_st_query_parse)
query->ids = NULL;
query->ids_count = 0;
silc_fsm_next(fsm, silc_server_st_query_send_router);
query->ids = NULL;
query->ids_count = 0;
silc_fsm_next(fsm, silc_server_st_query_send_router);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
} else {
/* For now all other ID's except Client ID's are explicitly
}
} else {
/* For now all other ID's except Client ID's are explicitly
@@
-558,7
+558,7
@@
SILC_FSM_STATE(silc_server_st_query_parse)
query->ids = NULL;
query->ids_count = 0;
silc_fsm_next(fsm, silc_server_st_query_send_router);
query->ids = NULL;
query->ids_count = 0;
silc_fsm_next(fsm, silc_server_st_query_send_router);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
}
}
}
@@
-576,7
+576,7
@@
SILC_FSM_STATE(silc_server_st_query_parse)
/** Find entries for query */
silc_fsm_next(fsm, silc_server_st_query_find);
/** Find entries for query */
silc_fsm_next(fsm, silc_server_st_query_find);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* Find the entries according to the query */
}
/* Find the entries according to the query */
@@
-675,12
+675,12
@@
SILC_FSM_STATE(silc_server_st_query_find)
if (query->attrs) {
/** Check user attributes */
silc_fsm_next(fsm, silc_server_st_query_check_attrs);
if (query->attrs) {
/** Check user attributes */
silc_fsm_next(fsm, silc_server_st_query_check_attrs);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/** Process found entries */
silc_fsm_next(fsm, silc_server_st_query_process);
}
/** Process found entries */
silc_fsm_next(fsm, silc_server_st_query_process);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* Check user attributes to narrow down clients in WHOIS query */
}
/* Check user attributes to narrow down clients in WHOIS query */
@@
-690,7
+690,7
@@
SILC_FSM_STATE(silc_server_st_query_check_attrs)
/** Proecss found entries */
silc_fsm_next(fsm, silc_server_st_query_process);
/** Proecss found entries */
silc_fsm_next(fsm, silc_server_st_query_process);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* Process found entries */
}
/* Process found entries */
@@
-723,7
+723,7
@@
SILC_FSM_STATE(silc_server_st_query_process)
!silc_list_count(query->servers)) {
/** Nothing found, send errors */
silc_fsm_next(fsm, silc_server_st_query_reply);
!silc_list_count(query->servers)) {
/** Nothing found, send errors */
silc_fsm_next(fsm, silc_server_st_query_reply);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
#if 0
}
#if 0
@@
-852,12
+852,12
@@
SILC_FSM_STATE(silc_server_st_query_process)
if (silc_list_count(query->resolve)) {
/** Resolve entries */
silc_fsm_next(fsm, silc_server_st_query_resolve);
if (silc_list_count(query->resolve)) {
/** Resolve entries */
silc_fsm_next(fsm, silc_server_st_query_resolve);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/** Send reply to query */
silc_fsm_next(fsm, silc_server_st_query_reply);
}
/** Send reply to query */
silc_fsm_next(fsm, silc_server_st_query_reply);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* Resolve incomplete client entries. Other types of entries need not
}
/* Resolve incomplete client entries. Other types of entries need not
@@
-991,7
+991,7
@@
SILC_FSM_STATE(silc_server_st_query_resolve)
silc_server_query_send_error(server, query,
SILC_STATUS_ERR_RESOURCE_LIMIT, 0);
silc_fsm_next(fsm, silc_server_st_query_error);
silc_server_query_send_error(server, query,
SILC_STATUS_ERR_RESOURCE_LIMIT, 0);
silc_fsm_next(fsm, silc_server_st_query_error);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
silc_packet_send(res->stream, SILC_PACKET_COMMAND, 0,
}
silc_packet_send(res->stream, SILC_PACKET_COMMAND, 0,
@@
-1020,7
+1020,7
@@
SILC_FSM_STATE(silc_server_st_query_resolve)
/** Wait all resolvings */
silc_fsm_next(fsm, silc_server_st_query_resolved);
/** Wait all resolvings */
silc_fsm_next(fsm, silc_server_st_query_resolved);
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
/* Wait for resolving command reply */
}
/* Wait for resolving command reply */
@@
-1044,7
+1044,7
@@
SILC_FSM_STATE(silc_server_st_query_wait_resolve)
/* Signal main thread that reply was received */
SILC_FSM_EVENT_SIGNAL(&query->wait_resolve);
/* Signal main thread that reply was received */
SILC_FSM_EVENT_SIGNAL(&query->wait_resolve);
- SILC_FSM_FINISH;
+
return
SILC_FSM_FINISH;
}
/* Wait here that all resolvings has been received */
}
/* Wait here that all resolvings has been received */
@@
-1059,7
+1059,7
@@
SILC_FSM_STATE(silc_server_st_query_resolved)
/* Wait here until all resolvings has arrived */
SILC_FSM_EVENT_WAIT(&query->wait_resolve);
if (silc_list_count(query->resolvings) > 0)
/* Wait here until all resolvings has arrived */
SILC_FSM_EVENT_WAIT(&query->wait_resolve);
if (silc_list_count(query->resolvings) > 0)
- SILC_FSM_CONTINUE;
+
return
SILC_FSM_CONTINUE;
}
}