#endif
#include <stdlib.h>
-#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
+
#ifdef HAVE_SYS_UN_H
#include <sys/un.h>
#endif
-#include "winsock.h"
-
#include <pulse/xmalloc.h>
#include <pulsecore/core-error.h>
#include <pulsecore/core-util.h>
+#include <pulsecore/socket.h>
#include <pulsecore/socket-util.h>
#include <pulsecore/log.h>
#include <pulsecore/macro.h>
pa_iochannel_cb_t callback;
void*userdata;
- pa_bool_t readable;
- pa_bool_t writable;
- pa_bool_t hungup;
-
- pa_bool_t no_close;
+ bool readable:1;
+ bool writable:1;
+ bool hungup:1;
+ bool no_close:1;
pa_io_event* input_event, *output_event;
};
io->mainloop->io_enable(io->output_event, PA_IO_EVENT_OUTPUT);
else
io->output_event = io->mainloop->io_new(io->mainloop, io->ofd, PA_IO_EVENT_OUTPUT, callback, io);
- } else if (io->input_event) {
+ } else if (io->output_event) {
io->mainloop->io_free(io->output_event);
io->output_event = NULL;
}
static void callback(pa_mainloop_api* m, pa_io_event *e, int fd, pa_io_event_flags_t f, void *userdata) {
pa_iochannel *io = userdata;
- pa_bool_t changed = FALSE;
+ bool changed = false;
pa_assert(m);
pa_assert(e);
pa_assert(userdata);
if ((f & (PA_IO_EVENT_HANGUP|PA_IO_EVENT_ERROR)) && !io->hungup) {
- io->hungup = TRUE;
- changed = TRUE;
+ io->hungup = true;
+ changed = true;
}
if ((f & PA_IO_EVENT_INPUT) && !io->readable) {
- io->readable = TRUE;
- changed = TRUE;
+ io->readable = true;
+ changed = true;
pa_assert(e == io->input_event);
}
if ((f & PA_IO_EVENT_OUTPUT) && !io->writable) {
- io->writable = TRUE;
- changed = TRUE;
+ io->writable = true;
+ changed = true;
pa_assert(e == io->output_event);
}
pa_xfree(io);
}
-pa_bool_t pa_iochannel_is_readable(pa_iochannel*io) {
+bool pa_iochannel_is_readable(pa_iochannel*io) {
pa_assert(io);
return io->readable || io->hungup;
}
-pa_bool_t pa_iochannel_is_writable(pa_iochannel*io) {
+bool pa_iochannel_is_writable(pa_iochannel*io) {
pa_assert(io);
return io->writable && !io->hungup;
}
-pa_bool_t pa_iochannel_is_hungup(pa_iochannel*io) {
+bool pa_iochannel_is_hungup(pa_iochannel*io) {
pa_assert(io);
return io->hungup;
pa_assert(l);
pa_assert(io->ofd >= 0);
- if ((r = pa_write(io->ofd, data, l, &io->ofd_type)) >= 0) {
- io->writable = io->hungup = FALSE;
- enable_events(io);
+ r = pa_write(io->ofd, data, l, &io->ofd_type);
+
+ if ((size_t) r == l)
+ return r; /* Fast path - we almost always successfully write everything */
+
+ if (r < 0) {
+ if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)
+ r = 0;
+ else
+ return r;
}
+ /* Partial write - let's get a notification when we can write more */
+ io->writable = io->hungup = false;
+ enable_events(io);
+
return r;
}
/* We also reset the hangup flag here to ensure that another
* IO callback is triggered so that we will again call into
* user code */
- io->readable = io->hungup = FALSE;
+ io->readable = io->hungup = false;
enable_events(io);
}
#ifdef HAVE_CREDS
-pa_bool_t pa_iochannel_creds_supported(pa_iochannel *io) {
- struct sockaddr_un sa;
+bool pa_iochannel_creds_supported(pa_iochannel *io) {
+ struct {
+ struct sockaddr sa;
+#ifdef HAVE_SYS_UN_H
+ struct sockaddr_un un;
+#endif
+ struct sockaddr_storage storage;
+ } sa;
+
socklen_t l;
pa_assert(io);
pa_assert(io->ofd == io->ifd);
l = sizeof(sa);
+ if (getsockname(io->ifd, &sa.sa, &l) < 0)
+ return false;
- if (getsockname(io->ifd, (struct sockaddr*) &sa, &l) < 0)
- return 0;
-
- return sa.sun_family == AF_UNIX;
+ return sa.sa.sa_family == AF_UNIX;
}
int pa_iochannel_creds_enable(pa_iochannel *io) {
pa_assert(l);
pa_assert(io->ofd >= 0);
- memset(&iov, 0, sizeof(iov));
+ pa_zero(iov);
iov.iov_base = (void*) data;
iov.iov_len = l;
- memset(&cmsg, 0, sizeof(cmsg));
+ pa_zero(cmsg);
cmsg.hdr.cmsg_len = CMSG_LEN(sizeof(struct ucred));
cmsg.hdr.cmsg_level = SOL_SOCKET;
cmsg.hdr.cmsg_type = SCM_CREDENTIALS;
mh.msg_controllen = sizeof(cmsg);
if ((r = sendmsg(io->ofd, &mh, MSG_NOSIGNAL)) >= 0) {
- io->writable = io->hungup = FALSE;
+ io->writable = io->hungup = false;
enable_events(io);
}
return r;
}
-ssize_t pa_iochannel_read_with_creds(pa_iochannel*io, void*data, size_t l, pa_creds *creds, pa_bool_t *creds_valid) {
+ssize_t pa_iochannel_read_with_creds(pa_iochannel*io, void*data, size_t l, pa_creds *creds, bool *creds_valid) {
ssize_t r;
struct msghdr mh;
struct iovec iov;
pa_assert(creds);
pa_assert(creds_valid);
- memset(&iov, 0, sizeof(iov));
+ pa_zero(iov);
iov.iov_base = data;
iov.iov_len = l;
- memset(&cmsg, 0, sizeof(cmsg));
-
- memset(&mh, 0, sizeof(mh));
- mh.msg_name = NULL;
- mh.msg_namelen = 0;
+ pa_zero(cmsg);
+ pa_zero(mh);
mh.msg_iov = &iov;
mh.msg_iovlen = 1;
mh.msg_control = &cmsg;
mh.msg_controllen = sizeof(cmsg);
- mh.msg_flags = 0;
if ((r = recvmsg(io->ifd, &mh, 0)) >= 0) {
struct cmsghdr *cmh;
- *creds_valid = 0;
+ *creds_valid = false;
for (cmh = CMSG_FIRSTHDR(&mh); cmh; cmh = CMSG_NXTHDR(&mh, cmh)) {
creds->gid = u.gid;
creds->uid = u.uid;
- *creds_valid = TRUE;
+ *creds_valid = true;
break;
}
}
- io->readable = io->hungup = FALSE;
+ io->readable = io->hungup = false;
enable_events(io);
}
io->userdata = userdata;
}
-void pa_iochannel_set_noclose(pa_iochannel*io, pa_bool_t b) {
+void pa_iochannel_set_noclose(pa_iochannel*io, bool b) {
pa_assert(io);
io->no_close = !!b;
return io->ofd;
}
-pa_bool_t pa_iochannel_socket_is_local(pa_iochannel *io) {
+bool pa_iochannel_socket_is_local(pa_iochannel *io) {
pa_assert(io);
if (pa_socket_is_local(io->ifd))
- return TRUE;
+ return true;
if (io->ifd != io->ofd)
if (pa_socket_is_local(io->ofd))
- return TRUE;
+ return true;
- return FALSE;
+ return false;
}