Namonay/42_irc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nerd emoji

Browse Source
This commit is contained in:
Namonay
2024-01-21 18:15:48 +01:00
parent 9ae6ad183b
commit 9f8fb8902a
7 changed files with 92 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@@ -1,14 +1,14 @@
# **************************************************************************** # #******************************************************************************#
# # # #
# ::: :::::::: # # ::: :::::::: #
# Makefile :+: :+: :+: # # Makefile :+: :+: :+: #
# +:+ +:+ +:+ # # +:+ +:+ +:+ #
# By: vavaas <vvaas@student.42.fr> +#+ +:+ +#+ # # By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2023/08/09 15:08:49 by vavaas #+# #+# # # Created: 2023/08/09 15:08:49 by vavaas #+# #+# #
# Updated: 2024/01/21 12:04:28 by maldavid ### ########.fr # # Updated: 2024/01/21 17:23:26 by vvaas ### ########.fr #
# # # #
# **************************************************************************** # #******************************************************************************#
NAME = ircserv NAME = ircserv
@@ -24,7 +24,12 @@ OBJ_DIR = objs
OBJS = $(addprefix $(OBJ_DIR)/, $(SRCS:.cpp=.o)) OBJS = $(addprefix $(OBJ_DIR)/, $(SRCS:.cpp=.o))
CXX = c++ CXX = c++
CXXFLAGS = -std=c++98 -Wall -Wextra -Werror -I includes FLAGS ?= true
CXXFLAGS = -std=c++98 -I includes
ifeq ($(FLAGS), true)
CXXFLAGS += -Wall -Wextra -Werror
endif
DEBUG ?= false DEBUG ?= false
MODE = "release" MODE = "release"

11
includes/client.hpp
View File

@@ -1,14 +1,14 @@
/* ************************************************************************** */ /******************************************************************************/
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* client.hpp :+: :+: :+: */ /* client.hpp :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */ /* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/21 10:33:17 by maldavid #+# #+# */ /* Created: 2024/01/21 10:33:17 by maldavid #+# #+# */
/* Updated: 2024/01/21 10:34:13 by maldavid ### ########.fr */ /* Updated: 2024/01/21 16:32:05 by vvaas ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /******************************************************************************/
#ifndef __CLIENT__ #ifndef __CLIENT__
#define __CLIENT__ #define __CLIENT__
@@ -18,11 +18,12 @@ namespace irc
class Client class Client
{ {
public: public:
Client(); Client(int fd);
~Client(); ~Client();
private: private:
int _fd;
}; };
} }

10
includes/irc.hpp
View File

@@ -1,14 +1,14 @@
/* ************************************************************************** */ /******************************************************************************/
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* irc.hpp :+: :+: :+: */ /* irc.hpp :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: vvaas <vvaas@student.42.fr> +#+ +:+ +#+ */ /* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/11/29 13:24:01 by vvaas #+# #+# */ /* Created: 2023/11/29 13:24:01 by vvaas #+# #+# */
/* Updated: 2023/11/29 16:32:34 by vvaas ### ########.fr */ /* Updated: 2024/01/21 14:20:31 by vvaas ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /******************************************************************************/
#ifndef IRC_H #ifndef IRC_H
# define IRC_H # define IRC_H
@@ -20,5 +20,5 @@
# include <unistd.h> # include <unistd.h>
# include <cstdlib> # include <cstdlib>
# include <sys/socket.h> # include <sys/socket.h>
# include <arpa/inet.h>
#endif #endif

25
includes/server.hpp
View File

@@ -1,21 +1,24 @@
/* ************************************************************************** */ /******************************************************************************/
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* server.hpp :+: :+: :+: */ /* server.hpp :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */ /* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/21 09:12:28 by maldavid #+# #+# */ /* Created: 2024/01/21 09:12:28 by maldavid #+# #+# */
/* Updated: 2024/01/21 10:37:58 by maldavid ### ########.fr */ /* Updated: 2024/01/21 17:18:17 by vvaas ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /******************************************************************************/
#ifndef __SERVER_IRC__ #ifndef __SERVER_IRC__
#define __SERVER_IRC__ #define __SERVER_IRC__
#include <string> #include <string>
#include <vector> #include <vector>
#include <irc.hpp>
#include <unstd/shared_ptr.hpp>
#define MAX_USERS 20
namespace irc namespace irc
{ {
class Server class Server
@@ -24,12 +27,24 @@ namespace irc
Server(int port, const std::string& password); Server(int port, const std::string& password);
~Server(); ~Server();
inline unsigned long get_port(void) { return (htons(_port)); }
private: private:
void init_socket(void);
void wait(void);
private:
sockaddr_in _s_data;
socklen_t _s_len;
fd_set _fd_set;
std::vector<class Channel> _channels; std::vector<class Channel> _channels;
std::vector<unstd::SharedPtr<class Client> > _client;
const std::string _password; const std::string _password;
const std::string _ip;
const int _port; const int _port;
int _socket; int _main_socket;
bool _active;
}; };
} }

