Merged in sandervrijders/ouroboros/be (pull request #72)

ipcpd: Allow disabling of DNS

1 files changed, 40 insertions, 12 deletions

diff --git a/src/ipcpd/shim-udp/CMakeLists.txt b/src/ipcpd/shim-udp/CMakeLists.txt
index c71fa00b..e10a8ca6 100644
--- a/src/ipcpd/shim-udp/CMakeLists.txt
+++ b/src/ipcpd/shim-udp/CMakeLists.txt
@@ -1,5 +1,7 @@
-get_filename_component(CURRENT_SOURCE_PARENT_DIR ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
-get_filename_component(CURRENT_BINARY_PARENT_DIR ${CMAKE_CURRENT_BINARY_DIR} DIRECTORY)
+get_filename_component(CURRENT_SOURCE_PARENT_DIR
+  ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
+get_filename_component(CURRENT_BINARY_PARENT_DIR
+  ${CMAKE_CURRENT_BINARY_DIR} DIRECTORY)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
@@ -18,33 +20,59 @@ IF(NOT CMAKE_HAVE_GETHOSTBYNAME)
   IF (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME)
     SET (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lnsl)
   ELSE (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME)
-    CHECK_LIBRARY_EXISTS("bsd" "gethostbyname" "" CMAKE_LIB_BSD_HAS_GETHOSTBYNAME)
+    CHECK_LIBRARY_EXISTS("bsd" "gethostbyname" ""
+      CMAKE_LIB_BSD_HAS_GETHOSTBYNAME)
     IF (CMAKE_LIB_BSD_HAS_GETHOSTBYNAME)
       SET (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lbsd)
     ENDIF (CMAKE_LIB_BSD_HAS_GETHOSTBYNAME)
   ENDIF (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME)
 ENDIF(NOT CMAKE_HAVE_GETHOSTBYNAME)
 
-# Find the nsupdate executable
-find_program(NSUPDATE_EXECUTABLE
-  NAMES nsupdate
-  DOC "The nsupdate tool that enables DDNS")
+# Enable DNS by default
+if (NOT DISABLE_DNS MATCHES True)
+  # Find the nsupdate executable
+  find_program(NSUPDATE_EXECUTABLE
+    NAMES nsupdate
+    DOC "The nsupdate tool that enables DDNS")
 
-if (${NSUPDATE_EXECUTABLE} STREQUAL "NSUPDATE_EXECUTABLE-NOTFOUND")
-  message(FATAL_ERROR "Could not find nsupdate, which is needed for DDNS")
-else()
-  message("-- Found nsupdate: ${NSUPDATE_EXECUTABLE}")
+  if (${NSUPDATE_EXECUTABLE} STREQUAL "NSUPDATE_EXECUTABLE-NOTFOUND")
+    message(FATAL_ERROR "Could not find nsupdate, which is needed for DDNS")
+  else()
+    message("-- Found nsupdate: ${NSUPDATE_EXECUTABLE}")
+  endif()
+
+  # Find the nslookup executable
+  find_program(NSLOOKUP_EXECUTABLE
+    NAMES nslookup
+    DOC "The nslookup tool that resolves DNS names")
+
+  if (${NSLOOKUP_EXECUTABLE} STREQUAL "NSLOOKUP_EXECUTABLE-NOTFOUND")
+    message(FATAL_ERROR
+      "Could not find nslookup, which is needed for DNS resolution")
+  else()
+    message("-- Found nslookup: ${NSLOOKUP_EXECUTABLE}")
+  endif()
 endif()
 
+configure_file(
+  "${CMAKE_CURRENT_SOURCE_DIR}/shim_udp_config.h.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/shim_udp_config.h")
+
 SET(IPCP_SHIM_UDP_TARGET ipcpd-shim-udp CACHE STRING "IPCP_SHIM_UDP_TARGET")
 
 set(SHIM_UDP_SOURCES
   # Add source files here
   ${CMAKE_CURRENT_SOURCE_DIR}/main.c)
 
-add_executable (ipcpd-shim-udp ${SHIM_UDP_SOURCES} ${IPCP_SOURCES})
+add_executable (ipcpd-shim-udp ${SHIM_UDP_SOURCES} ${IPCP_SOURCES}
+  "${CMAKE_CURRENT_BINARY_DIR}/shim_udp_config.h")
 target_link_libraries (ipcpd-shim-udp LINK_PUBLIC ouroboros)
 
+# Enable DNS by default
+if (NOT DISABLE_DNS MATCHES True)
+  MACRO_ADD_COMPILE_FLAGS(ipcpd-shim-udp -DCONFIG_OUROBOROS_ENABLE_DNS)
+endif()
+
 include(MacroAddCompileFlags)
 if (CMAKE_BUILD_TYPE MATCHES Debug)
   MACRO_ADD_COMPILE_FLAGS(ipcpd-shim-udp -DCONFIG_OUROBOROS_DEBUG)