feat: 매칭 취소 구현

Author: ArpaAP

client/CMakeLists.txt

@@ -22,6 +22,7 @@ add_executable(client
     handlers/ping.c
     handlers/echo.c
     handlers/match.c
+    handlers/cancel_match.c
     handlers/chat.c
     handlers/error.c
     handlers/disconnect.c

client/client_network.c

@@ -269,8 +269,26 @@ void start_matching() {
 void cancel_matching() {
     LOG_INFO("Cancelling matchmaking");
     client_state_t *client = get_client_state();
+
+    // 서버에 매칭 취소 요청 전송
+    if (client->connected) {
+        LOG_INFO("Sending cancel match request for player: %s", client->username);
+        ClientMessage      cancel_msg = CLIENT_MESSAGE__INIT;
+        CancelMatchRequest cancel_req = CANCEL_MATCH_REQUEST__INIT;
+        cancel_req.player_id          = client->username;
+        cancel_msg.msg_case           = CLIENT_MESSAGE__MSG_CANCEL_MATCH;
+        cancel_msg.cancel_match       = &cancel_req;
+
+        if (send_client_message(client->socket_fd, &cancel_msg) < 0) {
+            LOG_ERROR("Failed to send cancel match request");
+        } else {
+            LOG_INFO("Cancel match request sent successfully");
+        }
+    } else {
+        LOG_WARN("Cannot send cancel match request: not connected to server");
+    }
+
     client->current_screen = SCREEN_MAIN;
-    // TODO: 서버에 매칭 취소 요청 전송 (필요시 구현)
 }
 
 // 네트워크 정리

client/handlers/cancel_match.c

@@ -0,0 +1,37 @@
+#include <pthread.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "../client_state.h"
+#include "handlers.h"
+#include "logger.h"
+
+int handle_cancel_match_response(ServerMessage *msg) {
+    if (msg->msg_case != SERVER_MESSAGE__MSG_CANCEL_MATCH_RES) {
+        LOG_ERROR("Invalid message type for cancel match response handler");
+        return -1;
+    }
+
+    if (msg->cancel_match_res) {
+        if (msg->cancel_match_res->success) {
+            LOG_INFO("Matching cancelled successfully: %s",
+                     msg->cancel_match_res->message ? msg->cancel_match_res->message : "no message");
+
+            add_chat_message_safe("System", "Matching cancelled successfully");
+        } else {
+            LOG_WARN("Matching cancellation failed: %s",
+                     msg->cancel_match_res->message ? msg->cancel_match_res->message : "no reason provided");
+
+            add_chat_message_safe("System", msg->cancel_match_res->message ? msg->cancel_match_res->message : "Matching cancellation failed");
+        }
+
+        // 어떤 경우든 메인 화면으로 이동 (이미 cancel_matching()에서 처리됨)
+        // client_state_t *client = get_client_state();
+        // client->current_screen = SCREEN_MAIN;
+    } else {
+        LOG_ERROR("Received cancel match response but no response data");
+        add_chat_message_safe("System", "Invalid server response");
+    }
+
+    return 0;
+}

client/handlers/dispatcher.c

@@ -23,6 +23,9 @@ int dispatch_server_message(ServerMessage *msg) {
         case SERVER_MESSAGE__MSG_MATCH_GAME_RES:
             return handle_match_game_response(msg);
 
+        case SERVER_MESSAGE__MSG_CANCEL_MATCH_RES:
+            return handle_cancel_match_response(msg);
+
         case SERVER_MESSAGE__MSG_CHAT_BROADCAST:
             return handle_chat_broadcast(msg);
 

client/handlers/handlers.h

@@ -10,6 +10,7 @@ typedef int (*server_message_handler_t)(ServerMessage *msg);
 int handle_ping_response(ServerMessage *msg);
 int handle_echo_response(ServerMessage *msg);
 int handle_match_game_response(ServerMessage *msg);
+int handle_cancel_match_response(ServerMessage *msg);
 int handle_chat_broadcast(ServerMessage *msg);
 int handle_game_end_broadcast(ServerMessage *msg);
 int handle_error_response(ServerMessage *msg);

common/config.h

@@ -1,30 +1,10 @@
 #ifndef COMMON_CONFIG_H
 #define COMMON_CONFIG_H
 
-#include <stdbool.h>
-#include <stdint.h>
-
 // ===================================================================
-// 공통 설정 관리 시스템
+// 공통 설정 상수
 // ===================================================================
 
-// 설정 타입
-typedef enum {
-    CONFIG_TYPE_STRING,
-    CONFIG_TYPE_INT,
-    CONFIG_TYPE_BOOL,
-    CONFIG_TYPE_FLOAT
-} config_type_t;
-
-// 설정 항목 구조체
-typedef struct {
-    const char   *key;            // 설정 키
-    config_type_t type;           // 설정 타입
-    void         *value;          // 설정 값 포인터
-    void         *default_value;  // 기본값 포인터
-    const char   *description;    // 설정 설명
-} config_item_t;
-
 // 기본 네트워크 설정
 #define DEFAULT_SERVER_HOST        "127.0.0.1"
 #define DEFAULT_SERVER_PORT        8080
@@ -36,35 +16,4 @@ typedef struct {
 #define DEFAULT_MAX_CHAT_MESSAGES   50
 #define DEFAULT_CHAT_MESSAGE_LENGTH 256
 
-// 기본 UI 설정
-#define DEFAULT_ANIMATION_ENABLED true
-#define DEFAULT_SOUND_ENABLED     false
-#define DEFAULT_AUTO_SAVE_ENABLED true
-
-// 설정 관리 함수들
-int  config_init(const char *config_file_path);
-void config_cleanup(void);
-
-// 설정 값 읽기
-const char *config_get_string(const char *key, const char *default_value);
-int         config_get_int(const char *key, int default_value);
-bool        config_get_bool(const char *key, bool default_value);
-float       config_get_float(const char *key, float default_value);
-
-// 설정 값 쓰기
-int config_set_string(const char *key, const char *value);
-int config_set_int(const char *key, int value);
-int config_set_bool(const char *key, bool value);
-int config_set_float(const char *key, float value);
-
-// 설정 파일 저장/로드
-int config_save(void);
-int config_load(void);
-
-// 설정 초기화 (기본값으로 복원)
-void config_reset_to_defaults(void);
-
-// 설정 목록 출력 (디버그용)
-void config_print_all(void);
-
 #endif  // COMMON_CONFIG_H