Merged in dstaesse/ouroboros/be-fix-build (pull request #271)

ipcpd: Fix unused variable

2 files changed, 5 insertions, 2 deletions

diff --git a/src/ipcpd/local/main.c b/src/ipcpd/local/main.c
index c9ad0ae6..f6fe4ec1 100644
--- a/src/ipcpd/local/main.c
+++ b/src/ipcpd/local/main.c
@@ -147,7 +147,10 @@ void ipcp_sig_handler(int sig, siginfo_t * info, void * c)
 
 static int ipcp_local_bootstrap(struct dif_config * conf)
 {
-        assert (conf->type == THIS_TYPE);
+        assert(conf);
+        assert(conf->type == THIS_TYPE);
+
+        (void) conf;
 
         pthread_rwlock_wrlock(&ipcpi.state_lock);
 
diff --git a/src/tools/oping/oping_server.c b/src/tools/oping/oping_server.c
index 193b76d1..bcd47f9a 100644
--- a/src/tools/oping/oping_server.c
+++ b/src/tools/oping/oping_server.c
@@ -150,7 +150,7 @@ void * accept_thread(void * o)
                 server.times[fd] = now;
                 pthread_mutex_unlock(&server.lock);
 
-                flow_cntl(fd, FLOW_F_SETFL, FLOW_O_NONBLOCK);
+                flow_cntl(fd, FLOW_F_SETFL, FLOW_O_NONBLOCK | FLOW_O_RDWR);
         }
 
         return (void *) 0;