basic tcp connection.

.gitignore

@@ -14,3 +14,4 @@ Thumbs.db
 
 ubuntu_tester
 ubuntu_cgi_tester
+webserv

Makefile

@@ -5,19 +5,19 @@ CXX = c++
 CXXFLAGS = -Wall -Wextra -Werror
 CXXFLAGS += -std=c++98
 CXXFLAGS += -I$(HEADERS_D)
-#CXXFLAGS += -g
+CXXFLAGS += -g
 #CXXFLAGS += -O3
 
-SHELL = /bin/zsh
+#SHELL = /bin/zsh
 VPATH  = $(DIR_SRCS)
-DIR_SRCS =	tests
+DIR_SRCS =	srcs
 
-HEADERS_D = ./templates
-HEADERS = 
+HEADERS_D = ./srcs
+HEADERS = Webserv.hpp
 
 DEPENDENCIES =	$(HEADERS:%=$(HEADERS_D)/%)
 
-SRCS =	main.cpp
+SRCS =	main.cpp Webserv.cpp
 
 DIR_OBJS = builds
 OBJS = $(SRCS:%.cpp=$(DIR_OBJS)/%.o)
@@ -28,7 +28,7 @@ OBJS = $(SRCS:%.cpp=$(DIR_OBJS)/%.o)
 
 all: $(NAME)
 
-$(DIR_OBJS)/%.o: $(SRCS) | $(DIR_OBJS)
+$(DIR_OBJS)/%.o: %.cpp | $(DIR_OBJS)
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
 $(DIR_OBJS):
@@ -37,7 +37,7 @@ $(DIR_OBJS):
 $(OBJS): $(DEPENDENCIES)
 #$(OBJS): $(DEPENDENCIES) Makefile
 
-$(NAME) :
+$(NAME) : $(OBJS)
 	$(CXX) $(OBJS) -o $(NAME)
 
 clean:

include_memo.hpp

@@ -3,7 +3,9 @@
 # include <map>
 # include <cerrno> // errno
 # include <cstdio> // perror
-
+# include <exception>
+# include <stdexcept>
+# include <unistd.h> // close
 
 // --------------------------------------------
 // Verifier si les fonctions sont dispos dans des headers C++

srcs/Webserv.cpp

@@ -3,25 +3,119 @@
 
 Webserv::Webserv()
 {
-	_socket_fd = socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0);
+	std::cout << "Server init\n";
+	_socket_fd = ::socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0);
 	if (_socket_fd == -1)
 	{
-		perror("socket(): ");
+		::perror("err socket(): ");
 		throw std::runtime_error("Socket init");
 	}
 }
 
-Webserv::Webserv(Webserv const &src)
+/* Webserv::Webserv(Webserv const &src)
 {
 	
-}
+} */
 
 Webserv::~Webserv()
 {
-	
+	std::cout << "Server destroyed\n";
 }
 
