Renamed 'examples/linux/' to 'examples/canbus/'

Author: fpagliughi

examples/CMakeLists.txt

@@ -54,10 +54,10 @@ if(SOCKPP_WITH_UNIX_SOCKETS)
 	add_subdirectory(unix)
 endif()
 
-# --- Anything that is Linux-specific ---
+# --- Optional CANbus (SocketCAN) examples ---
 
-if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-    add_subdirectory(linux)
+if(SOCKPP_WITH_CAN)
+    add_subdirectory(canbus)
 endif()
 
 # --- Optional secure sockets ---

examples/linux/CMakeLists.txt examples/canbus/CMakeLists.txtexamples/linux/CMakeLists.txt renamed to examples/canbus/CMakeLists.txt

@@ -1,7 +1,6 @@
 # CMakeLists.txt
 #
-# CMake file for the Linux SocketCAN sample applications in the
-# 'sockpp' library.
+# CMake file for the CANbus sample applications in the 'sockpp' library.
 #
 # ---------------------------------------------------------------------------
 # This file is part of the "sockpp" C++ socket library.
@@ -37,22 +36,14 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 # ---------------------------------------------------------------------------
 
-# --- Optional Linux SocketCAN support ---
+set(EXECUTABLES
+    canbustime
+    canbusrecv
+)
 
-if(SOCKPP_WITH_CAN)
-    # --- Executables ---
+foreach(EXECUTABLE ${EXECUTABLES})
+    add_executable(${EXECUTABLE} ${EXECUTABLE}.cpp)
+    target_link_libraries(${EXECUTABLE} Sockpp::sockpp)
+endforeach()
 
-    set(EXECUTABLES
-    	canbustime
-    	canbusrecv
-    )
-
-    foreach(EXECUTABLE ${EXECUTABLES})
-        add_executable(${EXECUTABLE} ${EXECUTABLE}.cpp)
-        target_link_libraries(${EXECUTABLE} Sockpp::sockpp)
-    endforeach()
-
-    # --- Install examples ---
-
-    install(TARGETS ${EXECUTABLES} RUNTIME DESTINATION bin)
-endif()
+install(TARGETS ${EXECUTABLES} RUNTIME DESTINATION bin)

examples/linux/canbusrecv.cpp examples/canbus/canbusrecv.cppexamples/linux/canbusrecv.cpp renamed to examples/canbus/canbusrecv.cpp

@@ -261,7 +261,6 @@ class canbusfd_socket : public canbus_socket
     canbusfd_socket(const canbusfd_socket&) = delete;
     canbusfd_socket& operator=(const canbusfd_socket&) = delete;
 
-
     /**
      * Turn on FD mode for the socket on or off.
      *
@@ -309,6 +308,20 @@ class canbusfd_socket : public canbus_socket
      * @throws std::system_error if the open socket cannot enter FD mode.
      */
     explicit canbusfd_socket(canbus_socket&& other);
+    /**
+     * Move constructor from a base canbus_socket.
+     * If the incoming socket is open, it is put into FD mode.
+     * @param other The canbus_socket to move into this one.
+     * @param ec Gets the error code on failure; the socket is closed on error.
+     */
+    explicit canbusfd_socket(canbus_socket&& other, error_code& ec) noexcept;
+    /**
+     * Attempts to create a CAN FD socket from an existing canbus_socket.
+     * If the incoming socket is open, it is put into FD mode.
+     * @param sock The canbus_socket to convert.
+     * @return The new FD socket on success, or the error code on failure.
+     */
+    static result<canbusfd_socket> try_from(canbus_socket&& sock) noexcept;
     /**
      * Move assignment.
      * @param rhs The other socket to move into this one.

examples/linux/canbustime.cpp examples/canbus/canbustime.cppexamples/linux/canbustime.cpp renamed to examples/canbus/canbustime.cpp

@@ -42,7 +42,6 @@
 #include "sockpp/socket.h"
 
 using namespace std;
-using namespace std::chrono;
 
 namespace sockpp {
 
@@ -103,6 +102,26 @@ canbusfd_socket::canbusfd_socket(canbus_socket&& other) : base(std::move(other))
     }
 }
 
+canbusfd_socket::canbusfd_socket(canbus_socket&& other, error_code& ec) noexcept
+    : base(std::move(other)) {
+    if (is_open()) {
+        if (auto res = set_fd_mode(); !res) {
+            ec = res.error();
+            close();
+        }
+    }
+}
+
+result<canbusfd_socket> canbusfd_socket::try_from(canbus_socket&& sock) noexcept {
+    canbusfd_socket fd_sock;
+    static_cast<canbus_socket&>(fd_sock) = std::move(sock);
+    if (fd_sock.is_open()) {
+        if (auto res = fd_sock.set_fd_mode(); !res)
+            return res.error();
+    }
+    return fd_sock;
+}
+
 result<> canbusfd_socket::open(const canbus_address& addr) noexcept {
     if (auto res = base::open(addr); !res)
         return res;

include/sockpp/canbus/canbus_socket.h

@@ -83,7 +83,6 @@ TEST_CASE("canbus_socket classic send/recv", "[canbus][socket]") {
     REQUIRE(rxFrame.id_value() == CAN_ID);
     REQUIRE(rxFrame.len == DATA.size());
     REQUIRE(memcmp(rxFrame.data, DATA.data(), DATA.size()) == 0);
-
 }
 
 TEST_CASE("canbusfd_socket FD send/recv", "[canbus][socket]") {