Skip to content

Commit

Permalink
Makefile 수정 - 디버그 옵션 주석 처리
Browse files Browse the repository at this point in the history
defines.hpp 수정 - IP_ADDRESS 상수 추가

Server.cpp 수정 - IP_ADDRESS 상수 사용하여 서버 주소 설정, ERR_NICKNAMEINUSE 에러 메시지 수정
  • Loading branch information
haelime committed Apr 15, 2024
1 parent cc86c78 commit eb24f09
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ TARGET = ircserv
CXX = c++

CXXFLAGS = -Wall -Werror -Wextra -std=c++98\
-g -fsanitize=address # DEBUG
# -g -fsanitize=address # DEBUG

CWD = $(shell pwd)
SRCDIR = $(CWD)/srcs
Expand Down
1 change: 1 addition & 0 deletions include/defines.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#pragma once

#define IP_ADDRESS "10.18.234.170"
#define SERVER_NAME "ircserv"
#define SERVER_VERSION "0.1"

Expand Down
7 changes: 5 additions & 2 deletions srcs/Server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ bool Server::initServer(int argc, char** argv)
Logger::log(DEBUG, "Server created socket");

// Set Server's address
mServerAddress.sin_addr.s_addr = INADDR_ANY;
const char *ip_address = IP_ADDRESS;
mServerAddress.sin_addr.s_addr = inet_addr(ip_address);

// mServerAddress.sin_addr.s_addr = INADDR_ANY;
mServerAddress.sin_port = htons(mPort);
mServerAddress.sin_family = AF_INET;
mServerAddress.sin_len = sizeof(mServerAddress);
Expand Down Expand Up @@ -2597,7 +2600,7 @@ bool Server::parseReceivedRequestFromClientData(ClientData* clientData)
errMessageToClient.mMessageTokens.push_back(":" + std::string(inet_ntoa(clientData->getClientAddress().sin_addr)));
errMessageToClient.mMessageTokens.push_back(ERR_NICKNAMEINUSE);
errMessageToClient.mMessageTokens.push_back(clientData->getClientNickname());
errMessageToClient.mMessageTokens.push_back(":Nickname collision");
errMessageToClient.mMessageTokens.push_back(":*** Nickname is already in use");
clientData->getServerToClientSendQueue().push(errMessageToClient);
assert(false);
continue;
Expand Down

0 comments on commit eb24f09

Please sign in to comment.