projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SILC FSM API changes.
[silc.git]
/
lib
/
silcserver
/
server_st_packet.c
diff --git
a/lib/silcserver/server_st_packet.c
b/lib/silcserver/server_st_packet.c
index e8676ca829b696adb7077fe702812c8ee5d65e70..5f0f3caf158bc795ee012a8ba10d25572b44afc4 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);
-
return
SILC_FSM_FINISH;
+ 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
-
return
SILC_FSM_FINISH;
+ 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
-
return
SILC_FSM_FINISH;
+ 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
-
return
SILC_FSM_FINISH;
+ 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
-
return
SILC_FSM_FINISH;
+ 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
-
return
SILC_FSM_FINISH;
+ 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
-
return
SILC_FSM_FINISH;
+ 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
-
return
SILC_FSM_FINISH;
+ 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
-
return
SILC_FSM_FINISH;
+ 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
-
return
SILC_FSM_FINISH;
+ 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);
-
return
SILC_FSM_CONTINUE;
+ 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);
-
return
SILC_FSM_CONTINUE;
+ 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);
-
return
SILC_FSM_CONTINUE;
+ 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);
-
return
SILC_FSM_CONTINUE;
+ 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);
-
return
SILC_FSM_CONTINUE;
+ 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);
-
return
SILC_FSM_CONTINUE;
+ 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);
-
return
SILC_FSM_CONTINUE;
+ 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);
-
return
SILC_FSM_CONTINUE;
+ 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);
-
return
SILC_FSM_CONTINUE;
+ 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);
-
return
SILC_FSM_CONTINUE;
+ 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);
-
return
SILC_FSM_CONTINUE;
+ 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);
-
return
SILC_FSM_CONTINUE;
+ 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);
-
return
SILC_FSM_CONTINUE;
+ 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);
-
return
SILC_FSM_CONTINUE;
+ 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);
-
return
SILC_FSM_CONTINUE;
+ 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);
-
return
SILC_FSM_CONTINUE;
+ 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);
-
return
SILC_FSM_FINISH;
+ 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);
-
return
SILC_FSM_FINISH;
+ SILC_FSM_FINISH;
}
/* Signal that client registers to network */
ac->register_packet = packet;
}
/* Signal that client registers to network */
ac->register_packet = packet;
- SILC_FSM_
SEMA_POST
(&ac->wait_register);
+ SILC_FSM_
EVENT_SIGNAL
(&ac->wait_register);
-
return
SILC_FSM_FINISH;
+ 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);
-
return
SILC_FSM_FINISH;
+ SILC_FSM_FINISH;
}
/* Signal that server registers to network */
ac->register_packet = packet;
}
/* Signal that server registers to network */
ac->register_packet = packet;
- SILC_FSM_
SEMA_POST
(&ac->wait_register);
+ SILC_FSM_
EVENT_SIGNAL
(&ac->wait_register);
-
return
SILC_FSM_FINISH;
+ 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);
-
return
SILC_FSM_FINISH;
+ SILC_FSM_FINISH;
}
/* Signal that client resumes session */
ac->register_packet = packet;
}
/* Signal that client resumes session */
ac->register_packet = packet;
- SILC_FSM_
SEMA_POST
(&ac->wait_register);
+ SILC_FSM_
EVENT_SIGNAL
(&ac->wait_register);
-
return
SILC_FSM_FINISH;
+ SILC_FSM_FINISH;
}
}