Refer to streams internally mostly by an index, not the stream_id.

[cubemap] / client.cpp

diff --git a/client.cpp b/client.cpp
index 04518c8c2f58a97e9afcd877b77c91863d319bcc..f6361f34ab47e62dc30ec1ebd6844ae73462d21a 100644 (file)
--- a/client.cpp
+++ b/client.cpp
@@ -60,7 +60,7 @@ Client::Client(const ClientProto &serialized, Stream *stream)
          connect_time(serialized.connect_time()),
          state(State(serialized.state())),
          request(serialized.request()),
-         stream_id(serialized.stream_id()),
+         url(serialized.url()),
          stream(stream),
          header_or_error(serialized.header_or_error()),
          header_or_error_bytes_sent(serialized.header_or_error_bytes_sent()),
@@ -90,7 +90,7 @@ ClientProto Client::serialize() const
        serialized.set_connect_time(connect_time);
        serialized.set_state(state);
        serialized.set_request(request);
-       serialized.set_stream_id(stream_id);
+       serialized.set_url(url);
        serialized.set_header_or_error(header_or_error);
        serialized.set_header_or_error_bytes_sent(serialized.header_or_error_bytes_sent());
        serialized.set_stream_pos(stream_pos);
@@ -103,10 +103,10 @@ ClientProto Client::serialize() const
 ClientStats Client::get_stats() const
 {
        ClientStats stats;
-       if (stream_id.empty()) {
-               stats.stream_id = "-";
+       if (url.empty()) {
+               stats.url = "-";
        } else {
-               stats.stream_id = stream_id;
+               stats.url = url;
        }
        stats.sock = sock;
        stats.fwmark = fwmark;