server.c: Move accept syscall to server_listen function

3 files changed, 86 insertions, 46 deletions

diff --git a/main.c b/main.c
index 5db8d59..c3f7ae2 100644
--- a/main.c
+++ b/main.c
@@ -15,59 +15,15 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-#include <errno.h>
-#include <netinet/in.h>
-#include <stdbool.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <unistd.h>
 
-#include "./server.h"
+#include "server.h"
 
 #define SERVER_PORT 6667
-#define BUFFER_SIZE 1024
-#define EXIT_COMMAND "exit"
 
 int main() {
   server_t server = server_create(SERVER_PORT);
+  server_listen(&server);
 
-  struct sockaddr_in client;
-  socklen_t client_len = sizeof(client);
-
-  int client_fd = accept(server.fd, (struct sockaddr *) &client, &client_len);
-  if (client_fd == -1) {
-    perror("[ERROR] could not accept connection");
-    close(server.fd);
-    return EXIT_FAILURE;
-  }
-
-  bool running = true;
-
-  while (running) {
-    char client_buf[BUFFER_SIZE];
-    memset(client_buf, 0, BUFFER_SIZE);
-
-    if (recv(client_fd, client_buf, BUFFER_SIZE, 0) == -1) {
-      perror("[ERROR] could not read data from client");
-      continue;
-    }
-
-    if (!strncasecmp(client_buf, EXIT_COMMAND, strlen(EXIT_COMMAND) - 1)) {
-      puts("[INFO] exiting program. bye bye!");
-      close(client_fd);
-      close(server.fd);
-      exit(EXIT_SUCCESS);
-    }
-
-    if (send(client_fd, client_buf, BUFFER_SIZE, 0) == -1) {
-      perror("[ERROR] could not send data to client");
-      continue;
-    }
-  }
-
-  close(client_fd);
-  close(server.fd);
   return EXIT_SUCCESS;
 }
diff --git a/server.c b/server.c
index d7edb04..f8068aa 100644
--- a/server.c
+++ b/server.c
@@ -1,11 +1,32 @@
+/*
+ * Papo IRC Server
+ * Copyright (C) 2021 Johnny Richard
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 #include "server.h"
 
 #include <netinet/in.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/socket.h>
 #include <unistd.h>
 
+#define BUFFER_SIZE 1024
+#define EXIT_COMMAND "exit"
+
 server_t
 server_create(uint32_t port)
 {
@@ -39,3 +60,46 @@ server_create(uint32_t port)
 
   return (server_t) { .fd = server_fd };
 }
+
+void
+server_listen(server_t *server)
+{
+  struct sockaddr_in client;
+  socklen_t client_len = sizeof(client);
+
+  server->running = true;
+
+  while (server->running) {
+    int client_fd = accept(server->fd, (struct sockaddr *) &client, &client_len);
+    if (client_fd == -1) {
+      perror("[ERROR] could not accept connection");
+      close(server->fd);
+      exit(EXIT_FAILURE);
+    }
+    while (true) {
+      char client_buf[BUFFER_SIZE];
+      memset(client_buf, 0, BUFFER_SIZE);
+
+      if (recv(client_fd, client_buf, BUFFER_SIZE, 0) == -1) {
+        perror("[ERROR] could not read data from client");
+        continue;
+      }
+
+      if (!strncasecmp(client_buf, EXIT_COMMAND, strlen(EXIT_COMMAND) - 1)) {
+        puts("[INFO] exiting program. bye bye!");
+        close(client_fd);
+        close(server->fd);
+        exit(EXIT_SUCCESS);
+      }
+
+      if (send(client_fd, client_buf, BUFFER_SIZE, 0) == -1) {
+        perror("[ERROR] could not send data to client");
+        continue;
+      }
+    }
+
+    close(client_fd);
+    close(server->fd);
+    exit(EXIT_SUCCESS);
+  }
+}
diff --git a/server.h b/server.h
index 1b788dd..0fa4f5b 100644
--- a/server.h
+++ b/server.h
@@ -1,12 +1,32 @@
+/*
+ * Papo IRC Server
+ * Copyright (C) 2021 Johnny Richard
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 #ifndef SERVER_H
 #define SERVER_H
 
 #include <stdint.h>
+#include <stdbool.h>
 
 typedef struct server {
   int fd;
+  bool running;
 } server_t;
 
 server_t server_create(uint32_t port);
+void     server_listen(server_t *server);
 
 #endif /* SERVER_H */