Kinou/ft_irc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

split in separate files, no advencement

Browse Source
This commit is contained in:
kinou-p 2022-12-07 17:37:27 +01:00
parent 4564988cc8
commit 6cc00ecac4
8 changed files with 207 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -6,12 +6,16 @@
# By: apommier <apommier@student.42.fr> +#+ +:+ +#+ # # By: apommier <apommier@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2022/12/01 17:27:29 by apommier #+# #+# # # Created: 2022/12/01 17:27:29 by apommier #+# #+# #
# Updated: 2022/12/06 17:39:38 by apommier ### ########.fr # # Updated: 2022/12/06 22:07:24 by apommier ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
NAME = ircserv NAME = ircserv
SRCS := main.cpp SRCS := main.cpp\
epoll.cpp\
start_server.cpp\
utils.cpp\
server_loop.cpp
CC = c++ CC = c++
#FLAGS = -g -Wall -Wextra -Werror #FLAGS = -g -Wall -Wextra -Werror

28
includes/ft_irc.hpp
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */ /* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/12/01 17:27:37 by apommier #+# #+# */ /* Created: 2022/12/01 17:27:37 by apommier #+# #+# */
/* Updated: 2022/12/06 19:13:04 by apommier ### ########.fr */ /* Updated: 2022/12/06 22:06:07 by apommier ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -16,6 +16,28 @@
#include <cstdlib> #include <cstdlib>
#include <cstring> //std::string #include <cstring> //std::string
#include <cerrno> //errno #include <cerrno> //errno
#include <iostream> //std::cout #include <iostream> //std::cout | cerr
#include <netinet/in.h> //struct socket #include <netinet/in.h> //struct socket
#include <sys/epoll.h> //epoll #include <sys/epoll.h> //epoll ensemble
#include <unistd.h> //close()
/* ************************************************************************** */
/* *********************************UTILS************************************ */
/* ************************************************************************** */
void ft_error(std::string str);
void close_fd(int fd);
/* ************************************************************************** */
/* ******************************START SERVER******************************** */
/* ************************************************************************** */
void initialize(char **av); //1st
void start_loop(int epollFd, int oldSock, int newSock); //3rd
/* ************************************************************************** */
/* *****************************EPOLL UTILITY******************************** */
/* ************************************************************************** */
void epoll_add(int epollFd, int fd);
int epoll_start(); //2nd

12
srcs/commands/parse_commands.cpp Normal file
View File

@ -0,0 +1,12 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* parse_commands.cpp :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/12/06 22:01:25 by apommier #+# #+# */
/* Updated: 2022/12/06 22:01:26 by apommier ### ########.fr */
/* */
/* ************************************************************************** */

33
srcs/epoll.cpp Normal file
View File

