SILC_FSM_* macro API changes.

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

diff --git a/lib/silcclient/command_reply.c b/lib/silcclient/command_reply.c
index 39e0f92837e71ecabbb53d3f1ea81e5972e7a900..a8411cc61c2b3faa4e33e469622231d540807cca 100644 (file)
--- a/lib/silcclient/command_reply.c
+++ b/lib/silcclient/command_reply.c
@@ -47,7 +47,7 @@ do {                                                          \
     ERROR_CALLBACK(cmd->error);                                                \
     silc_client_command_process_error(cmd, state_context, cmd->error); \
     silc_fsm_next(fsm, silc_client_command_reply_processed);           \
-    SILC_FSM_CONTINUE;                                         \
+    return SILC_FSM_CONTINUE;                                          \
   }
 
 /* Check for correct arguments */
@@ -56,7 +56,7 @@ do {                                                          \
       silc_argument_get_arg_num(args) > max) {                 \
     ERROR_CALLBACK(SILC_STATUS_ERR_NOT_ENOUGH_PARAMS);         \
     silc_fsm_next(fsm, silc_client_command_reply_processed);   \
-    SILC_FSM_CONTINUE;                                 \
+    return SILC_FSM_CONTINUE;                                  \
   }
 
 #define SAY cmd->conn->client->internal->ops->say
@@ -174,7 +174,7 @@ SILC_FSM_STATE(silc_client_command_reply)
   silc_packet_free(packet);
   if (!payload) {
     SILC_LOG_DEBUG(("Bad command reply packet"));
-    SILC_FSM_FINISH;
+    return SILC_FSM_FINISH;
   }
 
   cmd_ident = silc_command_get_ident(payload);
@@ -196,7 +196,7 @@ SILC_FSM_STATE(silc_client_command_reply)
     SILC_LOG_DEBUG(("Unknown command reply %s, ident %d",
                    silc_get_command_name(command), cmd_ident));
     silc_command_payload_free(payload);
-    SILC_FSM_FINISH;
+    return SILC_FSM_FINISH;
   }
 
   /* Signal command thread that command reply has arrived */
@@ -204,7 +204,7 @@ SILC_FSM_STATE(silc_client_command_reply)
   silc_fsm_next(&cmd->thread, silc_client_command_reply_process);
   silc_fsm_continue_sync(&cmd->thread);
 
-  SILC_FSM_FINISH;
+  return SILC_FSM_FINISH;
 }
 
 /* Wait here for command reply to arrive from remote host */
@@ -219,7 +219,7 @@ SILC_FSM_STATE(silc_client_command_reply_wait)
   silc_fsm_set_state_context(fsm, NULL);
   silc_fsm_next_later(fsm, silc_client_command_reply_timeout,
                      cmd->cmd != SILC_COMMAND_PING ? 25 : 60, 0);
-  SILC_FSM_WAIT;
+  return SILC_FSM_WAIT;
 }
 
 /* Timeout occurred while waiting command reply */
@@ -233,9 +233,9 @@ SILC_FSM_STATE(silc_client_command_reply_timeout)
   if (conn->internal->disconnected) {
     SILC_LOG_DEBUG(("Command %s canceled", silc_get_command_name(cmd->cmd)));
     silc_list_del(conn->internal->pending_commands, cmd);
-    if (!cmd->called)
+    if (!cmd->called && cmd->cmd != SILC_COMMAND_PING)
       ERROR_CALLBACK(SILC_STATUS_ERR_TIMEDOUT);
-    SILC_FSM_FINISH;
+    return SILC_FSM_FINISH;
   }
 
   SILC_LOG_DEBUG(("Command %s timeout", silc_get_command_name(cmd->cmd)));
@@ -243,7 +243,7 @@ SILC_FSM_STATE(silc_client_command_reply_timeout)
   /* Timeout, reply not received in timely fashion */
   silc_list_del(conn->internal->pending_commands, cmd);
   ERROR_CALLBACK(SILC_STATUS_ERR_TIMEDOUT);
