X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fsocket.h;h=9d48cde0a671e83778caed969ceb5f68379eff4c;hb=97d0e5f83ba4dd713170f802b90149b7325bc992;hp=a273ac274097bc89e0f6c150088ae84ceb6b15e5;hpb=aea54018a5e66a41318afb6c6be745b6aef48d9e;p=elogind.git

diff --git a/src/core/socket.h b/src/core/socket.h
index a273ac274..9d48cde0a 100644
--- a/src/core/socket.h
+++ b/src/core/socket.h
@@ -118,8 +118,6 @@ struct Socket {
 
         mode_t directory_mode;
         mode_t socket_mode;
-        char *socket_user;
-        char *socket_group;
 
         SocketResult result;
 
@@ -132,6 +130,10 @@ struct Socket {
         bool broadcast;
         bool pass_cred;
         bool pass_sec;
+
+        /* Only for INET6 sockets: issue IPV6_V6ONLY sockopt */
+        SocketAddressBindIPv6Only bind_ipv6_only;
+
         int priority;
         int mark;
         size_t receive_buffer;
@@ -144,9 +146,6 @@ struct Socket {
         long mq_maxmsg;
         long mq_msgsize;
 
-        /* Only for INET6 sockets: issue IPV6_V6ONLY sockopt */
-        SocketAddressBindIPv6Only bind_ipv6_only;
-
         char *smack;
         char *smack_ip_in;
         char *smack_ip_out;
@@ -165,13 +164,17 @@ int socket_add_one_mount_link(Socket *s, Mount *m);
 /* Called from the service code when a per-connection service ended */
 void socket_connection_unref(Socket *s);
 
+void socket_free_ports(Socket *s);
+
 extern const UnitVTable socket_vtable;
 
-const char* socket_state_to_string(SocketState i);
-SocketState socket_state_from_string(const char *s);
+const char* socket_state_to_string(SocketState i) _const_;
+SocketState socket_state_from_string(const char *s) _pure_;
+
+const char* socket_exec_command_to_string(SocketExecCommand i) _const_;
+SocketExecCommand socket_exec_command_from_string(const char *s) _pure_;
 
-const char* socket_exec_command_to_string(SocketExecCommand i);
-SocketExecCommand socket_exec_command_from_string(const char *s);
+const char* socket_result_to_string(SocketResult i) _const_;
+SocketResult socket_result_from_string(const char *s) _pure_;
 
-const char* socket_result_to_string(SocketResult i);
-SocketResult socket_result_from_string(const char *s);
+const char* socket_port_type_to_string(SocketPort *p) _pure_;