#include <unistd.h>
#include <errno.h>
-#include <common/defaults.h>
-#include <common/error.h>
+#include <common/common.h>
#include "unix.h"
/*
* Connect to unix socket using the path name.
*/
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
int lttcomm_connect_unix_sock(const char *pathname)
{
struct sockaddr_un sun;
* Do an accept(2) on the sock and return the new file descriptor. The socket
* MUST be bind(2) before.
*/
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
int lttcomm_accept_unix_sock(int sock)
{
int new_fd;
* Creates a AF_UNIX local socket using pathname bind the socket upon creation
* and return the fd.
*/
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
int lttcomm_create_unix_sock(const char *pathname)
{
struct sockaddr_un sun;
return fd;
error:
+ if (fd >= 0) {
+ if (close(fd) < 0) {
+ PERROR("close create unix sock");
+ }
+ }
return ret;
}
/*
* Make the socket listen using LTTNG_SESSIOND_COMM_MAX_LISTEN.
*/
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
int lttcomm_listen_unix_sock(int sock)
{
int ret;
*
* Return the size of received data.
*/
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len)
{
struct msghdr msg;
*
* Return the size of sent data.
*/
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
ssize_t lttcomm_send_unix_sock(int sock, void *buf, size_t len)
{
struct msghdr msg;
/*
* Shutdown cleanly a unix socket.
*/
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
int lttcomm_close_unix_sock(int sock)
{
int ret, closeret;
*
* Returns the size of data sent, or negative error value.
*/
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
ssize_t lttcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd)
{
struct msghdr msg;
char dummy = 0;
memset(&msg, 0, sizeof(msg));
+ memset(tmp, 0, CMSG_SPACE(sizeof_fds) * sizeof(char));
if (nb_fd > LTTCOMM_MAX_SEND_FDS)
return -EINVAL;
* Expect at most "nb_fd" file descriptors. Returns the number of fd
* actually received in nb_fd.
*/
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
ssize_t lttcomm_recv_fds_unix_sock(int sock, int *fds, size_t nb_fd)
{
struct iovec iov[1];
*
* Returns the size of data sent, or negative error value.
*/
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len)
{
struct msghdr msg;
#endif /* __linux__ */
memset(&msg, 0, sizeof(msg));
+ memset(anc_buf, 0, CMSG_SPACE(sizeof_cred) * sizeof(char));
iov[0].iov_base = buf;
iov[0].iov_len = len;
*
* Returns the size of received data, or negative error value.
*/
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
lttng_sock_cred *creds)
{
* Set socket option to use credentials passing.
*/
#ifdef __linux__
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
int lttcomm_setsockopt_creds_unix_sock(int sock)
{
int ret, on = 1;
return ret;
}
#elif (defined(__FreeBSD__) || defined(__CYGWIN__))
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
int lttcomm_setsockopt_creds_unix_sock(int sock)
{
return 0;
/*
* Set socket reciving timeout.
*/
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
int lttcomm_setsockopt_rcv_timeout(int sock, unsigned int sec)
{
int ret;
/*
* Set socket sending timeout.
*/
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
int lttcomm_setsockopt_snd_timeout(int sock, unsigned int sec)
{
int ret;