-  SILC_FSM_FINISH;
+  return SILC_FSM_FINISH;
 }
 
 /* Process received command reply payload */
@@ -365,10 +365,10 @@ SILC_FSM_STATE(silc_client_command_reply_process)
     silc_fsm_next(fsm, silc_client_command_reply_service);
     break;
   default:
-    SILC_FSM_FINISH;
+    return SILC_FSM_FINISH;
   }
 
-  SILC_FSM_CONTINUE;
+  return SILC_FSM_CONTINUE;
 }
 
 /* Completes command reply processing */
@@ -383,7 +383,7 @@ SILC_FSM_STATE(silc_client_command_reply_processed)
 
   if (cmd->status == SILC_STATUS_OK || cmd->status == SILC_STATUS_LIST_END ||
       SILC_STATUS_IS_ERROR(cmd->status))
-    SILC_FSM_FINISH;
+    return SILC_FSM_FINISH;
 
   /* Add back to pending command reply list */
   silc_mutex_lock(conn->internal->lock);
@@ -393,7 +393,7 @@ SILC_FSM_STATE(silc_client_command_reply_processed)
 
   /** Wait more command payloads */
   silc_fsm_next(fsm, silc_client_command_reply_wait);
-  SILC_FSM_CONTINUE;
+  return SILC_FSM_CONTINUE;
 }
 
 /******************************** WHOIS *************************************/
@@ -513,7 +513,7 @@ SILC_FSM_STATE(silc_client_command_reply_whois)
 
  out:
   silc_fsm_next(fsm, silc_client_command_reply_processed);
-  SILC_FSM_CONTINUE;
+  return SILC_FSM_CONTINUE;
 }
 
 /******************************** WHOWAS ************************************/
@@ -561,7 +561,7 @@ SILC_FSM_STATE(silc_client_command_reply_whowas)
  out:
   silc_client_unref_client(client, conn, client_entry);
   silc_fsm_next(fsm, silc_client_command_reply_processed);
-  SILC_FSM_CONTINUE;
+  return SILC_FSM_CONTINUE;
 }
 
 /******************************** IDENTIFY **********************************/
@@ -677,7 +677,7 @@ SILC_FSM_STATE(silc_client_command_reply_identify)
 
  out:
   silc_fsm_next(fsm, silc_client_command_reply_processed);
-  SILC_FSM_CONTINUE;
+  return SILC_FSM_CONTINUE;
 }
 
 /********************************** NICK ************************************/
@@ -732,7 +732,7 @@ SILC_FSM_STATE(silc_client_command_reply_nick)
 
  out:
   silc_fsm_next(fsm, silc_client_command_reply_processed);
-  SILC_FSM_CONTINUE;
+  return SILC_FSM_CONTINUE;
 }
 
 /********************************** LIST ************************************/
@@ -758,7 +758,7 @@ SILC_FSM_STATE(silc_client_command_reply_list)
     /* There were no channels in the network. */
     silc_client_command_callback(cmd, NULL, NULL, NULL, 0);
     silc_fsm_next(fsm, silc_client_command_reply_processed);
-    SILC_FSM_CONTINUE;
+    return SILC_FSM_CONTINUE;
   }
 
   CHECK_ARGS(3, 5);
@@ -794,7 +794,7 @@ SILC_FSM_STATE(silc_client_command_reply_list)
  out:
   silc_client_unref_channel(client, conn, channel_entry);
   silc_fsm_next(fsm, silc_client_command_reply_processed);
-  SILC_FSM_CONTINUE;
+  return SILC_FSM_CONTINUE;
 }
 
 /********************************* TOPIC ************************************/
@@ -842,7 +842,7 @@ SILC_FSM_STATE(silc_client_command_reply_topic)
 
  out:
   silc_fsm_next(fsm, silc_client_command_reply_processed);
