From a4b14ff6fbd637f709eb874ee856974a5d764d63 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Thu, 21 Nov 2019 16:13:52 +0100 Subject: socket: Raise an error if open function failed. The socket opening wasn't tested and we fails later on another function using the wrongly opened socket. This would not happens anymore. Bug-AGL: SPEC-2988 Change-Id: I9b30bd9fc13b99277cbef6f7aeaddadc57ad0b18 Signed-off-by: Romain Forlot --- low-can-binding/utils/socketcan-j1939/socketcan-j1939.cpp | 2 ++ low-can-binding/utils/socketcan.cpp | 3 +++ 2 files changed, 5 insertions(+) (limited to 'low-can-binding/utils') diff --git a/low-can-binding/utils/socketcan-j1939/socketcan-j1939.cpp b/low-can-binding/utils/socketcan-j1939/socketcan-j1939.cpp index 38163254..660dffe4 100644 --- a/low-can-binding/utils/socketcan-j1939/socketcan-j1939.cpp +++ b/low-can-binding/utils/socketcan-j1939/socketcan-j1939.cpp @@ -168,6 +168,8 @@ namespace utils { socket_ = socketcan_t::open(PF_CAN, SOCK_DGRAM, CAN_J1939); + if (socket_ < 0) + return socket_; define_tx_address(device_name, name, pgn, addr); diff --git a/low-can-binding/utils/socketcan.cpp b/low-can-binding/utils/socketcan.cpp index 50dfafb3..e8e01980 100644 --- a/low-can-binding/utils/socketcan.cpp +++ b/low-can-binding/utils/socketcan.cpp @@ -73,6 +73,9 @@ namespace utils { close(); socket_ = ::socket(domain, type, protocol); + if (socket_ < 0) + AFB_ERROR("Open failed. %s", strerror(errno)); + return socket_; } -- cgit 1.2.3-korg