Merge remote-tracking branch 'upstream/be' into be

4 files changed, 10 insertions, 68 deletions

diff --git a/include/ouroboros/CMakeLists.txt b/include/ouroboros/CMakeLists.txt
index fb4884b7..cfa299ca 100644
--- a/include/ouroboros/CMakeLists.txt
+++ b/include/ouroboros/CMakeLists.txt
@@ -10,7 +10,6 @@ set(HEADER_FILES
         dev.h
         dif_config.h
         du_buff.h
-        flow.h
         instance_name.h
         ipcp.h
         irm.h
diff --git a/include/ouroboros/config.h.in b/include/ouroboros/config.h.in
index 01d7888e..6abce97a 100644
--- a/include/ouroboros/config.h.in
+++ b/include/ouroboros/config.h.in
@@ -23,10 +23,12 @@
 #ifndef OUROBOROS_CONFIG
 #define OUROBOROS_CONFIG
 
-#define PROJECT_NAME    "@CMAKE_PROJECT_NAME@"
-#define PROJECT_VERSION "@PACKAGE_VERSION@"
-#define INSTALL_DIR     "@CMAKE_INSTALL_PREFIX@"
-#define BUILD_TYPE      "@CMAKE_BUILD_TYPE@"
-#define _POSIX_C_SOURCE 199506L
+#define PROJECT_NAME       "@CMAKE_PROJECT_NAME@"
+#define PROJECT_VERSION    "@PACKAGE_VERSION@"
+#define INSTALL_DIR        "@CMAKE_INSTALL_PREFIX@"
+#define BUILD_TYPE         "@CMAKE_BUILD_TYPE@"
+#define _POSIX_C_SOURCE    199506L
+#define IPCP_SHIM_UDP_EXEC "@IPCP_SHIM_UDP_TARGET@"
+#define IPCP_NORMAL_EXEC   "@IPCP_NORMAL_TARGET@"
 
 #endif
diff --git a/include/ouroboros/dif_config.h b/include/ouroboros/dif_config.h
index 91b44cb1..5d489b0c 100644
--- a/include/ouroboros/dif_config.h
+++ b/include/ouroboros/dif_config.h
@@ -21,12 +21,13 @@
  */
 
 #include <ouroboros/utils.h>
+#include <ouroboros/common.h>
 
 #ifndef OUROBOROS_DIF_CONFIG_H
 #define OUROBOROS_DIF_CONFIG_H
 
 enum ipcp_type {
-        IPCP_NORMAL = 1,
+        IPCP_NORMAL = 0,
         IPCP_SHIM_UDP
 };
 
@@ -53,6 +54,7 @@ struct dif_config {
                 /* Shim UDP */
                 struct {
                         uint32_t ip_addr;
+                        uint32_t dns_addr;
                 };
         };
 };
diff --git a/include/ouroboros/flow.h b/include/ouroboros/flow.h
deleted file mode 100644
index 7d8c311e..00000000
--- a/include/ouroboros/flow.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Ouroboros - Copyright (C) 2016
- *
- * Flows
- *
- *    Dimitri Staessens <dimitri.staessens@intec.ugent.be>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef OUROBOROS_FLOW_H
-#define OUROBOROS_FLOW_H
-
-#include <ouroboros/common.h>
-
-#include <pthread.h>
-
-/* same values as fcntl.h */
-#define FLOW_O_RDONLY   00000000
-#define FLOW_O_WRONLY   00000001
-#define FLOW_O_RDWR     00000002
-#define FLOW_O_ACCMODE  00000003
-
-#define FLOW_O_NONBLOCK 00004000
-#define FLOW_O_DEFAULT  00000002
-
-#define FLOW_O_INVALID  (FLOW_O_WRONLY | FLOW_O_RDWR)
-
-enum flow_state {
-        FLOW_INIT = 0,
-        FLOW_ALLOCATED,
-        FLOW_PENDING
-};
-
-typedef struct flow {
-        int32_t         port_id;
-        uint16_t        oflags;
-        enum flow_state state;
-
-        pthread_mutex_t lock;
-} flow_t;
-
-flow_t * flow_create(int32_t   port_id);
-void     flow_destroy(flow_t * flow);
-
-int      flow_set_opts(flow_t * flow, uint16_t opts);
-uint16_t flow_get_opts(const flow_t * flow);
-
-#endif /* OUROBOROS_FLOW_H */