X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libustcomm%2Fustcomm.h;h=052c896aca17ad6561e4d84910e617d04ca8ae07;hb=6cb88bc04f67ebc3264d3832f4ce5cca2c642ab4;hp=7d845920fe0d0b57dd438b24f1ef0d0a8827af2b;hpb=aca1ad90ac68780598f7bcce7b475670f2a48cb0;p=lttng-ust.git

diff --git a/libustcomm/ustcomm.h b/libustcomm/ustcomm.h
index 7d845920..052c896a 100644
--- a/libustcomm/ustcomm.h
+++ b/libustcomm/ustcomm.h
@@ -11,7 +11,8 @@ struct ustcomm_connection {
 	int fd;
 };
 
-struct ustcomm_app {
+/* ustcomm_server must be shallow-copyable */
+struct ustcomm_server {
 	/* the "server" socket for serving the external requests */
 	int listen_fd;
 	char *socketpath;
@@ -20,26 +21,33 @@ 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;
 };
 
+/* ustcomm_source must be shallow-copyable */
 struct ustcomm_source {
-	struct sockaddr_un addr;
+	int fd;
+	void *priv;
 };
 
-int send_message(pid_t pid, const char *msg, char **reply);
+char *strdup_malloc(const char *s);
 
-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 send_message_pid(pid_t pid, const char *msg, char **reply);
+
+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);
 
 int ustcomm_init_ustd(struct ustcomm_ustd *handle);
 
+int ustcomm_connect_app(pid_t pid, struct ustcomm_connection *conn);
+int ustcomm_send_request(struct ustcomm_connection *conn, char *req, char **reply);
+
 int nth_token_is(char *str, char *token, int tok_no);
 
 char *nth_token(char *str, int tok_no);