eddy/eddys_snippets
1
0
Fork 0
mirror of https://github.com/eddyem/eddys_snippets.git synced 2025-12-06 10:45:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixed bug with "\0name" in sersock

Browse Source
This commit is contained in:
Edward Emelianov 2022-02-02 17:33:48 +03:00
parent 7ecdf689d3
commit 5eb3a2e4fd
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
serialsock/sersock.c
View File

@ -306,6 +306,13 @@ static TTY_descr *openserialdev(char *path, int speed){
} }
int start_socket(int server, char *path, TTY_descr **dev){ int start_socket(int server, char *path, TTY_descr **dev){
char apath[128];
DBG("path: %s", path);
if(strncmp("\\0", path, 2) == 0){
DBG("convert name");
apath[0] = 0;
strncpy(apath+1, path+2, 126);
}else strcpy(apath, path);
if(server){ if(server){
if(!dev) return 1; if(!dev) return 1;
if(!(*dev = openserialdev(GP->devpath, GP->speed))){ if(!(*dev = openserialdev(GP->devpath, GP->speed))){
@ -317,7 +324,7 @@ int start_socket(int server, char *path, TTY_descr **dev){
int reuseaddr = 1; int reuseaddr = 1;
struct sockaddr_un saddr = {0}; struct sockaddr_un saddr = {0};
saddr.sun_family = AF_UNIX; saddr.sun_family = AF_UNIX;
strncpy(saddr.sun_path, path, 106); // if sun_path[0] == 0 we don't create a file memcpy(saddr.sun_path, apath, 106); // if sun_path[0] == 0 we don't create a file
if((sock = socket(AF_UNIX, SOCK_SEQPACKET, 0)) < 0){ // or SOCK_STREAM? if((sock = socket(AF_UNIX, SOCK_SEQPACKET, 0)) < 0){ // or SOCK_STREAM?
LOGERR("socket()"); LOGERR("socket()");
ERR("socket()"); ERR("socket()");