Added more error handling

Grzegorz Jabłoński
1 parent d7575a75
Showing 1 changed file with 30 additions and 9 deletions
epoll4.c
-/*
- * Attention:
- * To keep things simple, do not handle
- * socket/bind/listen/.../epoll_create/epoll_wait API error
- */
 #include <arpa/inet.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -68,9 +63,15 @@ static void set_sockaddr(struct sockaddr_in *addr) {
 }
 static int setnonblocking(int sockfd) {
+  int prev = fcntl(sockfd, F_GETFL, 0);
+  if (prev == -1) {
+    perror("fcntl");
+    exit(1);
+  }
+
   if (fcntl(sockfd, F_SETFL, fcntl(sockfd, F_GETFL, 0) | O_NONBLOCK) == -1) {
-    perror("fcntl set nonblock");
-    return -1;
+    perror("fcntl");
+    exit(1);
   }
   return 0;
 }
@@ -93,12 +94,19 @@ void server_run() {
   listen_sock = socket(AF_INET, SOCK_STREAM, 0);
+  if (listen_sock == -1) {
+    perror("socket");
+    exit(1);
+  }
+
   set_sockaddr(&srv_addr);
   int reuseaddr = 1;
   if (setsockopt(listen_sock, SOL_SOCKET, SO_REUSEADDR, &reuseaddr,
-                 sizeof(int)) < 0)
+                 sizeof(int)) < 0) {
     perror("setsockopt(SO_REUSEADDR)");
+    exit(1);
+  }
   if (bind(listen_sock, (struct sockaddr *)&srv_addr, sizeof(srv_addr)) < 0) {
     perror("bind");
@@ -112,6 +120,11 @@ void server_run() {
   }
   epfd = epoll_create(1);
+  if (epfd == -1) {
+    perror("epoll_create");
+    exit(1);
+  }
+
   epoll_ctl_add(epfd, listen_sock, EPOLLIN | EPOLLOUT);
   socklen = sizeof(cli_addr);
@@ -164,7 +177,11 @@ void server_run() {
       /* check if the connection is closing */
       if (events[i].events & (EPOLLRDHUP | EPOLLHUP)) {
         printf("[+] connection closed\n");
-        epoll_ctl(epfd, EPOLL_CTL_DEL, events[i].data.fd, NULL);
+
+        if (epoll_ctl(epfd, EPOLL_CTL_DEL, events[i].data.fd, NULL) == -1) {
+          perror("epoll_ctl");
+          exit(1);
+        }
         close(events[i].data.fd);
         continue;
       }
@@ -183,6 +200,10 @@ void client_run() {
   struct sockaddr_in srv_addr;
   sockfd = socket(AF_INET, SOCK_STREAM, 0);
+  if (sockfd == -1) {
+    perror("socket");
+    exit(1);
+  }
   set_sockaddr(&srv_addr);