projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: handle backward compatibility with lttng-modules 2.7
[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 fa9218769b31c1d903e9cd33e6c12c0e3fbe0bd5..25dbd2195a9f936721fc158a7c94d29234d9206c 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>
@@
-26,15
+26,14
@@
#include <unistd.h>
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
#include <fcntl.h>
-#include <time.h>
+#include <
common/compat/
time.h>
#include <poll.h>
#include <common/common.h>
#include <poll.h>
#include <common/common.h>
+#include <common/time.h>
#include "inet.h"
#include "inet.h"
-#define MSEC_PER_SEC 1000
-#define NSEC_PER_MSEC 1000000
#define RECONNECT_DELAY 200 /* ms */
/*
#define RECONNECT_DELAY 200 /* ms */
/*
@@
-103,7
+102,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");
@@
-159,7
+158,7
@@
int connect_with_timeout(struct lttcomm_sock *sock)
return -1;
}
return -1;
}
- ret = clock_gettime(CLOCK_MONOTONIC, &orig_time);
+ ret =
lttng_
clock_gettime(CLOCK_MONOTONIC, &orig_time);
if (ret == -1) {
PERROR("clock_gettime");
return -1;
if (ret == -1) {
PERROR("clock_gettime");
return -1;
@@
-213,7
+212,7
@@
int connect_with_timeout(struct lttcomm_sock *sock)
}
}
/* ret == 0: timeout */
}
}
/* ret == 0: timeout */
- ret = clock_gettime(CLOCK_MONOTONIC, &cur_time);
+ ret =
lttng_
clock_gettime(CLOCK_MONOTONIC, &cur_time);
if (ret == -1) {
PERROR("clock_gettime");
connect_ret = ret;
if (ret == -1) {
PERROR("clock_gettime");
connect_ret = ret;
@@
-275,6
+274,7
@@
struct lttcomm_sock *lttcomm_accept_inet_sock(struct lttcomm_sock *sock)
int new_fd;
socklen_t len;
struct lttcomm_sock *new_sock;
int new_fd;
socklen_t len;
struct lttcomm_sock *new_sock;
+ unsigned long timeout;
if (sock->proto == LTTCOMM_SOCK_UDP) {
/*
if (sock->proto == LTTCOMM_SOCK_UDP) {
/*
@@
-298,6
+298,19
@@
struct lttcomm_sock *lttcomm_accept_inet_sock(struct lttcomm_sock *sock)
PERROR("accept inet");
goto error;
}
PERROR("accept inet");
goto error;
}
+ timeout = lttcomm_get_network_timeout();
+ if (timeout) {
+ int ret;
+
+ ret = lttcomm_setsockopt_rcv_timeout(new_fd, timeout);
+ if (ret) {
+ goto error_close;
+ }
+ ret = lttcomm_setsockopt_snd_timeout(new_fd, timeout);
+ if (ret) {
+ goto error_close;
+ }
+ }
new_sock->fd = new_fd;
new_sock->ops = &inet_ops;
new_sock->fd = new_fd;
new_sock->ops = &inet_ops;
@@
-305,6
+318,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;
@@
-388,7
+406,7
@@
ssize_t lttcomm_recvmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
* Return the size of sent data.
*/
LTTNG_HIDDEN
* Return the size of sent data.
*/
LTTNG_HIDDEN
-ssize_t lttcomm_sendmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
+ssize_t lttcomm_sendmsg_inet_sock(struct lttcomm_sock *sock,
const
void *buf,
size_t len, int flags)
{
struct msghdr msg;
size_t len, int flags)
{
struct msghdr msg;
@@
-397,7
+415,7
@@
ssize_t lttcomm_sendmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
memset(&msg, 0, sizeof(msg));
memset(&msg, 0, sizeof(msg));
- iov[0].iov_base = buf;
+ iov[0].iov_base =
(void *)
buf;
iov[0].iov_len = len;
msg.msg_iov = iov;
msg.msg_iovlen = 1;
iov[0].iov_len = len;
msg.msg_iov = iov;
msg.msg_iovlen = 1;
@@
-457,6
+475,7
@@
int lttcomm_close_inet_sock(struct lttcomm_sock *sock)
static unsigned long read_proc_value(const char *path)
{
int ret, fd;
static unsigned long read_proc_value(const char *path)
{
int ret, fd;
+ ssize_t size_ret;
long r_val;
unsigned long val = 0;
char buf[64];
long r_val;
unsigned long val = 0;
char buf[64];
@@
-466,11
+485,16
@@
static unsigned long read_proc_value(const char *path)
goto error;
}
goto error;
}
- ret = read(fd, buf, sizeof(buf));
- if (ret < 0) {
+ size_ret = lttng_read(fd, buf, sizeof(buf));
+ /*
+ * Allow reading a file smaller than buf, but keep space for
+ * final \0.
+ */
+ if (size_ret < 0 || size_ret >= sizeof(buf)) {
PERROR("read proc failed");
goto error_close;
}
PERROR("read proc failed");
goto error_close;
}
+ buf[size_ret] = '\0';
errno = 0;
r_val = strtol(buf, NULL, 10);
errno = 0;
r_val = strtol(buf, NULL, 10);
This page took
0.027073 seconds
and
4
git commands to generate.