X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=liblttsessiondcomm%2Fliblttsessiondcomm.c;h=bc74cc9e837ac867fab89c38836929f6096f236d;hp=9c72a918ccc23d94584df20a3d0bb139b5ce7c6a;hb=df0da1392bb6c77fff7fc65be518dce7de457ed7;hpb=826d496db7f18f2ae1f7e0d2f4fc381144ed04a4 diff --git a/liblttsessiondcomm/liblttsessiondcomm.c b/liblttsessiondcomm/liblttsessiondcomm.c index 9c72a918c..bc74cc9e8 100644 --- a/liblttsessiondcomm/liblttsessiondcomm.c +++ b/liblttsessiondcomm/liblttsessiondcomm.c @@ -38,6 +38,10 @@ static const char *lttcomm_readable_code[] = { [ LTTCOMM_ERR_INDEX(LTTCOMM_UND) ] = "Undefined command", [ LTTCOMM_ERR_INDEX(LTTCOMM_NO_SESSION) ] = "No session found", [ LTTCOMM_ERR_INDEX(LTTCOMM_LIST_FAIL) ] = "Unable to list traceable apps", + [ LTTCOMM_ERR_INDEX(LTTCOMM_NO_APPS) ] = "No traceable apps found", + [ LTTCOMM_ERR_INDEX(LTTCOMM_NO_SESS) ] = "No session found", + [ LTTCOMM_ERR_INDEX(LTTCOMM_FATAL) ] = "Fatal error of the session daemon", + [ LTTCOMM_ERR_INDEX(LTTCOMM_CREATE_FAIL) ] = "Create trace failed", }; /* @@ -67,27 +71,27 @@ const char *lttcomm_get_readable_code(enum lttcomm_return_code code) */ int lttcomm_connect_unix_sock(const char *pathname) { - struct sockaddr_un sun; - int fd; + struct sockaddr_un sun; + int fd; int ret = 1; - fd = socket(PF_UNIX, SOCK_STREAM, 0); + fd = socket(PF_UNIX, SOCK_STREAM, 0); if (fd < 0) { perror("socket"); goto error; } - memset(&sun, 0, sizeof(sun)); - sun.sun_family = AF_UNIX; - strncpy(sun.sun_path, pathname, sizeof(sun.sun_path)); + memset(&sun, 0, sizeof(sun)); + sun.sun_family = AF_UNIX; + strncpy(sun.sun_path, pathname, sizeof(sun.sun_path)); - ret = connect(fd, (struct sockaddr *) &sun, sizeof(sun)); - if (ret < 0) { - perror("connect"); + ret = connect(fd, (struct sockaddr *) &sun, sizeof(sun)); + if (ret < 0) { + perror("connect"); goto error; - } + } - return fd; + return fd; error: return -1; @@ -223,3 +227,21 @@ ssize_t lttcomm_send_unix_sock(int sock, void *buf, size_t len) return ret; } + +/* + * lttcomm_close_unix_sock + * + * Shutdown cleanly a unix socket. + */ +int lttcomm_close_unix_sock(int sock) +{ + int ret; + + /* Shutdown receptions and transmissions */ + ret = shutdown(sock, SHUT_RDWR); + if (ret < 0) { + perror("shutdown"); + } + + return ret; +}