projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: comparing array against NULL
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
consumer.c
diff --git
a/src/bin/lttng-sessiond/consumer.c
b/src/bin/lttng-sessiond/consumer.c
index 0cf43d2ca3da002ffb7d68aef558316c75b9006a..2e20878856fd1ee1ab1637b6ff297044bda58d77 100644
(file)
--- a/
src/bin/lttng-sessiond/consumer.c
+++ b/
src/bin/lttng-sessiond/consumer.c
@@
-32,6
+32,7
@@
#include "consumer.h"
#include "health.h"
#include "ust-app.h"
#include "consumer.h"
#include "health.h"
#include "ust-app.h"
+#include "utils.h"
/*
* Receive a reply command status message from the consumer. Consumer socket
/*
* Receive a reply command status message from the consumer. Consumer socket
@@
-407,6
+408,8
@@
error:
/*
* Delete the consumer_output object from the list and free the ptr.
/*
* Delete the consumer_output object from the list and free the ptr.
+ *
+ * Should *NOT* be called with RCU read-side lock held.
*/
void consumer_destroy_output(struct consumer_output *obj)
{
*/
void consumer_destroy_output(struct consumer_output *obj)
{
@@
-426,7
+429,7
@@
void consumer_destroy_output(struct consumer_output *obj)
rcu_read_unlock();
/* Finally destroy HT */
rcu_read_unlock();
/* Finally destroy HT */
-
lttng_ht_destroy
(obj->socks);
+
ht_cleanup_push
(obj->socks);
}
free(obj);
}
free(obj);
@@
-434,6
+437,8
@@
void consumer_destroy_output(struct consumer_output *obj)
/*
* Copy consumer output and returned the newly allocated copy.
/*
* Copy consumer output and returned the newly allocated copy.
+ *
+ * Should *NOT* be called with RCU read-side lock held.
*/
struct consumer_output *consumer_copy_output(struct consumer_output *obj)
{
*/
struct consumer_output *consumer_copy_output(struct consumer_output *obj)
{
@@
-504,6
+509,12
@@
int consumer_set_network_uri(struct consumer_output *obj,
if (uri->port == 0) {
/* Assign default port. */
uri->port = DEFAULT_NETWORK_CONTROL_PORT;
if (uri->port == 0) {
/* Assign default port. */
uri->port = DEFAULT_NETWORK_CONTROL_PORT;
+ } else {
+ if (obj->dst.net.data_isset && uri->port ==
+ obj->dst.net.data.port) {
+ ret = -LTTNG_ERR_INVALID;
+ goto error;
+ }
}
DBG3("Consumer control URI set with port %d", uri->port);
break;
}
DBG3("Consumer control URI set with port %d", uri->port);
break;
@@
-513,11
+524,18
@@
int consumer_set_network_uri(struct consumer_output *obj,
if (uri->port == 0) {
/* Assign default port. */
uri->port = DEFAULT_NETWORK_DATA_PORT;
if (uri->port == 0) {
/* Assign default port. */
uri->port = DEFAULT_NETWORK_DATA_PORT;
+ } else {
+ if (obj->dst.net.control_isset && uri->port ==
+ obj->dst.net.control.port) {
+ ret = -LTTNG_ERR_INVALID;
+ goto error;
+ }
}
DBG3("Consumer data URI set with port %d", uri->port);
break;
default:
ERR("Set network uri type unknown %d", uri->stype);
}
DBG3("Consumer data URI set with port %d", uri->port);
break;
default:
ERR("Set network uri type unknown %d", uri->stype);
+ ret = -LTTNG_ERR_INVALID;
goto error;
}
goto error;
}
@@
-553,6
+571,7
@@
int consumer_set_network_uri(struct consumer_output *obj,
}
if (ret < 0) {
PERROR("snprintf set consumer uri subdir");
}
if (ret < 0) {
PERROR("snprintf set consumer uri subdir");
+ ret = -LTTNG_ERR_NOMEM;
goto error;
}
goto error;
}
@@
-564,7
+583,7
@@
int consumer_set_network_uri(struct consumer_output *obj,
equal:
return 1;
error:
equal:
return 1;
error:
- return
-1
;
+ return
ret
;
}
/*
}
/*
@@
-1107,7
+1126,7
@@
int consumer_push_metadata(struct consumer_socket *socket,
goto end;
}
goto end;
}
- DBG3("Consumer pushing metadata on sock %d of len %
l
u", socket->fd, len);
+ DBG3("Consumer pushing metadata on sock %d of len %
z
u", socket->fd, len);
ret = lttcomm_send_unix_sock(socket->fd, metadata_str, len);
if (ret < 0) {
ret = lttcomm_send_unix_sock(socket->fd, metadata_str, len);
if (ret < 0) {
This page took
0.027228 seconds
and
5
git commands to generate.