-Webserv &	Webserv::operator=(Webserv const &rhs)
+/* Webserv &	Webserv::operator=(Webserv const &rhs)
 {
 	
-}
+} */
+
+  ///////////////
+ // Functions //
+
+void	Webserv::bind(in_port_t port)
+{
+	// cast invalid ? how to ?
+	// const struct sockaddr* cast_test = static_cast<const struct sockaddr*>(addr);
+
+	struct sockaddr_in	addr;
+	addr.sin_family = AF_INET;
+	addr.sin_port = ::htons(port);
+	addr.sin_addr.s_addr = ::htonl(INADDR_ANY); // htonl useless with 0 value (INADDR_ANY)
+
+	if (::bind(_socket_fd, (const sockaddr*)&addr, sizeof addr) == -1)
+	{
+		::perror("err bind(): ");
+		throw std::runtime_error("Socket bind");		
+	}
+}
+
+void	Webserv::listen(unsigned int max_connections)
+{
+	if (::listen(_socket_fd, max_connections) == -1)
+	{
+		::perror("err listen(): ");
+		throw std::runtime_error("Socket listen");
+	}
+}
+
+#define BUFSIZE 8192
+#define MSG_TEST "Le Webserv / 20 =D\n"
+#define MSG_BOUNCE "bounced properly ;)\n" // placeholder
+
+void	Webserv::start()
+{
+	struct sockaddr_in	addr;
+	socklen_t 			addr_len;
+	int					accepted_fd;
+
+	// poll (or equivalent)
+	struct pollfd	poll_s;
+	poll_s.fd = _socket_fd;
+	poll_s.events = POLLIN;
+
+	char	buf[BUFSIZE]; // WIP buffer. need to try with std::vector or std::string.
+	int		ret;
+
+	std::cout << "Server started\n";
+	while (1)
+	{
+		std::cout << "----------\n";
+		std::cout << "poll()\n"; // poll (or equivalent)
+		::poll(&poll_s, 1, -1);
+
+		std::cout << "accept()\n";
+		addr_len = sizeof addr;
+		accepted_fd = ::accept(_socket_fd, (sockaddr*)&addr, &addr_len);
+		if (accepted_fd == -1)
+		{
+			::perror("err accept(): ");
+			continue;		
+		}
+
+		// "Your server must never block and the client can be bounced properly if necessary".
+		// NO-Block OK, but how to handle it ? Miss the bouncing part.
+		::fcntl(accepted_fd, F_SETFL, O_NONBLOCK);
+
+		std::cout << "recv()\n";
+		ret = ::recv(accepted_fd, buf, BUFSIZE, 0);
+		if (ret == -1)
+		{
+			::perror("err recv(): ");
+			if (::send(accepted_fd, MSG_BOUNCE, sizeof MSG_BOUNCE - 1, 0) == -1)
+				::perror("err send(): ");
+			::close(accepted_fd);
+			continue;
+		}
+		/*
+		if (ret == BUFSIZE)
+			// send error like "request too long" to client
+		*/
+		buf[ret] = '\0';
+		
+		std::cout << "send()\n";
+		if (::send(accepted_fd, buf, ret, 0) == -1) // echo the read
+			::perror("err send(): ");
+		if (::send(accepted_fd, MSG_TEST, sizeof MSG_TEST - 1, 0) == -1)
+			::perror("err send(): ");
+
+		::close(accepted_fd);
+	}
+}

srcs/Webserv.hpp

@@ -8,17 +8,28 @@
 # include <cstdio> // perror
 # include <exception>
 # include <stdexcept>
+# include <unistd.h> // close
+# include <iostream> // cout, cin
 
 # include <sys/socket.h> // socket, accept, listen, send, recv, bind, connect, setsockopt, getsockname
+# include <netinet/in.h> // sockaddr_in
+// # include <netinet/ip.h> // usefull for what ?
+# include <arpa/inet.h> // htonl, htons, ntohl, ntohs, inet_addr
+
+# include <poll.h> // poll
+# include <fcntl.h> // fcntl
 
 class Webserv
 {
 	public:
-		//Webserv(Placeholder);
 		Webserv();
-		Webserv(Webserv const &src);
+		// Webserv(Webserv const &src);
 		~Webserv();
-		Webserv &operator=(Webserv const &rhs);
+		// Webserv &operator=(Webserv const &rhs);
+
+		void	bind(in_port_t port);
+		void	listen(unsigned int max_connections);
+		void	start();
 
 	private:
 		int	_socket_fd;
@@ -27,4 +38,4 @@ class Webserv
 
 };
 
-#endif
+#endif

srcs/main.cpp

@@ -1 +1,22 @@
 
+#include <iostream>
+#include <exception>
+#include <stdexcept>
+#include <Webserv.hpp>
+
+int	main(void)
+{
+	try
+	{
+		Webserv	serv;
+
+		serv.bind(80);
+		serv.listen(512); // 512 max connections arbitrary
+		serv.start();
+	}
+	catch (std::exception& e)
+	{
+		std::cout << e.what() << '\n';
+	}
+	return (0);
+}