Merge commit 'origin/silc.1.1.branch'
[silc.git] / lib / silcclient / command_reply.h
index 76bddc1a0a8afa8c4fa0693189d8448d43e6baa1..be1b56434ae5afb00f233e55316347aae743c0b3 100644 (file)
@@ -2,15 +2,14 @@
 
   command_reply.h
 
-  Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
+  Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 1997 - 2000 Pekka Riikonen
+  Copyright (C) 2006 Pekka Riikonen
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-  
+  the Free Software Foundation; version 2 of the License.
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #ifndef COMMAND_REPLY_H
 #define COMMAND_REPLY_H
 
-/* Structure holding one command reply and pointer to its function. */
-typedef struct {
-  SilcCommandCb cb;
-  SilcCommand cmd;
-} SilcClientCommandReply;
-
-/* All client command replys */
-extern SilcClientCommandReply silc_command_reply_list[];
-
-/* Context sent as argument to all command reply functions */
-typedef struct {
-  SilcClient client;
-  SilcSocketConnection sock;
-  SilcCommandPayload payload;
-  SilcArgumentPayload args;
-  SilcPacketContext *packet;
-
-  /* If defined this executes the pending command. */
-  void *context;
-  SilcClientCommandCallback callback;
-} *SilcClientCommandReplyContext;
-
-/* Macros */
-
-/* Macro used for command declaration in command reply list structure */
-#define SILC_CLIENT_CMD_REPLY(func, cmd ) \
-{ silc_client_command_reply_##func, SILC_COMMAND_##cmd }
-
-/* Macro used to declare command reply functions */
-#define SILC_CLIENT_CMD_REPLY_FUNC(func) \
-void silc_client_command_reply_##func(void *context)
-
-/* Macro used to execute command replies */
-#define SILC_CLIENT_COMMAND_REPLY_EXEC(ctx)            \
-do {                                                   \
-  SilcClientCommandReply *cmd;                         \
-                                                       \
-  for (cmd = silc_command_reply_list; cmd->cb; cmd++)  \
-    if (cmd->cmd == silc_command_get(ctx->payload)) {  \
-      cmd->cb(ctx);                                    \
-      break;                                           \
-    }                                                  \
-                                                       \
-  if (cmd == NULL) {                                   \
-    silc_free(ctx);                                    \
-    return;                                            \
-  }                                                    \
-} while(0)
-
-/* Prototypes */
-void silc_client_command_reply_process(SilcClient client,
-                                      SilcSocketConnection sock,
-                                      SilcPacketContext *packet);
-SILC_CLIENT_CMD_REPLY_FUNC(whois);
-SILC_CLIENT_CMD_REPLY_FUNC(whowas);
-SILC_CLIENT_CMD_REPLY_FUNC(identify);
-SILC_CLIENT_CMD_REPLY_FUNC(nick);
-SILC_CLIENT_CMD_REPLY_FUNC(list);
-SILC_CLIENT_CMD_REPLY_FUNC(topic);
-SILC_CLIENT_CMD_REPLY_FUNC(invite);
-SILC_CLIENT_CMD_REPLY_FUNC(quit);
-SILC_CLIENT_CMD_REPLY_FUNC(kill);
-SILC_CLIENT_CMD_REPLY_FUNC(info);
-SILC_CLIENT_CMD_REPLY_FUNC(links);
-SILC_CLIENT_CMD_REPLY_FUNC(stats);
-SILC_CLIENT_CMD_REPLY_FUNC(users);
-SILC_CLIENT_CMD_REPLY_FUNC(connect);
-SILC_CLIENT_CMD_REPLY_FUNC(ping);
-SILC_CLIENT_CMD_REPLY_FUNC(pong);
-SILC_CLIENT_CMD_REPLY_FUNC(oper);
-SILC_CLIENT_CMD_REPLY_FUNC(join);
-SILC_CLIENT_CMD_REPLY_FUNC(motd);
-SILC_CLIENT_CMD_REPLY_FUNC(umode);
-SILC_CLIENT_CMD_REPLY_FUNC(cmode);
-SILC_CLIENT_CMD_REPLY_FUNC(cumode);
-SILC_CLIENT_CMD_REPLY_FUNC(kick);
-SILC_CLIENT_CMD_REPLY_FUNC(restart);
-SILC_CLIENT_CMD_REPLY_FUNC(close);
-SILC_CLIENT_CMD_REPLY_FUNC(die);
-SILC_CLIENT_CMD_REPLY_FUNC(silcoper);
-SILC_CLIENT_CMD_REPLY_FUNC(leave);
-SILC_CLIENT_CMD_REPLY_FUNC(names);
-
-#endif
+SILC_FSM_STATE(silc_client_command_reply);
+SILC_FSM_STATE(silc_client_command_reply_wait);
+SILC_FSM_STATE(silc_client_command_reply_timeout);
+SILC_FSM_STATE(silc_client_command_reply_process);
+SILC_FSM_STATE(silc_client_command_reply_processed);
+SILC_FSM_STATE(silc_client_command_reply_whois);
+SILC_FSM_STATE(silc_client_command_reply_whowas);
+SILC_FSM_STATE(silc_client_command_reply_identify);
+SILC_FSM_STATE(silc_client_command_reply_nick);
+SILC_FSM_STATE(silc_client_command_reply_list);
+SILC_FSM_STATE(silc_client_command_reply_topic);
+SILC_FSM_STATE(silc_client_command_reply_invite);
+SILC_FSM_STATE(silc_client_command_reply_kill);
+SILC_FSM_STATE(silc_client_command_reply_info);
+SILC_FSM_STATE(silc_client_command_reply_stats);
+SILC_FSM_STATE(silc_client_command_reply_ping);
+SILC_FSM_STATE(silc_client_command_reply_oper);
+SILC_FSM_STATE(silc_client_command_reply_join);
+SILC_FSM_STATE(silc_client_command_reply_motd);
+SILC_FSM_STATE(silc_client_command_reply_umode);
+SILC_FSM_STATE(silc_client_command_reply_cmode);
+SILC_FSM_STATE(silc_client_command_reply_cumode);
+SILC_FSM_STATE(silc_client_command_reply_kick);
+SILC_FSM_STATE(silc_client_command_reply_ban);
+SILC_FSM_STATE(silc_client_command_reply_detach);
+SILC_FSM_STATE(silc_client_command_reply_watch);
+SILC_FSM_STATE(silc_client_command_reply_silcoper);
+SILC_FSM_STATE(silc_client_command_reply_leave);
+SILC_FSM_STATE(silc_client_command_reply_users);
+SILC_FSM_STATE(silc_client_command_reply_getkey);
+SILC_FSM_STATE(silc_client_command_reply_service);
+SILC_FSM_STATE(silc_client_command_reply_quit);
+
+#endif /* COMMAND_REPLY_H */