클라이언트 데이터와 채널의 연결 및 연결 해제 메서드 수정

haelime · Apr 13, 2024 · fee45ae · fee45ae
1 parent c2a6d4b
commit fee45ae
Show file tree

Hide file tree

Showing 6 changed files with 323 additions and 218 deletions.
diff --git a/include/Channel.hpp b/include/Channel.hpp
@@ -6,6 +6,7 @@
 #include <map> // to store connected clients
 
 #include "defines.hpp"
+#include "types.hpp"
 #include "Server.hpp"
 #include "ClientData.hpp"
 
@@ -53,6 +54,12 @@ class Channel
     const bool& getIsKeyProtected() const { return mIsKeyProtected; };
     const int& getUserLimit() const { return mUserLimit; };
 
+    // 353 RPL_NAMREPLY
+    const Message getNameReply(const ClientData *requestClient);
+
+    // 366 RPL_ENDOFNAMES
+    const Message getEndOfNames(const ClientData *requestClient);
+
     std::map<std::string, ClientData *> &getNickToClientDataMap() { return mNickToClientDataMap; };
     std::map<std::string, ClientData *> &getNickToOperatorClientsMap() { return mNickToOperatorClientsMap; };
 

diff --git a/include/ClientData.hpp b/include/ClientData.hpp
@@ -9,6 +9,7 @@
 #include "defines.hpp"
 
 class Channel;
+typedef int SOCKET_FD;
 
 // ClientData Must have it's information, and it's connected channels
 class ClientData
@@ -58,8 +59,8 @@ class ClientData
     const std::string& getRealname() const { return mRealname; };
     void setRealname(std::string& realname) { mRealname = realname; };
 
-    const SOCKET_FD& getClientSocket() const { return mClientSocket; };
-    void setClientSocket(SOCKET_FD& clientSocket) { mClientSocket = clientSocket; };
+    const SOCKET_FD& getClientSocket() const;
+    void setClientSocket(SOCKET_FD& clientSocket);
 
     void    setIp(std::string& ip) { mClientIp = ip; };
     const std::string& getIp() const { return mClientIp; };

diff --git a/include/Server.hpp b/include/Server.hpp
@@ -72,6 +72,8 @@ class Server
     void sendChannelJoinSucessMessageToClientData(ClientData *clientData, Channel *channel);
     void sendMessagetoChannel(Channel* channel, const Message& message);
 
+    void sendWelcomeMessageToClientData(ClientData *clientData);
+
 private:  // server network data
     SOCKET_FD mServerListenSocket;
     sockaddr_in mServerAddress;

diff --git a/srcs/Channel.cpp b/srcs/Channel.cpp
@@ -0,0 +1,34 @@
+#include "Channel.hpp"
+
+const Message Channel::getNameReply(const ClientData *requestClient)
+{
+    Message reply;
+    reply.mCommand = NONE;
+    reply.mMessageTokens.push_back(RPL_NAMREPLY);
+    reply.mMessageTokens.push_back(requestClient->getClientNickname());
+    reply.mMessageTokens.push_back("=");
+    reply.mMessageTokens.push_back(mChannelName);
+    std::string names;
+    names += ":";
+    for (std::map<std::string, ClientData*>::const_iterator it = mNickToClientDataMap.begin(); it != mNickToClientDataMap.end(); it++)
+    {
+        std::map<std::string, ClientData*>::const_iterator opit = mNickToOperatorClientsMap.find(it->first);
+        if (opit != mNickToOperatorClientsMap.end())
+            names += "@";
+        names += it->first + " ";
+    }
+    names.pop_back();
+    reply.mMessageTokens.push_back(names);
+    return reply;
+}
+
+const Message Channel::getEndOfNames(const ClientData *requestClient)
+{
+    Message reply;
+    reply.mCommand = NONE;
+    reply.mMessageTokens.push_back(RPL_ENDOFNAMES);
+    reply.mMessageTokens.push_back(requestClient->getClientNickname());
+    reply.mMessageTokens.push_back(mChannelName);
+    reply.mMessageTokens.push_back("End of /NAMES list.");
+    return reply;
+}
diff --git a/srcs/ClientData.cpp b/srcs/ClientData.cpp
@@ -0,0 +1,4 @@
+#include "ClientData.hpp"
+
+const SOCKET_FD& ClientData::getClientSocket() const { return mClientSocket; };
+void ClientData::setClientSocket(SOCKET_FD& clientSocket) { mClientSocket = clientSocket; };