scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-20 06:40:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipc_frame_unix: Delete socket files in destructor

Browse Source
This commit is contained in:
Martin Piatka
2022-08-17 15:00:46 +02:00
parent 68cf3f697b
commit bbd91f7720
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/ipc_frame_unix.cpp
View File

@@ -3,6 +3,7 @@
#include <string.h>
#include <stdio.h>
#include <array>
#include <string>
#ifndef _WIN32
#include <sys/types.h>
@@ -12,11 +13,13 @@
#include <netinet/in.h>
#define CLOSESOCKET close
#define INVALID_SOCKET -1
#define UNLINK unlink
typedef int fd_t;
#else
#include <winsock2.h>
#include <afunix.h>
#define CLOSESOCKET closesocket
#define UNLINK DeleteFileA
typedef SOCKET fd_t;
#endif
@@ -30,10 +33,12 @@ typedef SOCKET fd_t;
struct Ipc_frame_reader{
fd_t listen_fd;
fd_t data_fd;
std::string path;
};
Ipc_frame_reader *ipc_frame_reader_new(const char *path){
auto reader = new Ipc_frame_reader();
reader->path = path;
reader->data_fd = INVALID_SOCKET;
reader->listen_fd = socket(AF_UNIX, SOCK_STREAM, 0);
@@ -47,7 +52,7 @@ Ipc_frame_reader *ipc_frame_reader_new(const char *path){
addr.sun_family = AF_UNIX;
strncpy(addr.sun_path, path, sizeof(addr.sun_path));
addr.sun_path[sizeof(addr.sun_path) - 1] = '\0';
unlink(path);
UNLINK(path);
int ret = 0;
ret = bind(reader->listen_fd, (const sockaddr *) &addr, sizeof(addr.sun_path));
@@ -73,6 +78,8 @@ void ipc_frame_reader_free(struct Ipc_frame_reader *reader){
if(reader->listen_fd != INVALID_SOCKET)
CLOSESOCKET(reader->listen_fd);
UNLINK(reader->path.c_str());
delete reader;
}