mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

socket-client: modernizations

Browse source
This commit is contained in:
Lennart Poettering 2009-09-18 21:24:58 +02:00
parent c010172c66
commit cd5d6e7b42
2 changed files with 24 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

60
src/pulsecore/socket-client.c
View file

@ -73,14 +73,18 @@
struct pa_socket_client { struct pa_socket_client {
PA_REFCNT_DECLARE; PA_REFCNT_DECLARE;
pa_mainloop_api *mainloop;
int fd; int fd;
pa_mainloop_api *mainloop;
pa_io_event *io_event; pa_io_event *io_event;
pa_time_event *timeout_event; pa_time_event *timeout_event;
pa_defer_event *defer_event; pa_defer_event *defer_event;
pa_socket_client_cb_t callback; pa_socket_client_cb_t callback;
void *userdata; void *userdata;
pa_bool_t local; pa_bool_t local;
#ifdef HAVE_LIBASYNCNS #ifdef HAVE_LIBASYNCNS
asyncns_t *asyncns; asyncns_t *asyncns;
asyncns_query_t * asyncns_query; asyncns_query_t * asyncns_query;
@ -92,22 +96,10 @@ static pa_socket_client* socket_client_new(pa_mainloop_api *m) {
pa_socket_client *c; pa_socket_client *c;
pa_assert(m); pa_assert(m);
c = pa_xnew(pa_socket_client, 1); c = pa_xnew0(pa_socket_client, 1);
PA_REFCNT_INIT(c); PA_REFCNT_INIT(c);
c->mainloop = m; c->mainloop = m;
c->fd = -1; c->fd = -1;
c->io_event = NULL;
c->timeout_event = NULL;
c->defer_event = NULL;
c->callback = NULL;
c->userdata = NULL;
c->local = FALSE;
#ifdef HAVE_LIBASYNCNS
c->asyncns = NULL;
c->asyncns_io_event = NULL;
c->asyncns_query = NULL;
#endif
return c; return c;
} }
@ -163,7 +155,6 @@ static void do_call(pa_socket_client *c) {
} }
io = pa_iochannel_new(c->mainloop, c->fd, c->fd); io = pa_iochannel_new(c->mainloop, c->fd, c->fd);
pa_assert(io);
finish: finish:
if (!io && c->fd >= 0) if (!io && c->fd >= 0)
@ -172,7 +163,6 @@ finish:
free_events(c); free_events(c);
pa_assert(c->callback);
c->callback(c, io, c->userdata); c->callback(c, io, c->userdata);
pa_socket_client_unref(c); pa_socket_client_unref(c);
@ -220,9 +210,9 @@ static int do_connect(pa_socket_client *c, const struct sockaddr *sa, socklen_t
return -1; return -1;
} }
pa_assert_se(c->io_event = c->mainloop->io_new(c->mainloop, c->fd, PA_IO_EVENT_OUTPUT, connect_io_cb, c)); c->io_event = c->mainloop->io_new(c->mainloop, c->fd, PA_IO_EVENT_OUTPUT, connect_io_cb, c);
} else } else
pa_assert_se(c->defer_event = c->mainloop->defer_new(c->mainloop, connect_defer_cb, c)); c->defer_event = c->mainloop->defer_new(c->mainloop, connect_defer_cb, c);
return 0; return 0;
} }
@ -233,7 +223,7 @@ pa_socket_client* pa_socket_client_new_ipv4(pa_mainloop_api *m, uint32_t address
pa_assert(m); pa_assert(m);
pa_assert(port > 0); pa_assert(port > 0);
memset(&sa, 0, sizeof(sa)); pa_zero(sa);
sa.sin_family = AF_INET; sa.sin_family = AF_INET;
sa.sin_port = htons(port); sa.sin_port = htons(port);
sa.sin_addr.s_addr = htonl(address); sa.sin_addr.s_addr = htonl(address);
@ -241,28 +231,24 @@ pa_socket_client* pa_socket_client_new_ipv4(pa_mainloop_api *m, uint32_t address
return pa_socket_client_new_sockaddr(m, (struct sockaddr*) &sa, sizeof(sa)); return pa_socket_client_new_sockaddr(m, (struct sockaddr*) &sa, sizeof(sa));
} }
#ifdef HAVE_SYS_UN_H
pa_socket_client* pa_socket_client_new_unix(pa_mainloop_api *m, const char *filename) { pa_socket_client* pa_socket_client_new_unix(pa_mainloop_api *m, const char *filename) {
#ifdef HAVE_SYS_UN_H
struct sockaddr_un sa; struct sockaddr_un sa;
pa_assert(m); pa_assert(m);
pa_assert(filename); pa_assert(filename);
memset(&sa, 0, sizeof(sa)); pa_zero(sa);
sa.sun_family = AF_UNIX; sa.sun_family = AF_UNIX;
pa_strlcpy(sa.sun_path, filename, sizeof(sa.sun_path)); pa_strlcpy(sa.sun_path, filename, sizeof(sa.sun_path));
return pa_socket_client_new_sockaddr(m, (struct sockaddr*) &sa, sizeof(sa)); return pa_socket_client_new_sockaddr(m, (struct sockaddr*) &sa, sizeof(sa));
}
#else /* HAVE_SYS_UN_H */ #else /* HAVE_SYS_UN_H */
pa_socket_client* pa_socket_client_new_unix(pa_mainloop_api *m, const char *filename) {
return NULL; return NULL;
}
#endif /* HAVE_SYS_UN_H */ #endif /* HAVE_SYS_UN_H */
}
static int sockaddr_prepare(pa_socket_client *c, const struct sockaddr *sa, size_t salen) { static int sockaddr_prepare(pa_socket_client *c, const struct sockaddr *sa, size_t salen) {
pa_assert(c); pa_assert(c);
@ -300,7 +286,7 @@ pa_socket_client* pa_socket_client_new_sockaddr(pa_mainloop_api *m, const struct
pa_assert(sa); pa_assert(sa);
pa_assert(salen > 0); pa_assert(salen > 0);
pa_assert_se(c = socket_client_new(m)); c = socket_client_new(m);
if (sockaddr_prepare(c, sa, salen) < 0) if (sockaddr_prepare(c, sa, salen) < 0)
goto fail; goto fail;
@ -357,22 +343,25 @@ void pa_socket_client_set_callback(pa_socket_client *c, pa_socket_client_cb_t on
c->userdata = userdata; c->userdata = userdata;
} }
#ifdef HAVE_IPV6
pa_socket_client* pa_socket_client_new_ipv6(pa_mainloop_api *m, uint8_t address[16], uint16_t port) { pa_socket_client* pa_socket_client_new_ipv6(pa_mainloop_api *m, uint8_t address[16], uint16_t port) {
#ifdef HAVE_IPV6
struct sockaddr_in6 sa; struct sockaddr_in6 sa;
pa_assert(m); pa_assert(m);
pa_assert(address); pa_assert(address);
pa_assert(port > 0); pa_assert(port > 0);
memset(&sa, 0, sizeof(sa)); pa_zero(sa);
sa.sin6_family = AF_INET6; sa.sin6_family = AF_INET6;
sa.sin6_port = htons(port); sa.sin6_port = htons(port);
memcpy(&sa.sin6_addr, address, sizeof(sa.sin6_addr)); memcpy(&sa.sin6_addr, address, sizeof(sa.sin6_addr));
return pa_socket_client_new_sockaddr(m, (struct sockaddr*) &sa, sizeof(sa)); return pa_socket_client_new_sockaddr(m, (struct sockaddr*) &sa, sizeof(sa));
}
#else
return NULL;
#endif #endif
}
#ifdef HAVE_LIBASYNCNS #ifdef HAVE_LIBASYNCNS
@ -466,14 +455,13 @@ pa_socket_client* pa_socket_client_new_string(pa_mainloop_api *m, pa_bool_t use_
case PA_PARSED_ADDRESS_TCP4: /* Fallthrough */ case PA_PARSED_ADDRESS_TCP4: /* Fallthrough */
case PA_PARSED_ADDRESS_TCP6: /* Fallthrough */ case PA_PARSED_ADDRESS_TCP6: /* Fallthrough */
case PA_PARSED_ADDRESS_TCP_AUTO:{ case PA_PARSED_ADDRESS_TCP_AUTO: {
struct addrinfo hints; struct addrinfo hints;
char port[12]; char port[12];
pa_snprintf(port, sizeof(port), "%u", (unsigned) a.port); pa_snprintf(port, sizeof(port), "%u", (unsigned) a.port);
memset(&hints, 0, sizeof(hints)); pa_zero(hints);
if (a.type == PA_PARSED_ADDRESS_TCP4) if (a.type == PA_PARSED_ADDRESS_TCP4)
hints.ai_family = PF_INET; hints.ai_family = PF_INET;
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
@ -492,11 +480,10 @@ pa_socket_client* pa_socket_client_new_string(pa_mainloop_api *m, pa_bool_t use_
if (!(asyncns = asyncns_new(1))) if (!(asyncns = asyncns_new(1)))
goto finish; goto finish;
pa_assert_se(c = socket_client_new(m)); c = socket_client_new(m);
c->asyncns = asyncns; c->asyncns = asyncns;
c->asyncns_io_event = m->io_new(m, asyncns_fd(c->asyncns), PA_IO_EVENT_INPUT, asyncns_cb, c); c->asyncns_io_event = m->io_new(m, asyncns_fd(c->asyncns), PA_IO_EVENT_INPUT, asyncns_cb, c);
c->asyncns_query = asyncns_getaddrinfo(c->asyncns, a.path_or_host, port, &hints); pa_assert_se(c->asyncns_query = asyncns_getaddrinfo(c->asyncns, a.path_or_host, port, &hints));
pa_assert(c->asyncns_query);
start_timeout(c, use_rtclock); start_timeout(c, use_rtclock);
} }
#elif defined(HAVE_GETADDRINFO) #elif defined(HAVE_GETADDRINFO)
@ -539,6 +526,7 @@ pa_socket_client* pa_socket_client_new_string(pa_mainloop_api *m, pa_bool_t use_
if (!host) if (!host)
goto finish; goto finish;
pa_zero(sa);
s.sin_family = AF_INET; s.sin_family = AF_INET;
memcpy(&s.sin_addr, host->h_addr, sizeof(struct in_addr)); memcpy(&s.sin_addr, host->h_addr, sizeof(struct in_addr));
s.sin_port = htons(a.port); s.sin_port = htons(a.port);

2
src/pulsecore/socket-client.h
View file

@ -35,9 +35,7 @@ typedef struct pa_socket_client pa_socket_client;
typedef void (*pa_socket_client_cb_t)(pa_socket_client *c, pa_iochannel*io, void *userdata); typedef void (*pa_socket_client_cb_t)(pa_socket_client *c, pa_iochannel*io, void *userdata);
pa_socket_client* pa_socket_client_new_ipv4(pa_mainloop_api *m, uint32_t address, uint16_t port); pa_socket_client* pa_socket_client_new_ipv4(pa_mainloop_api *m, uint32_t address, uint16_t port);
#ifdef HAVE_IPV6
pa_socket_client* pa_socket_client_new_ipv6(pa_mainloop_api *m, uint8_t address[16], uint16_t port); pa_socket_client* pa_socket_client_new_ipv6(pa_mainloop_api *m, uint8_t address[16], uint16_t port);
#endif
pa_socket_client* pa_socket_client_new_unix(pa_mainloop_api *m, const char *filename); pa_socket_client* pa_socket_client_new_unix(pa_mainloop_api *m, const char *filename);
pa_socket_client* pa_socket_client_new_sockaddr(pa_mainloop_api *m, const struct sockaddr *sa, size_t salen); pa_socket_client* pa_socket_client_new_sockaddr(pa_mainloop_api *m, const struct sockaddr *sa, size_t salen);
pa_socket_client* pa_socket_client_new_string(pa_mainloop_api *m, pa_bool_t use_rtclock, const char *a, uint16_t default_port); pa_socket_client* pa_socket_client_new_string(pa_mainloop_api *m, pa_bool_t use_rtclock, const char *a, uint16_t default_port);