From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 28 Jan 2010 03:50:28 +0000 (+0100)
Subject: Use @ instead = as abstract namespace socket prefix
X-Git-Tag: v1~765
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=1c24e7bd1286d16a7125aeeee0470ea0685c8318;ds=sidebyside

Use @ instead = as abstract namespace socket prefix

@ 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.
---

diff --git a/socket-util.c b/socket-util.c
index 46a6e91bb..0282dd2f3 100644
--- a/socket-util.c
+++ b/socket-util.c
@@ -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;
 
diff --git a/test1/systemd-logger.socket b/test1/systemd-logger.socket
index 3f05363cc..c964ab7da 100644
--- a/test1/systemd-logger.socket
+++ b/test1/systemd-logger.socket
@@ -2,4 +2,4 @@
 Description=systemd Logging Socket
 
 [Socket]
-ListenStream==/systemd/logger
+ListenStream=@/systemd/logger