// Digested statistics for writing to logs etc.
struct ClientStats {
- std::string stream_id;
+ std::string url;
int sock;
- int fwmark;
std::string remote_addr;
time_t connect_time;
size_t bytes_sent;
};
struct Client {
- Client() {}
Client(int sock);
// Serialization/deserialization.
// The file descriptor associated with this socket.
int sock;
- // The fwmark associated with this socket (or 0).
- int fwmark;
-
// Some information only used for logging.
std::string remote_addr;
time_t connect_time;
- enum State { READING_REQUEST, SENDING_HEADER, SENDING_DATA, SENDING_ERROR };
+ enum State { READING_REQUEST, SENDING_HEADER, SENDING_DATA, SENDING_ERROR, WAITING_FOR_KEYFRAME };
State state;
// The HTTP request, as sent by the client. If we are in 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,
size_t header_or_error_bytes_sent;
// Number of bytes we are into the stream (ie., the end of last send).
- // Only relevant for SENDING_DATA.
+ // -1 means we want to send from the end of the backlog (the normal case),
+ // although only at a keyframe.
+ // -2 means we want to send from the _beginning_ of the backlog.
+ // Once we go into WAITING_FOR_KEYFRAME or SENDING_DATA, these negative
+ // values will be translated to real numbers.
size_t stream_pos;
// Number of bytes we've sent of data. Only relevant for SENDING_DATA.