redoing an eric like version

logs/test_1.txt

@@ -0,0 +1,9 @@
+received 0 : client 1: hello
+received 0 : client 2: holla
+received 0 : client 3: hulli
+received 0 : server: client 1 just arrived
+received 0 : server: client 1 just left
+received 0 : server: client 2 just arrived
+received 0 : server: client 2 just left
+received 0 : server: client 3 just arrived
+received 0 : server: client 3 just left

logs/test_1_compare.txt

@@ -0,0 +1,9 @@
+received 0 : client 1: hello
+received 0 : client 2: holla
+received 0 : client 3: hulli
+received 0 : server: client 1 just arrived
+received 0 : server: client 1 just left
+received 0 : server: client 2 just arrived
+received 0 : server: client 2 just left
+received 0 : server: client 3 just arrived
+received 0 : server: client 3 just left

logs/test_2.txt

@@ -0,0 +1,18 @@
+received 0 : client 7: hulli
+received 0 : server: client 7 just arrived
+received 0 : server: client 7 just left
+received 0 : client 6: holla
+received 0 : client 7: hulli
+received 0 : server: client 6 just arrived
+received 0 : server: client 6 just left
+received 0 : server: client 7 just arrived
+received 0 : server: client 7 just left
+received 0 : client 5: hello
+received 0 : client 6: holla
+received 0 : client 7: hulli
+received 0 : server: client 5 just arrived
+received 0 : server: client 5 just left
+received 0 : server: client 6 just arrived
+received 0 : server: client 6 just left
+received 0 : server: client 7 just arrived
+received 0 : server: client 7 just left

logs/test_2_compare.txt

@@ -0,0 +1,18 @@
+received 0 : client 7: hulli
+received 0 : server: client 7 just arrived
+received 0 : server: client 7 just left
+received 0 : client 6: holla
+received 0 : client 7: hulli
+received 0 : server: client 6 just arrived
+received 0 : server: client 6 just left
+received 0 : server: client 7 just arrived
+received 0 : server: client 7 just left
+received 0 : client 5: hello
+received 0 : client 6: holla
+received 0 : client 7: hulli
+received 0 : server: client 5 just arrived
+received 0 : server: client 5 just left
+received 0 : server: client 6 just arrived
+received 0 : server: client 6 just left
+received 0 : server: client 7 just arrived
+received 0 : server: client 7 just left

logs/test_3.txt

@@ -0,0 +1,21 @@
+received 0 : client 10:
+received 0 : client 10: line 1
+received 0 : client 10: line 2
+received 0 : client 10: line 4
+received 0 : client 10: line 5
+received 0 : server: client 10 just arrived
+received 0 : server: client 10 just left
+received 0 : client 10:
+received 0 : client 10: line 1
+received 0 : client 10: line 2
+received 0 : client 10: line 4
+received 0 : client 10: line 5
+received 0 : client 9:
+received 0 : client 9: line 1
+received 0 : client 9: line 2
+received 0 : client 9: line 4
+received 0 : client 9: line 5
+received 0 : server: client 10 just arrived
+received 0 : server: client 10 just left
+received 0 : server: client 9 just arrived
+received 0 : server: client 9 just left

logs/test_3_compare.txt

@@ -0,0 +1,21 @@
+received 0 : client 10:
+received 0 : client 10: line 1
+received 0 : client 10: line 2
+received 0 : client 10: line 4
+received 0 : client 10: line 5
+received 0 : server: client 10 just arrived
+received 0 : server: client 10 just left
+received 0 : client 10:
+received 0 : client 10: line 1
+received 0 : client 10: line 2
+received 0 : client 10: line 4
+received 0 : client 10: line 5
+received 0 : client 9:
+received 0 : client 9: line 1
+received 0 : client 9: line 2
+received 0 : client 9: line 4
+received 0 : client 9: line 5
+received 0 : server: client 10 just arrived
+received 0 : server: client 10 just left
+received 0 : server: client 9 just arrived
+received 0 : server: client 9 just left

logs/test_4.txt

@@ -0,0 +1,3 @@
+received 0 : client 12: one medium line, which is more thant 50 characters long
+received 0 : server: client 12 just arrived
+received 0 : server: client 12 just left

logs/test_4_compare.txt

@@ -0,0 +1,3 @@
+received 0 : client 12: one medium line, which is more thant 50 characters long
+received 0 : server: client 12 just arrived
+received 0 : server: client 12 just left

mini_serv_2.c

