projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Silence warning by casting *sin_addr to *sockaddr
[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 cf06ecb858d2079455c7a009f888435b6532d6c4..35ce3b6b5c9ca2a720a509d3d95aa172931a221a 100644
(file)
--- a/
src/common/sessiond-comm/inet.c
+++ b/
src/common/sessiond-comm/inet.c
@@
-15,7
+15,7
@@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _
GNU
_SOURCE
+#define _
LGPL
_SOURCE
#include <assert.h>
#include <limits.h>
#include <stdio.h>
#include <assert.h>
#include <limits.h>
#include <stdio.h>
@@
-103,7
+103,7
@@
int lttcomm_bind_inet_sock(struct lttcomm_sock *sock)
{
int ret;
{
int ret;
- ret = bind(sock->fd, &sock->sockaddr.addr.sin,
+ ret = bind(sock->fd,
(const struct sockaddr *)
&sock->sockaddr.addr.sin,
sizeof(sock->sockaddr.addr.sin));
if (ret < 0) {
PERROR("bind inet");
sizeof(sock->sockaddr.addr.sin));
if (ret < 0) {
PERROR("bind inet");
@@
-305,11
+305,11
@@
struct lttcomm_sock *lttcomm_accept_inet_sock(struct lttcomm_sock *sock)
ret = lttcomm_setsockopt_rcv_timeout(new_fd, timeout);
if (ret) {
ret = lttcomm_setsockopt_rcv_timeout(new_fd, timeout);
if (ret) {
- goto error;
+ goto error
_close
;
}
ret = lttcomm_setsockopt_snd_timeout(new_fd, timeout);
if (ret) {
}
ret = lttcomm_setsockopt_snd_timeout(new_fd, timeout);
if (ret) {
- goto error;
+ goto error
_close
;
}
}
}
}
@@
-319,6
+319,11
@@
struct lttcomm_sock *lttcomm_accept_inet_sock(struct lttcomm_sock *sock)
end:
return new_sock;
end:
return new_sock;
+error_close:
+ if (close(new_fd) < 0) {
+ PERROR("accept inet close fd");
+ }
+
error:
free(new_sock);
return NULL;
error:
free(new_sock);
return NULL;
This page took
0.024617 seconds
and
4
git commands to generate.