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
/
inet.c
diff --git
a/src/common/sessiond-comm/inet.c
b/src/common/sessiond-comm/inet.c
index 357e10b08a938cfd9c0252872ec0d95ae6d4a528..93fb19bb51acb611cf9a4fd4d9af2b6532acd5cc 100644
(file)
--- a/
src/common/sessiond-comm/inet.c
+++ b/
src/common/sessiond-comm/inet.c
@@
-87,19
+87,17
@@
error:
*/
int lttcomm_bind_inet_sock(struct lttcomm_sock *sock)
{
*/
int lttcomm_bind_inet_sock(struct lttcomm_sock *sock)
{
- return bind(sock->fd,
- (const struct sockaddr *) ALIGNED_CONST_PTR(
- sock->sockaddr.addr.sin),
- sizeof(sock->sockaddr.addr.sin));
+ struct sockaddr_in sockaddr = sock->sockaddr.addr.sin;
+
+ 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.sin),
- sizeof(sock->sockaddr.addr.sin));
+ struct sockaddr_in sockaddr = sock->sockaddr.addr.sin;
+
+ return connect(sock->fd, &sockaddr, sizeof(sockaddr));
}
static
}
static
@@
-109,6
+107,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_in sockaddr;
ret = fcntl(sock->fd, F_GETFL, 0);
if (ret == -1) {
ret = fcntl(sock->fd, F_GETFL, 0);
if (ret == -1) {
@@
-130,10
+129,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.sin),
- sizeof(sock->sockaddr.addr.sin));
+ sockaddr = sock->sockaddr.addr.sin;
+ 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;
This page took
0.02758 seconds
and
4
git commands to generate.