fix ip4 bitwise AND and ipv6 from_str parsing, add raw socket support, non-blocking connect with timeout, split tcp open() by role, update state_e enum names, improve examples and docs

Author: biaks

CMakeLists.txt

@@ -15,13 +15,15 @@ option(IP_SOCKETS_CPP_LITE_BUILD_EXAMPLES "Build with examples" OFF)
 # for initialise variables: CMAKE_INSTALL_INCLUDEDIR, CMAKE_INSTALL_LIBDIR, CMAKE_INSTALL_BINDIR	
 include(GNUInstallDirs)
 
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin)
-
-if(WIN32)
-  foreach(OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES})
-    string(TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG)
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${PROJECT_SOURCE_DIR}/bin)
-  endforeach()
+# when this project is the root - set output to own bin/, otherwise inherit from parent
+if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
+  if(WIN32)
+    foreach(OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES})
+      string(TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG)
+      set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_SOURCE_DIR}/bin)
+    endforeach()
+  endif()
 endif()
 
 # =============================================================================
@@ -46,6 +48,12 @@ add_library               (${PROJECT_NAME}     INTERFACE)
 target_sources            (${PROJECT_NAME}     INTERFACE ${IP_SOCKETS_CPP_LITE_HEADERS})
 target_include_directories(${PROJECT_NAME}     INTERFACE $<BUILD_INTERFACE:  ${CMAKE_CURRENT_SOURCE_DIR}/include>
                                                          $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>  )
+
+# link pthreads on Linux (sockets use threads for examples and may be used in threaded apps)
+if(NOT WIN32)
+  find_package(Threads)
+  target_link_libraries(${PROJECT_NAME} INTERFACE Threads::Threads)
+endif()
 # it was need to show header files of INTERFACE target in IDEs like Visual Studio 2015 with CMake < 3.0
 #add_custom_target        (${PROJECT_NAME}-ide SOURCES   ${IP_SOCKETS_CPP_LITE_HEADERS})
 

examples/CMakeLists.txt

@@ -1,22 +1,18 @@
 
-if(NOT WIN32)
-  find_package(Threads)
-  target_link_libraries(${PROJECT_NAME} INTERFACE ${CMAKE_THREAD_LIBS_INIT})
-endif()
-
 function(add_example NAME_EXAMPLE REQUIRED_TARGETS)
   string(CONCAT SUBPROJECT_NAME "ipsockets_" ${NAME_EXAMPLE})
   message(STATUS "  Adding ${PROJECT_NAME}::${NAME_EXAMPLE} example..")
 
   add_executable        (${SUBPROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/${NAME_EXAMPLE}.cpp)
   target_link_libraries (${SUBPROJECT_NAME} ${REQUIRED_TARGETS})
-  set_target_properties (${SUBPROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/examples)
+  set_target_properties (${SUBPROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 endfunction()
 
 add_example(ip_address    ip-sockets-cpp-lite)
 add_example(ip_prefix     ip-sockets-cpp-lite)
 add_example(udp_socket    ip-sockets-cpp-lite)
 add_example(tcp_socket    ip-sockets-cpp-lite)
 add_example(resolve_host  ip-sockets-cpp-lite)
+add_example(raw_socket    ip-sockets-cpp-lite)
 add_example(http_server   ip-sockets-cpp-lite)
 add_example(tcp_stream    ip-sockets-cpp-lite)

examples/http_server.cpp

@@ -1,3 +1,4 @@
+
 #include "tcp_socket.h"
 
 #include <chrono>
@@ -18,11 +19,11 @@ using namespace ipsockets;
 using namespace std::chrono_literals;
 
 #if true
-static const ip_type_e cfg_ip_type = v4;
-static const addr4_t   cfg_server  = "127.0.0.1:8080";
+static const ip_type_e ip_type   = v4;
+static const addr4_t   ip_server = "127.0.0.1:8080";
 #else
-static const ip_type_e cfg_ip_type = v6;
-static const addr6_t   cfg_server  = "[::1]:8080";
+static const ip_type_e ip_type   = v6;
+static const addr6_t   ip_server = "[::1]:8080";
 #endif
 
 // ============================================================
@@ -45,8 +46,8 @@ struct mini_http_server_t {
   std::map<std::string, std::function<std::string()> > routes;
 
   std::chrono::steady_clock::time_point start_time;
-  uint64_t                        total_requests;
-  std::map<std::string, uint64_t> route_count;
+  uint64_t                              total_requests;
+  std::map<std::string, uint64_t>       route_count;
 
   // ===== constructor / destructor =====
 
@@ -86,10 +87,10 @@ struct mini_http_server_t {
       address_t                     client_addr;
 
       // Main accept loop
-      while (!must_die && server_socket.state == state_e::state_opened) {
+      while (!must_die && server_socket.state == state_e::opened) {
 
         tcp_client_t client = server_socket.accept(client_addr);
-        if (client.state != state_e::state_opened) continue;
+        if (client.state != state_e::opened) continue;
 
         // Handle client in separate thread
         tasks.push_back(std::async(std::launch::async,&mini_http_server_t::handle_client,this,std::move(client),client_addr));
@@ -348,11 +349,11 @@ struct mini_http_server_t {
 
 int main() {
 
-  mini_http_server_t<cfg_ip_type> server(cfg_server);
+  mini_http_server_t<ip_type> server(ip_server);
 
   std::cout << "\nMini HTTP Server is running!\n";
   std::cout << "Open your browser and visit:\n";
-  std::cout << "   http://" << cfg_server << "/\n";
+  std::cout << "   http://" << ip_server << "/\n";
   std::cout << "\nAvailable routes:\n";
   std::cout << "   /           - Home page\n";
   std::cout << "   /about      - About page\n";