scottk/OpenNetworkLinux
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenNetworkLinux.git synced 2025-12-25 09:17:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

UDS Error Handling

Browse Source 
- Don't allow UDS connects() to block.
- Add a 1 second timeout for all UDS read/write operations.
This commit is contained in:
Jeffrey Townsend
2018-04-03 21:11:29 +00:00
parent 41bf6970e5
commit 3b45ae6813
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/base/any/onlp/src/onlplib/module/src/file.c
View File

@@ -50,11 +50,26 @@ ds_connect__(const char* path)
return -1;
}
/*
* UDS connects must be non-blocking.
*/
fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) | O_NONBLOCK);
memset(&addr, 0, sizeof(addr));
addr.sun_family = AF_UNIX;
strncpy(addr.sun_path, path, sizeof(addr.sun_path)-1);
if(connect(fd, (struct sockaddr*)&addr, sizeof(addr)) == 0) {
/*
* Set blocking with a 1 second timeout on all domain socket read/write operations.
*/
struct timeval tv;
fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) & ~O_NONBLOCK);
tv.tv_sec = 1;
tv.tv_usec = 0;
setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, (const char*)&tv, sizeof tv);
return fd;
}
else {