-  SILC_FSM_CONTINUE;
+  return SILC_FSM_CONTINUE;
 }
 
 /********************************* INVITE ***********************************/
@@ -892,7 +892,7 @@ SILC_FSM_STATE(silc_client_command_reply_invite)
 
  out:
   silc_fsm_next(fsm, silc_client_command_reply_processed);
-  SILC_FSM_CONTINUE;
+  return SILC_FSM_CONTINUE;
 }
 
 /********************************** KILL ************************************/
@@ -933,7 +933,7 @@ SILC_FSM_STATE(silc_client_command_reply_kill)
 
  out:
   silc_fsm_next(fsm, silc_client_command_reply_processed);
-  SILC_FSM_CONTINUE;
+  return SILC_FSM_CONTINUE;
 }
 
 /********************************** INFO ************************************/
@@ -994,7 +994,7 @@ SILC_FSM_STATE(silc_client_command_reply_info)
 
  out:
   silc_fsm_next(fsm, silc_client_command_reply_processed);
-  SILC_FSM_CONTINUE;
+  return SILC_FSM_CONTINUE;
 }
 
 /********************************** STATS ***********************************/
@@ -1051,7 +1051,7 @@ SILC_FSM_STATE(silc_client_command_reply_stats)
 
  out:
   silc_fsm_next(fsm, silc_client_command_reply_processed);
-  SILC_FSM_CONTINUE;
+  return SILC_FSM_CONTINUE;
 }
 
 /********************************** PING ************************************/
@@ -1075,7 +1075,7 @@ SILC_FSM_STATE(silc_client_command_reply_ping)
   silc_client_command_callback(cmd);
 
   silc_fsm_next(fsm, silc_client_command_reply_processed);
-  SILC_FSM_CONTINUE;
+  return SILC_FSM_CONTINUE;
 }
 
 /********************************** JOIN ************************************/
@@ -1287,7 +1287,7 @@ SILC_FSM_STATE(silc_client_command_reply_join)
 
  out:
   silc_fsm_next(fsm, silc_client_command_reply_processed);
-  SILC_FSM_CONTINUE;
+  return SILC_FSM_CONTINUE;
 }
 
 /********************************** MOTD ************************************/
@@ -1341,7 +1341,7 @@ SILC_FSM_STATE(silc_client_command_reply_motd)
 
  out:
   silc_fsm_next(fsm, silc_client_command_reply_processed);
-  SILC_FSM_CONTINUE;
+  return SILC_FSM_CONTINUE;
 }
 
 /********************************** UMODE ***********************************/
@@ -1375,7 +1375,7 @@ SILC_FSM_STATE(silc_client_command_reply_umode)
 
  out:
   silc_fsm_next(fsm, silc_client_command_reply_processed);
-  SILC_FSM_CONTINUE;
+  return SILC_FSM_CONTINUE;
 }
 
 /********************************** CMODE ***********************************/
@@ -1453,7 +1453,7 @@ SILC_FSM_STATE(silc_client_command_reply_cmode)
   if (public_key)
     silc_pkcs_public_key_free(public_key);
   silc_fsm_next(fsm, silc_client_command_reply_processed);
-  SILC_FSM_CONTINUE;
+  return SILC_FSM_CONTINUE;
 }
 
 /********************************** CUMODE **********************************/
@@ -1524,7 +1524,7 @@ SILC_FSM_STATE(silc_client_command_reply_cumode)
 
  out:
   silc_fsm_next(fsm, silc_client_command_reply_processed);
-  SILC_FSM_CONTINUE;
+  return SILC_FSM_CONTINUE;
 }
 
 /********************************** KICK ************************************/
@@ -1577,7 +1577,7 @@ SILC_FSM_STATE(silc_client_command_reply_kick)
 
  out:
   silc_fsm_next(fsm, silc_client_command_reply_processed);
