3.2.0

Signed-off-by: Christian Gabriel <ch_gabriel@web.de>

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.2)
-project(libicsneo-socketcan-daemon VERSION 3.1.2)
+project(libicsneo-socketcan-daemon VERSION 3.2.0)
 
 set(CMAKE_CXX_STANDARD 17)
 
@@ -28,4 +28,4 @@ include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
 add_subdirectory("third-party/libicsneo")
 
 add_executable(libicsneo-socketcan-daemon src/main.cpp)
-target_link_libraries(libicsneo-socketcan-daemon icsneocpp)
+target_link_libraries(libicsneo-socketcan-daemon icsneocpp)

src/main.cpp

@@ -39,6 +39,7 @@
 #define SIOCGMAXIFACES			0x3007
 #define SIOCGVERSION			0x3008
 #define SIOCGCLIENTVEROK		0x3009
+#define SIOCSBAUDRATE			0x300A
 
 #define RX_BOX_SIZE			(sharedMemSize / (maxInterfaces * 2))
 #define TX_BOX_SIZE			(sharedMemSize / 4)
@@ -96,6 +97,25 @@ public:
 		} else
 			LOG(LOG_DEBUG, "Removing interface which was not opened successfully\n");
 	}
+
+	bool reportBaudrates(int64_t baudrate, int64_t fd_baudrate) {
+		struct baudrate_info {
+			int handle;
+			int64_t baudrates[2];
+		} info;
+
+		info.handle = kernelHandle;
+		info.baudrates[0] = baudrate;
+		/* set fd baudrate to zero if equal to baudrate
+		 * this will disable fd mode in kernel */
+		info.baudrates[1] = (fd_baudrate==baudrate)?0:fd_baudrate;
+		if (ioctl(driver, SIOCSBAUDRATE, &info) != 0) {
+			LOGF(LOG_INFO, "Unable to set baudrate for device %s\n", name.c_str());
+			return false;
+		}
+
+		return true;
+	}
 	NetworkInterface(const NetworkInterface&) = delete;
 	NetworkInterface& operator =(const NetworkInterface&) = delete;
 
@@ -307,6 +327,16 @@ void searchForDevices() {
 			}
 			continue;
 		}
+		if (driverMinor > 0) {
+			for(const auto& net : supportedNetworks) {
+				if (net.getType() != icsneo::Network::Type::CAN)
+					continue;
+				newDevice.interfaces[net.getNetID()]->reportBaudrates(
+					newDevice.device->settings->getBaudrateFor(net.getNetID()),
+					newDevice.device->settings->getFDBaudrateFor(net.getNetID())
+				);
+			}
+		}
 
 		// Create rx listener
 		newDevice.device->addMessageCallback(std::make_shared<icsneo::MessageCallback>([serial](std::shared_ptr<icsneo::Message> message) {
@@ -532,6 +562,33 @@ int main(int argc, char** argv) {
 				LOGF(LOG_ERR, "Unexpected number of bytes read, expected %d got %d\n", (int)sizeof(info), (int)r);
 				stopRunning = true;
 				break;
+			} else if (info.tx_box_index < 0) {
+				// Baudrate changed in kernel
+				int dev_idx = -(info.tx_box_index + 1);
+				LOGF(LOG_INFO, "Baudrate change, device %d, baudrate %d fd_baudrate %ld\n",
+					dev_idx, info.count, info.bytes);
+				/* fd baudrate is zero if fd mode is disabled in kernel
+				 * set fd baudrate equal to baudrate */
+				if (info.bytes == 0) {
+					info.bytes = info.count;
+				}
+				for(auto& dev : openDevices) {
+					for(auto& netifPair : dev.interfaces) {
+						auto netid = netifPair.first;
+						if(netifPair.second->getKernelHandle() != dev_idx)
+							continue;
+						if (! dev.device->settings->setBaudrateFor(netid, info.count) ) {
+							LOGF(LOG_ERR, "Unable to set baudrate for device %s\n",
+								netifPair.second->getName().c_str());
+						} else if (! dev.device->settings->setFDBaudrateFor(netid, info.bytes)) {
+							LOGF(LOG_ERR, "Unable to set fd baudrate for device %s\n",
+								netifPair.second->getName().c_str());
+						} else if (! dev.device->settings->apply()) {
+							LOGF(LOG_ERR, "Unable to apply settings for device %s\n",
+								netifPair.second->getName().c_str());
+						}
+					}
+				}
 			} else {
 				// Send!
 				uint8_t* currentPosition = GET_TX_BOX(info.tx_box_index);