struct Stream;
// Digested statistics for writing to logs etc.
+// Note that "referer" and "user_agent" here are already escaped for scary characters.
struct ClientStats {
std::string url;
int sock;
std::string remote_addr;
- time_t connect_time;
+ std::string referer;
+ std::string user_agent;
+ timespec connect_time;
size_t bytes_sent;
size_t bytes_lost;
size_t num_loss_events;
// The file descriptor associated with this socket.
int sock;
+ // When the client connected, in terms of CLOCK_MONOTONIC_COARSE.
+ timespec connect_time;
+
// Some information only used for logging.
std::string remote_addr;
- time_t connect_time;
+ std::string referer;
+ std::string user_agent;
- enum State { READING_REQUEST, SENDING_HEADER, SENDING_DATA, SENDING_ERROR, WAITING_FOR_KEYFRAME, PREBUFFERING };
+ enum State { READING_REQUEST, SENDING_HEADER, SENDING_DATA, SENDING_SHORT_RESPONSE, WAITING_FOR_KEYFRAME, PREBUFFERING };
State state;
// The HTTP request, as sent by the client. If we are in READING_REQUEST,
std::string url;
Stream *stream;
- // The header we want to send. This is nominally a copy of Stream::header,
- // but since that might change on reconnects etc., we keep a local copy here.
- // Only relevant for SENDING_HEADER or SENDING_ERROR; blank otherwise.
- std::string header_or_error;
+ // The header we want to send, or the response with headers if we know
+ // it in its entirety after reading the request (typically an error).
+ // This is nominally a copy of Stream::header, but since that might
+ // change on reconnects etc., we keep a local copy here. Only relevant
+ // for SENDING_HEADER or SENDING_SHORT_RESPONSE; blank otherwise.
+ std::string header_or_short_response;
// Number of bytes we've sent of the header. Only relevant for SENDING_HEADER
- // or SENDING_ERROR.
- size_t header_or_error_bytes_sent;
+ // or SENDING_SHORT_RESPONSE.
+ size_t header_or_short_response_bytes_sent;
// Number of bytes we are into the stream (ie., the end of last send).
// -1 means we want to send from the end of the backlog (the normal case),