X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=libustcomm%2Fustcomm.c;h=fe299770a560287c1c0a3becaa01da5172179afb;hb=e7cc3e3415e0092809627e89168e1cba8b5800f6;hp=8324f21decad53d79a8659657bb2d000e90c914b;hpb=ce2ccc12dddef07259e349d0b10504585ce6ee20;p=ust.git

diff --git a/libustcomm/ustcomm.c b/libustcomm/ustcomm.c
index 8324f21..fe29977 100644
--- a/libustcomm/ustcomm.c
+++ b/libustcomm/ustcomm.c
@@ -15,6 +15,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+/* API used by UST components to communicate with each other via sockets. */
+
 #define _GNU_SOURCE
 #include <sys/types.h>
 #include <signal.h>
@@ -44,6 +46,7 @@ static int mkdir_p(const char *path, mode_t mode)
 
 	int retval = 0;
 	int result;
+	mode_t old_umask;
 
 	tmp = malloc(strlen(path) + 1);
 	if (tmp == NULL)
@@ -52,6 +55,7 @@ static int mkdir_p(const char *path, mode_t mode)
 	/* skip first / */
 	path_p = path+1;
 
+	old_umask = umask(0);
 	for(;;) {
 		while (*path_p != '/') {
 			if(*path_p == 0)
@@ -83,6 +87,7 @@ static int mkdir_p(const char *path, mode_t mode)
 	}
 
 	free(tmp);
+	umask(old_umask);
 	return retval;
 }
 
@@ -247,9 +252,13 @@ static int recv_message_fd(int fd, char **recv_buf, int *recv_buf_size, int *rec
 				*recv_buf_size = 0;
 				return 0;
 			}
-			/* real error */
-			PERROR("recv");
-			return -1;
+			else if(errno == EINTR) {
+				return -1;
+			}
+			else {
+				PERROR("recv");
+				return -1;
+			}
 		}
 		if(result == 0) {
 			return 0;
@@ -348,15 +357,18 @@ int ustcomm_recv_message(struct ustcomm_server *server, char **msg, struct ustco
 			idx++;
 		}
 
-		while((result = poll(fds, n_fds, timeout)) == -1 && errno == EINTR)
-			/* nothing */;
-		if(result == -1) {
+		result = poll(fds, n_fds, timeout);
+		if(result == -1 && errno == EINTR) {
+			/* That's ok. ustd receives signals to notify it must shutdown. */
+			retval = -1;
+			goto free_conn_table_return;
+		}
+		else if(result == -1) {
 			PERROR("poll");
 			retval = -1;
 			goto free_conn_table_return;
 		}
-
-		if(result == 0) {
+		else if(result == 0) {
 			retval = 0;
 			goto free_conn_table_return;
 		}
@@ -636,7 +648,8 @@ static int ensure_dir_exists(const char *dir)
 		/* ENOENT */
 		int result;
 
-		result = mkdir_p(dir, 0777);
+		/* mkdir mode to 0777 */
+		result = mkdir_p(dir, S_IRWXU | S_IRWXG | S_IRWXO);
 		if(result != 0) {
 			ERR("executing in recursive creation of directory %s", dir);
 			return -1;
@@ -927,7 +940,7 @@ int free_ustcomm_client_poll(void *data)
 	return 0;
 }
 
-void ustcomm_mp_add_app_clients(struct mpentries *ent, struct ustcomm_app *app, int (*cb)(struct ustcomm_connection *conn, char *msg))
+void ustcomm_mp_add_app_clients(struct mpentries *ent, struct ustcomm_app *app, int (*cb)(char *recvbuf, struct ustcomm_source *src))
 {
 	struct ustcomm_connection *conn;