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

[cubemap] / client.h

diff --git a/client.h b/client.h
index 9a189c0a9af709365944d11e6db37f75868161f0..c73810df5e726297e8258c3997df3498fe32e7c7 100644 (file)
--- a/client.h
+++ b/client.h
@@ -12,7 +12,7 @@ struct Stream;
 
 // Digested statistics for writing to logs etc.
 struct ClientStats {
 
 // Digested statistics for writing to logs etc.
 struct ClientStats {

-       std::string stream_id;
+       std::string url;

        int sock;
        int fwmark;
        std::string remote_addr;
        int sock;
        int fwmark;
        std::string remote_addr;


@@ -50,7 +50,7 @@ struct Client {
 
        // What stream we're connecting to; parsed from <request>.
        // Not relevant for READING_REQUEST.
 
        // What stream we're connecting to; parsed from <request>.
        // Not relevant for READING_REQUEST.

-       std::string stream_id;
+       std::string url;

        Stream *stream;
 
        // The header we want to send. This is nominally a copy of Stream::header,
        Stream *stream;
 
        // The header we want to send. This is nominally a copy of Stream::header,