Skip to content

Fix dcc variable #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AllanDantas21 merged 4 commits into from
Oct 9, 2025
Merged

Fix dcc variable #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a676a7
fix: variable not initialized
thaiismeneses Oct 9, 2025
1325620
fix: revert changes from server
thaiismeneses Oct 9, 2025
d4ed2f7
delete: .vscode
thaiismeneses Oct 9, 2025
3fb843a
Merge branch 'main' into fix_DCC_variable
thaiismeneses Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CXX = c++
CXXFLAGS = -Wall -Wextra -Werror -std=c++98
CXXFLAGS = -Wall -Wextra -Werror -std=c++98 -g
OBJDIR = obj
SRCS = $(shell find srcs -name "*.cpp")
OBJS = $(patsubst %.cpp,$(OBJDIR)/%.o,$(SRCS))
Expand All @@ -23,6 +23,9 @@ fclean: clean

re: fclean all

valgrind: re
valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes --track-fds=yes ./ircserv 6667 1234

test:
$(MAKE) -C tests/bdd test

Expand Down Expand Up @@ -51,4 +54,4 @@ container:
container-stop:
container stop --all && container system stop

.PHONY: all clean fclean re test test-valgrind container-build container-run container-shell container container-stop
.PHONY: all clean fclean re test test-valgrind container-build container-run container-shell container container-stop
13 changes: 9 additions & 4 deletions srcs/parsing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
#include "../incs/ircserv.hpp"
#include <sstream>

void initPollFd(int incofd, struct pollfd &NewPoll)
{
memset(&NewPoll, 0, sizeof(NewPoll));
NewPoll.fd = incofd;
NewPoll.events = POLLIN;
NewPoll.revents = 0;
}

void Parser::handleDccSend(Server *server, const std::string &target, const std::string &filename, int clientFd)
{
Expand All @@ -20,8 +27,7 @@ void Parser::handleDccSend(Server *server, const std::string &target, const std:
if (dccServer->init() != -1)
{
struct pollfd newPollFd;
newPollFd.fd = dccServer->getSockfd();
newPollFd.events = POLLIN;
initPollFd(dccServer->getSockfd(), newPollFd);
server->addPollFd(newPollFd);
server->addDccServer(dccServer);

Expand Down Expand Up @@ -81,8 +87,7 @@ void Parser::handleDccGet(Server *server, const std::string &targetNick, const s
if (dccClient->init() != -1)
{
struct pollfd newPollFd;
newPollFd.fd = dccClient->getSockfd();
newPollFd.events = POLLIN;
initPollFd(dccClient->getSockfd(), newPollFd);
server->addPollFd(newPollFd);
server->addDccClient(dccClient);
server->SendToClient(clientFd, "DCC GET initiated for file '" + Filename + "' from user '" + targetNick + "'\r\n");
Expand Down