Add internal BT_ASSERT() and BT_ASSERT_PRE() helpers

[babeltrace.git] / plugins / ctf / lttng-live / viewer-connection.h

diff --git a/plugins/ctf/lttng-live/viewer-connection.h b/plugins/ctf/lttng-live/viewer-connection.h
index e6f551f4ca12ff3080b33c5c1c1160534a73b1b4..bb9c2852f023055832e2e613774b37551d2d5ab8 100644 (file)
--- a/plugins/ctf/lttng-live/viewer-connection.h
+++ b/plugins/ctf/lttng-live/viewer-connection.h
@@ -27,31 +27,35 @@
 #include <glib.h>
 
 #include <babeltrace/babeltrace-internal.h>
+#include <babeltrace/compat/socket-internal.h>
 
 //TODO: this should not be used by plugins. Should copy code into plugin
 //instead.
-#include "babeltrace/object-internal.h"
+#include <babeltrace/object-internal.h>
 
 #define LTTNG_DEFAULT_NETWORK_VIEWER_PORT      5344
 
 #define LTTNG_LIVE_MAJOR                       2
 #define LTTNG_LIVE_MINOR                       4
 
+struct lttng_live_component;
+
 struct bt_live_viewer_connection {
        struct bt_object obj;
 
-       FILE *error_fp;
-
        GString *url;
 
-       char relay_hostname[MAXNAMLEN];
-       char target_hostname[MAXNAMLEN];
-       char session_name[MAXNAMLEN];
-       int control_sock;
+       GString *relay_hostname;
+       GString *target_hostname;
+       GString *session_name;
+
+       BT_SOCKET control_sock;
        int port;
 
        int32_t major;
        int32_t minor;
+
+       struct lttng_live_component *lttng_live;
 };
 
 struct packet_index_time {
@@ -74,7 +78,7 @@ struct packet_index {
 };
 
 struct bt_live_viewer_connection *
-       bt_live_viewer_connection_create(const char *url, FILE *error_fp);
+       bt_live_viewer_connection_create(const char *url, struct lttng_live_component *lttng_live);
 
 void bt_live_viewer_connection_destroy(struct bt_live_viewer_connection *conn);