Merge pull request #6 from AnnikaH/master

Sending data about the uplink to mothership

Author: AndreasAakesson

starbase/CMakeLists.txt

@@ -18,9 +18,6 @@ set(SERVICE_NAME "IncludeOS Starbase")
 # Name of your service binary
 set(BINARY       "starbase")
 
-# Maximum memory can be hard-coded into the binary
-set(MAX_MEM 128)
-
 # Source files to be linked with OS library parts to form bootable image
 set(SOURCES
   service.cpp # ...add more here

transport.hpp

@@ -34,6 +34,7 @@ namespace uplink {
     APPDATA   = 6,
     PANIC     = 7,
     STATS     = 8,
+    UPLINK    = 9,
     ERROR     = 255 // Legacy
   };
 

ws_uplink.cpp

@@ -180,6 +180,8 @@ namespace uplink {
     MYINFO("Websocket established");
 
     send_ident();
+
+    send_uplink();
   }
 
   void WS_uplink::handle_ws_close(uint16_t code)
@@ -393,6 +395,32 @@ namespace uplink {
     send_message(Transport_code::IDENT, str.data(), str.size());
   }
 
+  void WS_uplink::send_uplink() {
+    MYINFO("Sending uplink");
+    using namespace rapidjson;
+
+    StringBuffer buf;
+    Writer<StringBuffer> writer{buf};
+
+    writer.StartObject();
+
+    writer.Key("url");
+    writer.String(config_.url);
+
+    writer.Key("token");
+    writer.String(config_.token);
+
+    writer.EndObject();
+
+    std::string str = buf.GetString();
+
+    MYINFO("%s", str.c_str());
+
+    auto transport = Transport{Header{Transport_code::UPLINK, static_cast<uint32_t>(str.size())}};
+    transport.load_cargo(str.data(), str.size());
+    ws_->write(transport.data().data(), transport.data().size());
+  }
+
   void WS_uplink::send_message(Transport_code code, const char* data, size_t len) {
     auto transport = Transport{Header{code, static_cast<uint32_t>(len)}};
 

ws_uplink.hpp

@@ -53,6 +53,8 @@ class WS_uplink {
 
   void send_log(const char*, size_t);
 
+  void send_uplink();
+
   void update(const std::vector<char>& buffer);
 
   void send_error(const std::string& err);