Enable use of Linux's abstract namespace for UDS.

cheako · cheako · commit c6c404ec4805 · 2020-08-21T21:31:36.000-05:00
diff --git a/Csocket.cc b/Csocket.cc
@@ -1302,9 +1302,12 @@ static bool prepare_sockaddr(struct sockaddr_un * addr, const CS_STRING & sPath)
 {
 	memset( addr, 0, sizeof(*addr) );
 	addr->sun_family = AF_UNIX;
-	if( sizeof(addr->sun_path) <= sPath.length() )
+	auto length = sPath.length();
+	if( sizeof(addr->sun_path) <= length )
 		return( false );
-	memcpy( &addr->sun_path, sPath.c_str(), sPath.length() + 1 );
+	memcpy( &addr->sun_path, sPath.c_str(), length + 1 );
+	// Linux abstract namespace is null followed by name.
+	if (sPath[0] == '@') addr->sun_path = 0;
 	return true;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1302,9 +1302,12 @@ static bool prepare_sockaddr(struct sockaddr_un * addr, const CS_STRING & sPath)`
`1302`	`1302`	`{`
`1303`	`1303`	`memset( addr, 0, sizeof(*addr) );`
`1304`	`1304`	`addr->sun_family = AF_UNIX;`
`1305`		`- if( sizeof(addr->sun_path) <= sPath.length() )`
	`1305`	`+ auto length = sPath.length();`
	`1306`	`+ if( sizeof(addr->sun_path) <= length )`
`1306`	`1307`	`return( false );`
`1307`		`- memcpy( &addr->sun_path, sPath.c_str(), sPath.length() + 1 );`
	`1308`	`+ memcpy( &addr->sun_path, sPath.c_str(), length + 1 );`
	`1309`	`+ // Linux abstract namespace is null followed by name.`
	`1310`	`+ if (sPath[0] == '@') addr->sun_path = 0;`
`1308`	`1311`	`return true;`
`1309`	`1312`	`}`
`1310`	`1313`