picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use @ instead = as abstract namespace socket prefix

Browse source 
@ makes more sense since the NUL addr contained in the sockaddr's
sun_path field can also be written as ^@.

Also, in the .socket files writing "ListenStream==foo" is kinda ugly.

Finally, tools like strace decode it with an @ too.
This commit is contained in:
Lennart Poettering 2010-01-28 04:50:28 +01:00
parent 35355baba1
commit 1c24e7bd12
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
socket-util.c
View file

@ -69,7 +69,7 @@ int socket_address_parse(SocketAddress *a, const char *s) {
memcpy(a->sockaddr.un.sun_path, s, l);
a->size = sizeof(sa_family_t) + l + 1;
} else if (*s == '=') {
} else if (*s == '@') {
/* Abstract AF_UNIX socket */
size_t l;
@ -261,7 +261,7 @@ int socket_address_print(const SocketAddress *a, char **p) {
if (!(ret = new(char, sizeof(a->sockaddr.un.sun_path)+1)))
return -ENOMEM;
ret[0] = '=';
ret[0] = '@';
memcpy(ret+1, a->sockaddr.un.sun_path+1, sizeof(a->sockaddr.un.sun_path)-1);
ret[sizeof(a->sockaddr.un.sun_path)] = 0;

2
test1/systemd-logger.socket
View file

@ -2,4 +2,4 @@
Description=systemd Logging Socket
[Socket]
ListenStream==/systemd/logger
ListenStream=@/systemd/logger