@@ -166,15 +166,13 @@ int main(int ac, char **av) {
 		error("Fatal error\n");
 
 	while(1) {
-print_clients(first_client);
+//print_clients(first_client);
 		maxfd = sockfd;
 		FD_ZERO(&read_set);
 		FD_ZERO(&write_set);
 		FD_SET(sockfd, &read_set);
 		client = first_client;
 		while(client) {
-write(1, "1", 1);
-//printf("id: %i\n", client->id);
 			FD_SET(client->fd, &read_set);
 			FD_SET(client->fd, &write_set);
 			if (client->fd > maxfd)

mini_serv_3.c

@@ -0,0 +1,111 @@
+#include <errno.h>
+#include <netdb.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+typedef struct s_client {
+	int		id;
+	char	msg[1024];
+} t_client;
+
+t_client	clients[1024];
+fd_set		readfds, writefds, active;
+int				fd_max;
+int				id_next;
+char			bufread[120000];
+char			bufwrite[120000];
+
+void error(char *msg) {
+	write(2, msg, strlen(msg));
+	exit(1);
+}
+
+void broadcast(int not) {
+	for(int fd = 0; fd <= fd_max; ++fd) {
+		if (fd == not)
+			continue;
+		if (FD_ISSET(fd, &writefds))
+			send(fd, bufwrite, strlen(bufwrite), 0);
+	}
+}
+
+int main(int ac, char **av) {
+	int sockfd, connfd, res;
+	struct sockaddr_in servaddr, cli;
+	socklen_t len;
+
+	if (ac != 2)
+		error("Wrong number of arguments\n");
+
+	sockfd = socket(AF_INET, SOCK_STREAM, 0); 
+	if (sockfd == -1)
+		error("Fatal error\n");
+	bzero(&servaddr, sizeof(servaddr)); 
+
+	servaddr.sin_family = AF_INET; 
+	servaddr.sin_addr.s_addr = htonl(2130706433);
+	servaddr.sin_port = htons(atoi(av[1])); 
+
+	if ((bind(sockfd, (const struct sockaddr *)&servaddr, sizeof(servaddr))) == -1)
+		error("Fatal error\n");
+	if (listen(sockfd, 10) == -1)
+		error("Fatal error\n");
+
+	len = sizeof(cli);
+	FD_ZERO(&active);
+	FD_SET(sockfd, &active);
+	bzero(&clients, sizeof(clients));
+	fd_max = sockfd;
+
+	while(1) {
+		readfds = active;
+		writefds = active;
+
+		if (select(fd_max + 1, &readfds, &writefds, NULL, NULL) < 0)
+			continue;
+
+		for(int fd_i = 0; fd_i <= fd_max; ++fd_i) {
+			if (FD_ISSET(fd_i, &readfds) && fd_i == sockfd) {
+				connfd = accept(sockfd, (struct sockaddr *)&cli, &len);
+				if (connfd < 0)
+					continue;
+				if (connfd > fd_max)
+					fd_max = connfd;
+				clients[connfd].id = id_next++;
+				FD_SET(connfd, &active);
+				sprintf(bufwrite, "server: client %d just arrived\n", clients[connfd].id);
+				broadcast(connfd);
+				break;
+			}
+			if (FD_ISSET(fd_i, &readfds) && fd_i != sockfd) {
+				res = recv(fd_i, bufread, 65536, 0);
+				if (res <= 0) {
+					sprintf(bufwrite, "server: client %d just left\n", clients[fd_i].id);
+					broadcast(fd_i);
+					FD_CLR(fd_i, &active);
+					close(fd_i);
+					break;
+				}
+				else {
+					for(int i = 0, j = strlen(clients[fd_i].msg); i < res; ++i, ++j) {
+						clients[fd_i].msg[j] = bufread[i];
+						if (clients[fd_i].msg[j] == '\n') {
+							clients[fd_i].msg[j] = '\0';
+							sprintf(bufwrite, "client %d: %s\n", clients[fd_i].id, clients[fd_i].msg);
+							broadcast(fd_i);
+							bzero(clients[fd_i].msg, strlen(clients[fd_i].msg));
+							j = -1;
+						}
+					}
+					break;
+				}
+			}
+		}
+	}
+}
+
+

tester.sh

@@ -21,8 +21,8 @@ B_WHITE="\e[1;37m"
 
 COLOR_RESET="\e[0m"
 
-path="mini_serv.c"
+#path="mini_serv.c"
-compare_path="utils/mini_serv_luke.c"
+#compare_path="utils/mini_serv_luke.c"
 #
 #path="mini_serv.c"
 #compare_path="mini_serv.c"
@@ -32,6 +32,9 @@ compare_path="utils/mini_serv_luke.c"
 #
 #path="utils/mini_serv_eric.c"
 #compare_path="utils/mini_serv_luke.c"
+#
+path="mini_serv_3.c"
+compare_path="utils/mini_serv_luke.c"
 
 port=0
 while [ $port -lt 1024 -o $port -gt 10000 ]; do
@@ -148,7 +151,7 @@ stop_last_client
 new_test                                          #
 
 launch_client
-for i in {1..30}
+for i in {1..3000}
 do
 	launch_client
 	stop_last_client