10
srcs/client.cpp
View File

@@ -1,20 +1,20 @@
/* ************************************************************************** */ /******************************************************************************/
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* client.cpp :+: :+: :+: */ /* client.cpp :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */ /* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/21 10:35:52 by maldavid #+# #+# */ /* Created: 2024/01/21 10:35:52 by maldavid #+# #+# */
/* Updated: 2024/01/21 10:36:20 by maldavid ### ########.fr */ /* Updated: 2024/01/21 16:32:12 by vvaas ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /******************************************************************************/
#include <client.hpp> #include <client.hpp>
namespace irc namespace irc
{ {
Client::Client() Client::Client(int fd) : _fd(fd)
{ {
} }

13
srcs/main.cpp
View File

@@ -1,14 +1,14 @@
/* ************************************************************************** */ /******************************************************************************/
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* main.cpp :+: :+: :+: */ /* main.cpp :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */ /* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/20 09:27:04 by maldavid #+# #+# */ /* Created: 2024/01/20 09:27:04 by maldavid #+# #+# */
/* Updated: 2024/01/21 12:16:41 by maldavid ### ########.fr */ /* Updated: 2024/01/21 16:14:07 by vvaas ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /******************************************************************************/
#include <logs.hpp> #include <logs.hpp>
#include <cstdlib> #include <cstdlib>
@@ -24,13 +24,12 @@ int main(int ac, char** av)
irc::logs::report(irc::log_message, "usage './ircserv <port> <password>', try again dumbass"); irc::logs::report(irc::log_message, "usage './ircserv <port> <password>', try again dumbass");
return 0; return 0;
} }
if(av[1] == NULL || av[2] == NULL) if(av[1] == NULL || av[2] == NULL)
irc::logs::report(irc::log_fatal_error, "invalid argv, argv[1] or argv[2] is NULL (wtf)"); irc::logs::report(irc::log_fatal_error, "invalid argv, argv[1] or argv[2] is NULL (wtf)");
char* end; char* end;
long port = std::strtol(av[1], &end, 10); int port = std::strtol(av[1], &end, 10);
if(errno == ERANGE || *end != 0 || port < 0 || port > 0xffff) if(errno == ERANGE || *end != 0 || port < 0 || port > 0xFFFF || std::strlen(av[1]) == 0)
irc::logs::report(irc::log_fatal_error, "invalid port"); irc::logs::report(irc::log_fatal_error, "invalid port");
irc::Server server(port, av[2]); irc::Server server(port, av[2]);

50
srcs/server.cpp
View File

@@ -1,18 +1,20 @@
/* ************************************************************************** */ /******************************************************************************/
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* server.cpp :+: :+: :+: */ /* server.cpp :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */ /* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/21 09:31:17 by maldavid #+# #+# */ /* Created: 2024/01/21 09:31:17 by maldavid #+# #+# */
/* Updated: 2024/01/21 12:13:51 by maldavid ### ########.fr */ /* Updated: 2024/01/21 17:31:15 by vvaas ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /******************************************************************************/
#include <server.hpp> #include <server.hpp>
#include <client.hpp> #include <client.hpp>
#include <channel.hpp> #include <channel.hpp>
#include <logs.hpp>
#include <cstring>
/** Commands to handle /** Commands to handle
* NICK * NICK
@@ -31,13 +33,41 @@
namespace irc namespace irc
{ {
Server::Server(int port, const std::string& password) : _password(password), _port(port) Server::Server(int port, const std::string& password) : _s_len(sizeof(_s_data)), _password(password), _port(port), _active(true)
{ {
(void)_port; std::memset(&_s_data, 0, sizeof(sockaddr));
(void)_password; init_socket();
(void)_socket; wait();
(void)_channels; }
void Server::init_socket(void)
{
_s_data.sin_family = AF_INET;
_s_data.sin_addr.s_addr = INADDR_ANY;
_s_data.sin_port = htons(_port);
_main_socket = socket(AF_INET, SOCK_STREAM, 0); // AF_INET == IPv4, SOCK_STREAM == TCP
if (_main_socket < 0)
irc::logs::report(irc::log_fatal_error, "socket error");
std::cout << "Socket creating succesful" << std::endl;
if (bind(_main_socket, (struct sockaddr *)&_s_data, sizeof(_s_data)) != 0)
irc::logs::report(irc::log_fatal_error, "bind error");
std::cout << "bind succesful, starting listen loop" << std::endl;
if (listen(_main_socket, MAX_USERS) != 0)
irc::logs::report(irc::log_fatal_error, "listen error");
std::cout << "listen queue created succesful" << std::endl;
} }
Server::~Server() {} void Server::wait(void)
{
while (_active)
{
FD_ZERO(&_fd_set);
FD_SET(_main_socket, &_fd_set);
}
}
Server::~Server()
{
if (_main_socket > 0)
close(_main_socket);
}
} }