X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=name.h;h=869e71bb09ac434df498e97e99b72671e985875a;hp=116523453763e2a5bdf1c7aa35fc176851c598a5;hb=e094e853a047e10f0d2989eed76b6aa430e3ea1a;hpb=a66d02c3290008d50b2b52f84cfbf46a546ba831

diff --git a/name.h b/name.h
index 116523453..869e71bb0 100644
--- a/name.h
+++ b/name.h
@@ -22,6 +22,7 @@ typedef struct Snapshot Snapshot;
 #include "set.h"
 #include "util.h"
 #include "list.h"
+#include "socket-util.h"
 
 typedef enum NameType {
         NAME_SERVICE = 0,
@@ -123,8 +124,7 @@ typedef enum TimerState {
         TIMER_RUNNING,
         TIMER_STOP_PRE,
         TIMER_STOP,
-        TIMER_STOP_POST,
-        TIMER_MAINTAINANCE
+        TIMER_STOP_POST
 } TimerState;
 
 struct Timer {
@@ -148,13 +148,16 @@ typedef enum SocketState {
         SOCKET_STOP_PRE,
         SOCKET_STOP,
         SOCKET_STOP_POST,
-        SOCKET_MAINTAINANCE
+        SOCKET_MAINTAINANCE,
+        _SOCKET_STATE_MAX
 } SocketState;
 
 struct Socket {
         Meta meta;
 
         SocketState state;
+
+        Address address;
         int *fds;
         unsigned n_fds;
 
@@ -189,7 +192,12 @@ struct Device {
 typedef enum MountState {
         MOUNT_DEAD,
         MOUNT_BEFORE,
-        MOUNT_MOUNTED
+        MOUNT_MOUNTING,
+        MOUNT_MOUNTED,
+        MOUNT_UNMOUNTING,
+        MOUNT_SIGTERM,  /* if the mount command hangs */
+        MOUNT_SIGKILL,
+        MOUNT_MAINTAINANCE
 } MountState;
 
 struct Mount {
@@ -268,17 +276,21 @@ DEFINE_CAST(SNAPSHOT, Snapshot, snapshot);
 /* For casting the various name types into a name */
 #define NAME(o) ((Name*) (o))
 
-bool name_is_ready(Name *name);
+bool name_is_running(Name *name);
+bool name_is_dead(Name *name);
+
 NameType name_type_from_string(const char *n);
 bool name_is_valid(const char *n);
 
 Name *name_new(Manager *m);
 void name_free(Name *name);
 int name_link(Name *name);
+int name_link_names(Name *name, bool replace);
 int name_merge(Name *name, Name *other);
-int name_augment(Name *n);
+int name_sanitize(Name *n);
+int name_load(Name *name);
 const char* name_id(Name *n);
 
-void name_dump(Name *n, FILE *f);
+void name_dump(Name *n, FILE *f, const char *prefix);
 
 #endif