launch multiples serv

srcs/load/Env.hpp

@@ -3,7 +3,7 @@
 
 class Env {
 	//int	_max_clients;
-	std::vector<Server>	_servers;
+	std::vector<Server *>	_servers;
   public:
 	Env(JSONNode *conf) {
         JSONList servers = conf->obj()["servers"]->lst();
@@ -13,9 +13,16 @@ class Env {
              it < servers.end(); it++) {
             	Server *server = new Server(*it);
 				server->launch();
+				_servers.push_back(server);
 			//delete *it;
 			cout << th[i] << " server launched.\n"; 
 			i++;
+        }
+		while(1) {
+			for (std::vector<Server *>::iterator it = _servers.begin();
+				 it < _servers.end(); it++) {
+				(*it)->check();
+			}
 		}
 		//delete conf;
 	}

srcs/load/Server.hpp

@@ -6,6 +6,8 @@ class Server {
 	std::vector<string> _listens;
 	int _port;
 	std::map<string, Route *> _routes;
+	int _master_socket;
+	struct sockaddr_in _address;
 
   public:
 	Server(JSONNode *server) {
@@ -18,57 +20,60 @@ class Server {
 			for (JSONList::iterator i = listens.begin(); i < listens.end(); i++)
 				_listens.push_back((*i)->str());
 			_port = std::atoi(_listens.front().c_str());
-
 		}
 		//_routes["default"] = new Route(datas["root"], datas["return"], datas["index"], datas["autoindex"]);
 	}
 	void launch() {
 		int opt = 1;
-		int master_socket, addrlen, new_socket, client_socket[30],
-			max_clients = 30, activity, i, valread, sd;
-		struct sockaddr_in address;
-		char buffer[30000];
-		char _404[72] =
-        "HTTP/1.1 200 OK\nContent-Type: text/plain\nContent-Length: 4\n\n404!";
-		int max_sd;
-		fd_set readfds;
 
-		for (i = 0; i < max_clients; i++)
-			client_socket[i] = 0;
-
-		if ((master_socket = socket(AF_INET, SOCK_STREAM, 0)) == 0) {
+		_master_socket = socket(AF_INET, SOCK_STREAM, 0);
+		if (_master_socket == 0) {
 			cout << strerror(errno) << "\n";
 			exit(EXIT_FAILURE);
 		}
 
-		if (setsockopt(master_socket, SOL_SOCKET, SO_REUSEADDR, (char *)&opt,
+		if (setsockopt(_master_socket, SOL_SOCKET, SO_REUSEADDR, (char *)&opt,
 					   sizeof(opt)) < 0) {
 			cout << strerror(errno) << "\n";
 			exit(EXIT_FAILURE);
 		}
 
-		address.sin_family = AF_INET;
-		address.sin_addr.s_addr = INADDR_ANY;
-		address.sin_port = htons(_port);
+		_address.sin_family = AF_INET;
+		_address.sin_addr.s_addr = INADDR_ANY;
+		_address.sin_port = htons(_port);
 
-		if (bind(master_socket, (struct sockaddr *)&address, sizeof(address)) < 0) {
+		if (bind(_master_socket, (struct sockaddr *)&_address, sizeof(_address)) < 0) {
 			cout << strerror(errno) << "\n";
 			exit(EXIT_FAILURE);
 		}
 		cout << "Listener on port " << _port << "\n";
 
-		if (listen(master_socket, 3) < 0) {
+		if (listen(_master_socket, 3) < 0) {
 			cout << strerror(errno) << "\n";
 			exit(EXIT_FAILURE);
 		}
 
-		addrlen = sizeof(address);
 		cout << "Waiting for connections ..." << "\n";
+	}
 
-		while (1) {
+	void check() {	
+		int new_socket, activity, i, valread, sd;
+		char buffer[30000];
+		char _404[72] =
+        "HTTP/1.1 200 OK\nContent-Type: text/plain\nContent-Length: 4\n\n404!";
+
+		int max_clients = 30;
+		int client_socket[30];
+		fd_set readfds;
+		int max_sd = _master_socket;
+
+
+
+		int addrlen = sizeof(_address);
+		for (i = 0; i < max_clients; i++)
+			client_socket[i] = 0;
 		FD_ZERO(&readfds);
-			FD_SET(master_socket, &readfds);
-			max_sd = master_socket;
+		FD_SET(_master_socket, &readfds);
 
 		for (i = 0; i < max_clients; i++) {
 			sd = client_socket[i];
@@ -83,8 +88,8 @@ class Server {
 		if ((activity < 0) && (errno != EINTR))
 			cout << strerror(errno) << "\n";
 
-			if (FD_ISSET(master_socket, &readfds)) {
-				if ((new_socket = accept(master_socket, (struct sockaddr *)&address,
+		if (FD_ISSET(_master_socket, &readfds)) {
+			if ((new_socket = accept(_master_socket, (struct sockaddr *)&_address,
 									 (socklen_t *)&addrlen)) < 0) {
 				cout << strerror(errno) << "\n";
 				exit(EXIT_FAILURE);
@@ -93,8 +98,8 @@ class Server {
 			fcntl(new_socket, F_GETNOSIGPIPE);
 #endif
 			cout << "New connection, socket fd is " << new_socket
-						  << ", ip is : " << inet_ntoa(address.sin_addr)
-						  << ", port : " << ntohs(address.sin_port) << "\n";
+					  << ", ip is : " << inet_ntoa(_address.sin_addr)
+					  << ", port : " << ntohs(_address.sin_port) << "\n";
 
 			for (i = 0; i < max_clients; i++) {
 				if (client_socket[i] == 0) {
@@ -111,11 +116,11 @@ class Server {
 			if (FD_ISSET(sd, &readfds)) {
 				valread = read(sd, buffer, 30000);
 				if (valread == 0) {
-						getpeername(sd, (struct sockaddr *)&address,
+					getpeername(sd, (struct sockaddr *)&_address,
 								(socklen_t *)&addrlen);
 					cout << "Host disconnected, ip "
-								  << inet_ntoa(address.sin_addr) << ", port "
-								  << ntohs(address.sin_port) << "\n";
+							  << inet_ntoa(_address.sin_addr) << ", port "
+							  << ntohs(_address.sin_port) << "\n";
 					close(sd);
 					client_socket[i] = 0;
 				} else
@@ -129,5 +134,5 @@ class Server {
 			}
 		}
 
-	}
+	
 };