@ -0,0 +1,33 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* epoll.cpp :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/12/06 21:38:30 by apommier #+# #+# */
/* Updated: 2022/12/06 21:50:06 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
#include "../includes/ft_irc.hpp"
void epoll_add(int epollFd, int fd)
{
struct epoll_event event;
event.events = EPOLLIN;
event.data.fd = fd;
if (epoll_ctl(epollFd, EPOLL_CTL_ADD, fd, &event))
ft_error("epoll_ctl() error");
}
int epoll_start()
{
int epollFd;
epollFd = epoll_create(5);
if (epollFd == -1)
ft_error("epoll_create() error");
return (epollFd);
}

49
srcs/main.cpp
View File

@ -6,61 +6,14 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */ /* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/12/01 17:27:33 by apommier #+# #+# */ /* Created: 2022/12/01 17:27:33 by apommier #+# #+# */
/* Updated: 2022/12/06 19:08:00 by apommier ### ########.fr */ /* Updated: 2022/12/06 21:50:25 by apommier ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "../includes/ft_irc.hpp" #include "../includes/ft_irc.hpp"
#define PORT 8080
void ft_error(std::string str)
{
std::cout << str << std::endl;
if (errno)
std::cout << strerror(errno);
exit(1);
}
void initialize(char **av)
{
int epollFd;
int sockFd;
int newSockFd = 0;
int opt = 1;
struct sockaddr_in addr;
int addrLen = sizeof(addr);
sockFd = socket(AF_INET, SOCK_STREAM, 0);
if (sockFd == -1)
ft_error("socket() error");
if (setsockopt(sockFd, SOL_SOCKET, SO_REUSEADDR | SO_REUSEPORT, &opt, sizeof(opt)))
ft_error("setsockopt() error");
std::cout << atoi(av[1]) << std::endl;
addr.sin_port = htons(atoi(av[1]));
addr.sin_family = AF_INET;
addr.sin_addr.s_addr = INADDR_ANY;
if (addr.sin_port <= 0)
ft_error("wrong format for <port>\nneed to be an positive integer");
if (bind(sockFd, (struct sockaddr *)&addr, sizeof(addr)) < 0)
ft_error("bind() error");
if (listen(sockFd, 100) == -1)
ft_error("listen() error");
newSockFd = accept(sockFd, (struct sockaddr *)&addr, (socklen_t*)&addrLen);
if (newSockFd == -1)
ft_error("accept() error");
send(newSockFd, "hello", 5, 0);
}
int main(int ac, char **av) int main(int ac, char **av)
{ {
if (!(ac == 3 || ac == 2)) if (!(ac == 3 || ac == 2))
ft_error("wrong number of arguments\nFORMAT: ./ircserv <port> <password>"); ft_error("wrong number of arguments\nFORMAT: ./ircserv <port> <password>");
initialize(av); initialize(av);

42
srcs/server_loop.cpp Normal file
View File

@ -0,0 +1,42 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* server_loop.cpp :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/12/06 21:58:13 by apommier #+# #+# */
/* Updated: 2022/12/07 01:16:41 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
#include "../includes/ft_irc.hpp"
#define MAX_EVENTS 5
#define READ_SIZE 10
void start_loop(int epollFd, int oldSock, int newSock)
{
char buffer[1024] = { 0 };
int readChar;
std::cout << "loop start\n";
while (strncmp("/quit", buffer, 5))
{
// std::cout << "hehe\n";
readChar = read(newSock, buffer, 1024);
buffer[readChar] = '\0';
std::cout << "buffer: " << buffer << std::endl;
// send(newSock, "message received", 18, 0);
//event_count = epoll_wait(epoll_fd, events, MAX_EVENTS, 30000);
//for (i = 0; i < event_count; i++)
//{
//}
}
if (!strncmp("/quit", buffer, 5))
{
std::cout << "quit message received\n";
}
}

58
srcs/start_server.cpp Normal file
View File

@ -0,0 +1,58 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* start_server.cpp :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/12/06 21:44:20 by apommier #+# #+# */
/* Updated: 2022/12/07 01:25:31 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
#include "../includes/ft_irc.hpp"
void initialize(char **av)
{
int sockFd;
int epollFd;
int newSockFd = 0;
int opt = 1;
struct sockaddr_in addr;
int addrLen = sizeof(addr);
sockFd = socket(AF_INET, SOCK_STREAM, 0);
if (sockFd == -1)
ft_error("socket() error");
if (setsockopt(sockFd, SOL_SOCKET, SO_REUSEADDR | SO_REUSEPORT, &opt, sizeof(opt)))
ft_error("setsockopt() error");
addr.sin_port = htons(atoi(av[1]));
addr.sin_family = AF_INET;
addr.sin_addr.s_addr = INADDR_ANY;
if (addr.sin_port <= 0)
ft_error("wrong format for <port>\nneed to be an positive integer");
if (bind(sockFd, (struct sockaddr *)&addr, sizeof(addr)) < 0)
ft_error("bind() error");
if (listen(sockFd, 100) == -1)
ft_error("listen() error");
newSockFd = accept(sockFd, (struct sockaddr *)&addr, (socklen_t*)&addrLen);
if (newSockFd == -1)
ft_error("accept() error");
char buffer[1024];
int nbrRead;
while (strncmp("/quit", buffer, 5))
{
nbrRead = read()
}
epollFd = epoll_start();
epoll_add(epollFd, newSockFd);
start_loop(epollFd, sockFd, newSockFd);
//send(newSockFd, "hello", 5, 0);
}

30
srcs/utils.cpp Normal file
View File

@ -0,0 +1,30 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* utils.cpp :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/12/06 21:46:41 by apommier #+# #+# */
/* Updated: 2022/12/07 01:09:12 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
#include "../includes/ft_irc.hpp"
void ft_error(std::string str)
{
std::cerr << str << std::endl;
if (errno)
{
std::cerr << "errno: " << strerror(errno);
exit(errno);
}
exit(1);
}
void close_fd(int fd)
{
if (close(fd))
ft_error("close() error");
}