-  SILC_FSM_CONTINUE;
+  return SILC_FSM_CONTINUE;
 }
 
 /******************************** SILCOPER **********************************/
@@ -1596,7 +1596,7 @@ SILC_FSM_STATE(silc_client_command_reply_silcoper)
   silc_client_command_callback(cmd);
 
   silc_fsm_next(fsm, silc_client_command_reply_processed);
-  SILC_FSM_CONTINUE;
+  return SILC_FSM_CONTINUE;
 }
 
 /********************************** OPER ************************************/
@@ -1615,7 +1615,7 @@ SILC_FSM_STATE(silc_client_command_reply_oper)
   silc_client_command_callback(cmd);
 
   silc_fsm_next(fsm, silc_client_command_reply_processed);
-  SILC_FSM_CONTINUE;
+  return SILC_FSM_CONTINUE;
 }
 
 /********************************* DETACH ***********************************/
@@ -1646,7 +1646,7 @@ SILC_FSM_STATE(silc_client_command_reply_detach)
 
  out:
   silc_fsm_next(fsm, silc_client_command_reply_processed);
-  SILC_FSM_CONTINUE;
+  return SILC_FSM_CONTINUE;
 }
 
 /********************************** WATCH ***********************************/
@@ -1665,7 +1665,7 @@ SILC_FSM_STATE(silc_client_command_reply_watch)
   silc_client_command_callback(cmd);
 
   silc_fsm_next(fsm, silc_client_command_reply_processed);
-  SILC_FSM_CONTINUE;
+  return SILC_FSM_CONTINUE;
 }
 
 /*********************************** BAN ************************************/
@@ -1713,7 +1713,7 @@ SILC_FSM_STATE(silc_client_command_reply_ban)
 
  out:
   silc_fsm_next(fsm, silc_client_command_reply_processed);
-  SILC_FSM_CONTINUE;
+  return SILC_FSM_CONTINUE;
 }
 
 /********************************** LEAVE ***********************************/
@@ -1759,7 +1759,7 @@ SILC_FSM_STATE(silc_client_command_reply_leave)
 
  out:
   silc_fsm_next(fsm, silc_client_command_reply_processed);
-  SILC_FSM_CONTINUE;
+  return SILC_FSM_CONTINUE;
 }
 
 /********************************* USERS ************************************/
@@ -1908,7 +1908,7 @@ SILC_FSM_STATE(silc_client_command_reply_users)
  out:
   silc_client_unref_channel(client, conn, channel);
   silc_fsm_next(fsm, silc_client_command_reply_processed);
-  SILC_FSM_CONTINUE;
+  return SILC_FSM_CONTINUE;
 }
 
 /********************************** GETKEY **********************************/
@@ -1995,7 +1995,7 @@ SILC_FSM_STATE(silc_client_command_reply_getkey)
   if (public_key)
     silc_pkcs_public_key_free(public_key);
   silc_fsm_next(fsm, silc_client_command_reply_processed);
-  SILC_FSM_CONTINUE;
+  return SILC_FSM_CONTINUE;
 }
 
 /********************************** SERVICE *********************************/
@@ -2024,7 +2024,7 @@ SILC_FSM_STATE(silc_client_command_reply_service)
   silc_client_command_callback(cmd, service_list, name);
 
   silc_fsm_next(fsm, silc_client_command_reply_processed);
-  SILC_FSM_CONTINUE;
+  return SILC_FSM_CONTINUE;
 }
 
 /*********************************** QUIT ***********************************/
@@ -2034,5 +2034,5 @@ SILC_FSM_STATE(silc_client_command_reply_service)
 SILC_FSM_STATE(silc_client_command_reply_quit)
 {
   silc_fsm_next(fsm, silc_client_command_reply_processed);
-  SILC_FSM_CONTINUE;
+  return SILC_FSM_CONTINUE;
 }