incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up some ip stack warnings

Browse Source
This commit is contained in:
Martin Michelsen
2022-03-28 22:27:02 -07:00
parent 5c6a420a61
commit 5b47414a30
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/IPStackSimulator.cc
+16 -7
View File
@@ -223,8 +223,10 @@ void IPStackSimulator::on_client_input(struct bufferevent* bev) {
try { try {
this->on_client_frame(c, frame); this->on_client_frame(c, frame);
} catch (const exception& e) { } catch (const exception& e) {
log(WARNING, "[IPStackSimulator] Failed to process client frame: %s", e.what()); if (this->state->ip_stack_debug) {
print_data(stderr, frame); log(WARNING, "[IPStackSimulator] Failed to process client frame: %s", e.what());
print_data(stderr, frame);
}
} }
} }
} }
@@ -542,7 +544,7 @@ void IPStackSimulator::on_client_tcp_frame(
uint64_t key = this->tcp_conn_key_for_client_frame(fi); uint64_t key = this->tcp_conn_key_for_client_frame(fi);
auto emplace_ret = c->tcp_connections.emplace(key, IPClient::TCPConnection()); auto emplace_ret = c->tcp_connections.emplace(key, IPClient::TCPConnection());
auto& conn = emplace_ret.first->second; auto& conn = emplace_ret.first->second;
string conn_str = this->state->ip_stack_debug ? this->str_for_tcp_connection(c, conn) : ""; string conn_str;
if (emplace_ret.second) { if (emplace_ret.second) {
// Connection is new; initialize it // Connection is new; initialize it
@@ -557,9 +559,14 @@ void IPStackSimulator::on_client_tcp_frame(
conn.resend_push_usecs = DEFAULT_RESEND_PUSH_USECS; conn.resend_push_usecs = DEFAULT_RESEND_PUSH_USECS;
conn.awaiting_first_ack = true; conn.awaiting_first_ack = true;
conn.max_frame_size = max_frame_size; conn.max_frame_size = max_frame_size;
conn_str = this->str_for_tcp_connection(c, conn);
if (this->state->ip_stack_debug) { if (this->state->ip_stack_debug) {
log(INFO, "[IPStackSimulator] Client opened TCP connection %s (acked_server_seq=%08" PRIX32 ", next_client_seq=%08" PRIX32 ")", log(INFO, "[IPStackSimulator] Client opened TCP connection %s (acked_server_seq=%08" PRIX32 ", next_client_seq=%08" PRIX32 ")",
conn_str.c_str(), conn.acked_server_seq, conn.next_client_seq); conn_str.c_str(), conn.acked_server_seq, conn.next_client_seq);
} else {
log(INFO, "[IPStackSimulator] Client opened TCP connection %s",
conn_str.c_str());
} }
} else { } else {
@@ -569,6 +576,7 @@ void IPStackSimulator::on_client_tcp_frame(
} }
// TODO: We should check the syn/ack numbers here instead of just assuming // TODO: We should check the syn/ack numbers here instead of just assuming
// they're correct // they're correct
conn_str = this->str_for_tcp_connection(c, conn);
if (this->state->ip_stack_debug) { if (this->state->ip_stack_debug) {
log(INFO, "[IPStackSimulator] Client resent SYN for TCP connection %s", log(INFO, "[IPStackSimulator] Client resent SYN for TCP connection %s",
conn_str.c_str()); conn_str.c_str());
@@ -640,10 +648,8 @@ void IPStackSimulator::on_client_tcp_frame(
throw runtime_error("client sent TCP FIN+RST"); throw runtime_error("client sent TCP FIN+RST");
} }
if (this->state->ip_stack_debug) { string conn_str = this->str_for_tcp_connection(c, *conn);
string conn_str = this->str_for_tcp_connection(c, *conn); log(INFO, "[IPStackSimulator] Client closed TCP connection %s", conn_str.c_str());
log(INFO, "[IPStackSimulator] Client closed TCP connection %s", conn_str.c_str());
}
// TODO: Are we supposed to send a response to an RST? Here we do, and the // TODO: Are we supposed to send a response to an RST? Here we do, and the
// client probably just ignores it anyway // client probably just ignores it anyway
@@ -939,6 +945,9 @@ void IPStackSimulator::on_server_error(
// Delete the connection object (this also flushes and frees the server // Delete the connection object (this also flushes and frees the server
// virtual connection bufferevent) // virtual connection bufferevent)
string conn_str = this->str_for_tcp_connection(c, conn);
log(INFO, "[IPStackSimulator] Server closed TCP connection %s",
conn_str.c_str());
c->tcp_connections.erase(this->tcp_conn_key_for_connection(conn)); c->tcp_connections.erase(this->tcp_conn_key_for_connection(conn));
} }
} }