projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Unchecked session pointer when destroying a connection in relayd
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
main.c
diff --git
a/src/bin/lttng-relayd/main.c
b/src/bin/lttng-relayd/main.c
index 60b6bf2214e8bee4d0266000a1db592982384940..a93151ac47f560875f07c9cbf113225f9dd892cc 100644
(file)
--- a/
src/bin/lttng-relayd/main.c
+++ b/
src/bin/lttng-relayd/main.c
@@
-382,8
+382,9
@@
int set_options(int argc, char **argv)
/* assign default values */
if (control_uri == NULL) {
/* assign default values */
if (control_uri == NULL) {
- ret = asprintf(&default_address, "tcp://0.0.0.0:%d",
- DEFAULT_NETWORK_CONTROL_PORT);
+ ret = asprintf(&default_address,
+ "tcp://" DEFAULT_NETWORK_CONTROL_BIND_ADDRESS ":%d",
+ DEFAULT_NETWORK_CONTROL_PORT);
if (ret < 0) {
PERROR("asprintf default data address");
goto exit;
if (ret < 0) {
PERROR("asprintf default data address");
goto exit;
@@
-397,8
+398,9
@@
int set_options(int argc, char **argv)
}
}
if (data_uri == NULL) {
}
}
if (data_uri == NULL) {
- ret = asprintf(&default_address, "tcp://0.0.0.0:%d",
- DEFAULT_NETWORK_DATA_PORT);
+ ret = asprintf(&default_address,
+ "tcp://" DEFAULT_NETWORK_DATA_BIND_ADDRESS ":%d",
+ DEFAULT_NETWORK_DATA_PORT);
if (ret < 0) {
PERROR("asprintf default data address");
goto exit;
if (ret < 0) {
PERROR("asprintf default data address");
goto exit;
@@
-412,8
+414,9
@@
int set_options(int argc, char **argv)
}
}
if (live_uri == NULL) {
}
}
if (live_uri == NULL) {
- ret = asprintf(&default_address, "tcp://0.0.0.0:%d",
- DEFAULT_NETWORK_VIEWER_PORT);
+ ret = asprintf(&default_address,
+ "tcp://" DEFAULT_NETWORK_VIEWER_BIND_ADDRESS ":%d",
+ DEFAULT_NETWORK_VIEWER_PORT);
if (ret < 0) {
PERROR("asprintf default viewer control address");
goto exit;
if (ret < 0) {
PERROR("asprintf default viewer control address");
goto exit;
@@
-2386,7
+2389,7
@@
static void destroy_connection(struct lttng_ht *relay_connections_ht,
connection_delete(relay_connections_ht, conn);
/* For the control socket, we try to destroy the session. */
connection_delete(relay_connections_ht, conn);
/* For the control socket, we try to destroy the session. */
- if (conn->type == RELAY_CONTROL) {
+ if (conn->type == RELAY_CONTROL
&& conn->session
) {
destroy_session(conn->session, conn->sessions_ht);
}
destroy_session(conn->session, conn->sessions_ht);
}
This page took
0.025935 seconds
and
4
git commands to generate.