ust: continue work on ustd

[ust.git] / libustcomm / ustcomm.h

diff --git a/libustcomm/ustcomm.h b/libustcomm/ustcomm.h
index 7d845920fe0d0b57dd438b24f1ef0d0a8827af2b..e661a5518bd577631255588a1d461eadf3d9e46e 100644 (file)
--- a/libustcomm/ustcomm.h
+++ b/libustcomm/ustcomm.h
@@ -11,7 +11,7 @@ struct ustcomm_connection {
        int fd;
 };
 
-struct ustcomm_app {
+struct ustcomm_server {
        /* the "server" socket for serving the external requests */
        int listen_fd;
        char *socketpath;
@@ -20,21 +20,24 @@ struct ustcomm_app {
 };
 
 struct ustcomm_ustd {
-       /* the "server" socket for serving the external requests */
-       int listen_fd;
-       char *socketpath;
+       struct ustcomm_server server;
+};
 
-       struct list_head connections;
+struct ustcomm_app {
+       struct ustcomm_server server;
 };
 
 struct ustcomm_source {
-       struct sockaddr_un addr;
+       int fd;
+       void *priv;
 };
 
+char *strdup_malloc(const char *s);
+
 int send_message(pid_t pid, const char *msg, char **reply);
 
-int ustcomm_ustd_recv_message(struct ustcomm_ustd *ustd, char **msg, struct ustcomm_source *src);
-int ustcomm_app_recv_message(struct ustcomm_app *app, char **msg, struct ustcomm_source *src);
+int ustcomm_ustd_recv_message(struct ustcomm_ustd *ustd, char **msg, struct ustcomm_source *src, int timeout);
+int ustcomm_app_recv_message(struct ustcomm_app *app, char **msg, struct ustcomm_source *src, int timeout);
 
 int ustcomm_init_app(pid_t pid, struct ustcomm_app *handle);