lib: add aliases for Babeltrace structure types

[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 822c17ed3b874820aa6dc29a06fa3736e3e9c3e0..90d2dcff608714c0cc4eaf39222a691d3b7fa053 100644 (file)
--- a/plugins/ctf/lttng-live/viewer-connection.h
+++ b/plugins/ctf/lttng-live/viewer-connection.h
@@ -27,6 +27,7 @@
 #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.
@@ -37,10 +38,10 @@
 #define LTTNG_LIVE_MAJOR                       2
 #define LTTNG_LIVE_MINOR                       4
 
-struct bt_live_viewer_connection {
-       struct bt_object obj;
+struct lttng_live_component;
 
-       FILE *error_fp;
+struct bt_live_viewer_connection {
+       bt_object obj;
 
        GString *url;
 
@@ -48,11 +49,13 @@ struct bt_live_viewer_connection {
        GString *target_hostname;
        GString *session_name;
 
-       int control_sock;
+       BT_SOCKET control_sock;
        int port;
 
        int32_t major;
        int32_t minor;
+
+       struct lttng_live_component *lttng_live;
 };
 
 struct packet_index_time {
@@ -75,10 +78,10 @@ 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);
 
-struct bt_value *bt_live_viewer_connection_list_sessions(struct bt_live_viewer_connection *viewer_connection);
+bt_value *bt_live_viewer_connection_list_sessions(struct bt_live_viewer_connection *viewer_connection);
 
 #endif /* LTTNG_LIVE_VIEWER_CONNECTION_H */