From 310513c569b0073f468a8843ec3751abfa2e1858 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20Gallou=C3=ABt?= <adrien@gallouet.fr>
Date: Fri, 17 Aug 2018 14:00:13 +0000
Subject: [PATCH] Don't log useless things in the main loop
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
---
 src/bind.c | 23 +++++------------------
 src/ip.h   |  6 +++---
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/src/bind.c b/src/bind.c
index a850820..c353d9c 100644
--- a/src/bind.c
+++ b/src/bind.c
@@ -222,9 +222,8 @@ gt_bind(int argc, char **argv)
         if (ret == -1) {
             if (errno == EBADF) {
                 perror("select");
-                return 1;
+                break;
             }
-
             continue;
         }
 
@@ -315,28 +314,16 @@ gt_bind(int argc, char **argv)
             struct ip_common ic;
             const int r = tun_read(tun_fd, buf, bufsize);
 
-            if (r <= 0) {
-                if (r == -1 && errno != EAGAIN)
-                    perror("tun_read");
-            } else if ((!ip_get_common(&ic, buf, r)) &&
-                       (mud_send(mud, buf, r, ic.tc) == -1)) {
-                if (errno != EAGAIN)
-                    perror("mud_send");
-            }
+            if (!ip_get_common(&ic, buf, r))
+                mud_send(mud, buf, r, ic.tc);
         }
 
         if (FD_ISSET(mud_fd, &rfds)) {
             struct ip_common ic;
             const int r = mud_recv(mud, buf, bufsize);
 
-            if (r <= 0) {
-                if (r == -1 && errno != EAGAIN)
-                    perror("mud_recv");
-            } else if ((!ip_get_common(&ic, buf, r)) &&
-                       (tun_write(tun_fd, buf, r) == -1)) {
-                if (errno != EAGAIN)
-                    perror("tun_write");
-            }
+            if (!ip_get_common(&ic, buf, r))
+                tun_write(tun_fd, buf, r);
         }
 
         if (!ret)
diff --git a/src/ip.h b/src/ip.h
index b67d42a..64fa41c 100644
--- a/src/ip.h
+++ b/src/ip.h
@@ -13,16 +13,16 @@ ip_get_version(const uint8_t *data)
     return data[0] >> 4;
 }
 
-static inline uint16_t
+static inline int
 ip_read16(const uint8_t *src)
 {
     uint16_t ret = src[1];
     ret |= ((uint16_t)src[0]) << 8;
-    return ret;
+    return (int)ret;
 }
 
 static inline int
-ip_get_common(struct ip_common *ic, const uint8_t *data, size_t size)
+ip_get_common(struct ip_common *ic, const uint8_t *data, int size)
 {
     if (size < 20)
         return 1;