projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bin: compile lttng-sessiond as C++
[lttng-tools.git]
/
src
/
common
/
sessiond-comm
/
inet6.c
diff --git
a/src/common/sessiond-comm/inet6.c
b/src/common/sessiond-comm/inet6.c
index c9c9a5ae411e561099a682f310d74103368beb00..8c0d0b795c64ebf48f534427387443fbdcf2ba08 100644
(file)
--- a/
src/common/sessiond-comm/inet6.c
+++ b/
src/common/sessiond-comm/inet6.c
@@
-41,7
+41,6
@@
static const struct lttcomm_proto_ops inet6_ops = {
/*
* Creates an PF_INET socket.
*/
/*
* Creates an PF_INET socket.
*/
-LTTNG_HIDDEN
int lttcomm_create_inet6_sock(struct lttcomm_sock *sock, int type, int proto)
{
int val = 1, ret;
int lttcomm_create_inet6_sock(struct lttcomm_sock *sock, int type, int proto)
{
int val = 1, ret;
@@
-84,22
+83,17
@@
error:
/*
* Bind socket and return.
*/
/*
* Bind socket and return.
*/
-LTTNG_HIDDEN
int lttcomm_bind_inet6_sock(struct lttcomm_sock *sock)
{
int lttcomm_bind_inet6_sock(struct lttcomm_sock *sock)
{
- return bind(sock->fd,
- (const struct sockaddr *) ALIGNED_CONST_PTR(
- sock->sockaddr.addr.sin6),
- sizeof(sock->sockaddr.addr.sin6));
+ struct sockaddr_in6 sockaddr = sock->sockaddr.addr.sin6;
+ return bind(sock->fd, &sockaddr, sizeof(sockaddr));
}
static
int connect_no_timeout(struct lttcomm_sock *sock)
{
}
static
int connect_no_timeout(struct lttcomm_sock *sock)
{
- return connect(sock->fd,
- (const struct sockaddr *) ALIGNED_CONST_PTR(
- sock->sockaddr.addr.sin6),
- sizeof(sock->sockaddr.addr.sin6));
+ struct sockaddr_in6 sockaddr = sock->sockaddr.addr.sin6;
+ return connect(sock->fd, &sockaddr, sizeof(sockaddr));
}
static
}
static
@@
-109,6
+103,7
@@
int connect_with_timeout(struct lttcomm_sock *sock)
int ret, flags, connect_ret;
struct timespec orig_time, cur_time;
unsigned long diff_ms;
int ret, flags, connect_ret;
struct timespec orig_time, cur_time;
unsigned long diff_ms;
+ struct sockaddr_in6 sockaddr;
ret = fcntl(sock->fd, F_GETFL, 0);
if (ret == -1) {
ret = fcntl(sock->fd, F_GETFL, 0);
if (ret == -1) {
@@
-130,10
+125,8
@@
int connect_with_timeout(struct lttcomm_sock *sock)
return -1;
}
return -1;
}
- connect_ret = connect(sock->fd,
- (const struct sockaddr *) ALIGNED_CONST_PTR(
- sock->sockaddr.addr.sin6),
- sizeof(sock->sockaddr.addr.sin6));
+ sockaddr = sock->sockaddr.addr.sin6;
+ connect_ret = connect(sock->fd, &sockaddr, sizeof(sockaddr));
if (connect_ret == -1 && errno != EAGAIN && errno != EWOULDBLOCK &&
errno != EINPROGRESS) {
goto error;
if (connect_ret == -1 && errno != EAGAIN && errno != EWOULDBLOCK &&
errno != EINPROGRESS) {
goto error;
@@
-215,7
+208,6
@@
error:
/*
* Connect PF_INET socket.
*/
/*
* Connect PF_INET socket.
*/
-LTTNG_HIDDEN
int lttcomm_connect_inet6_sock(struct lttcomm_sock *sock)
{
int ret, closeret;
int lttcomm_connect_inet6_sock(struct lttcomm_sock *sock)
{
int ret, closeret;
@@
-245,7
+237,6
@@
error_connect:
* Do an accept(2) on the sock and return the new lttcomm socket. The socket
* MUST be bind(2) before.
*/
* Do an accept(2) on the sock and return the new lttcomm socket. The socket
* MUST be bind(2) before.
*/
-LTTNG_HIDDEN
struct lttcomm_sock *lttcomm_accept_inet6_sock(struct lttcomm_sock *sock)
{
int new_fd;
struct lttcomm_sock *lttcomm_accept_inet6_sock(struct lttcomm_sock *sock)
{
int new_fd;
@@
-289,7
+280,6
@@
error:
/*
* Make the socket listen using LTTNG_SESSIOND_COMM_MAX_LISTEN.
*/
/*
* Make the socket listen using LTTNG_SESSIOND_COMM_MAX_LISTEN.
*/
-LTTNG_HIDDEN
int lttcomm_listen_inet6_sock(struct lttcomm_sock *sock, int backlog)
{
int ret;
int lttcomm_listen_inet6_sock(struct lttcomm_sock *sock, int backlog)
{
int ret;
@@
-320,7
+310,6
@@
end:
*
* Return the size of received data.
*/
*
* Return the size of received data.
*/
-LTTNG_HIDDEN
ssize_t lttcomm_recvmsg_inet6_sock(struct lttcomm_sock *sock, void *buf,
size_t len, int flags)
{
ssize_t lttcomm_recvmsg_inet6_sock(struct lttcomm_sock *sock, void *buf,
size_t len, int flags)
{
@@
-367,7
+356,6
@@
end:
*
* Return the size of sent data.
*/
*
* Return the size of sent data.
*/
-LTTNG_HIDDEN
ssize_t lttcomm_sendmsg_inet6_sock(struct lttcomm_sock *sock, const void *buf,
size_t len, int flags)
{
ssize_t lttcomm_sendmsg_inet6_sock(struct lttcomm_sock *sock, const void *buf,
size_t len, int flags)
{
@@
-414,7
+402,6
@@
ssize_t lttcomm_sendmsg_inet6_sock(struct lttcomm_sock *sock, const void *buf,
/*
* Shutdown cleanly and close.
*/
/*
* Shutdown cleanly and close.
*/
-LTTNG_HIDDEN
int lttcomm_close_inet6_sock(struct lttcomm_sock *sock)
{
int ret;
int lttcomm_close_inet6_sock(struct lttcomm_sock *sock)
{
int ret;
This page took
0.025926 seconds
and
4
git commands to generate.