+#include <stdio.h>
#include <arpa/inet.h>
#include <netinet/in.h>
#include <stdint.h>
: sock(sock),
state(Client::READING_REQUEST),
stream(NULL),
- header_or_error_bytes_sent(0),
+ header_or_short_response_bytes_sent(0),
stream_pos(0),
bytes_sent(0),
bytes_lost(0),
Client::Client(const ClientProto &serialized, Stream *stream)
: sock(serialized.sock()),
remote_addr(serialized.remote_addr()),
+ referer(serialized.referer()),
+ user_agent(serialized.user_agent()),
state(State(serialized.state())),
request(serialized.request()),
url(serialized.url()),
stream(stream),
- header_or_error(serialized.header_or_error()),
- header_or_error_bytes_sent(serialized.header_or_error_bytes_sent()),
+ header_or_short_response(serialized.header_or_short_response()),
+ header_or_short_response_bytes_sent(serialized.header_or_short_response_bytes_sent()),
stream_pos(serialized.stream_pos()),
bytes_sent(serialized.bytes_sent()),
bytes_lost(serialized.bytes_lost()),
ClientProto serialized;
serialized.set_sock(sock);
serialized.set_remote_addr(remote_addr);
+ serialized.set_referer(referer);
+ serialized.set_user_agent(user_agent);
serialized.set_connect_time_sec(connect_time.tv_sec);
serialized.set_connect_time_nsec(connect_time.tv_nsec);
serialized.set_state(state);
serialized.set_request(request);
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_header_or_short_response(header_or_short_response);
+ serialized.set_header_or_short_response_bytes_sent(serialized.header_or_short_response_bytes_sent());
serialized.set_stream_pos(stream_pos);
serialized.set_bytes_sent(bytes_sent);
serialized.set_bytes_lost(bytes_lost);
serialized.set_num_loss_events(num_loss_events);
return serialized;
}
+
+namespace {
+
+string escape_string(const string &str) {
+ string ret;
+ for (size_t i = 0; i < str.size(); ++i) {
+ char buf[16];
+ if (isprint(str[i]) && str[i] >= 32 && str[i] != '"' && str[i] != '\\') {
+ ret.push_back(str[i]);
+ } else {
+ snprintf(buf, sizeof(buf), "\\x%02x", (unsigned char)str[i]);
+ ret += buf;
+ }
+ }
+ return ret;
+}
+
+} // namespace
ClientStats Client::get_stats() const
{
}
stats.sock = sock;
stats.remote_addr = remote_addr;
+ stats.referer = escape_string(referer);
+ stats.user_agent = escape_string(user_agent);
stats.connect_time = connect_time;
stats.bytes_sent = bytes_sent;
stats.bytes_lost = bytes_lost;