YTSATS-1457: More fixes on per-ip debug for non ssl (apache#662)

shinrich · Jan 9, 2018 · bc2e609 · bc2e609
1 parent c759f64
commit bc2e609
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/iocore/net/P_UnixNetVConnection.h b/iocore/net/P_UnixNetVConnection.h
@@ -322,7 +322,6 @@ TS_INLINE void
 UnixNetVConnection::set_remote_addr()
 {
   ats_ip_copy(&remote_addr, &con.addr);
-  this->control_flags.set_flag(ContFlags::DEBUG_OVERRIDE, diags->test_override_ip(remote_addr));
 }
 
 TS_INLINE void

diff --git a/iocore/net/UnixNetAccept.cc b/iocore/net/UnixNetAccept.cc
@@ -89,6 +89,7 @@ net_accept(NetAccept *na, void *ep, bool blockable)
     vc->action_     = *na->action_;
     vc->set_is_transparent(na->opt.f_inbound_transparent);
     vc->set_context(NET_VCONNECTION_IN);
+    vc->control_flags.set_flag(ContFlags::DEBUG_OVERRIDE, diags->test_override_ip(con.addr));
     SET_CONTINUATION_HANDLER(vc, (NetVConnHandler)&UnixNetVConnection::acceptEvent);
 
     if (e->ethread->is_event_type(na->opt.etype))
@@ -279,6 +280,7 @@ NetAccept::do_blocking_accept(EThread *t)
     vc->options.packet_tos  = opt.packet_tos;
     vc->options.ip_family   = opt.ip_family;
     vc->apply_options();
+    vc->control_flags.set_flag(ContFlags::DEBUG_OVERRIDE, diags->test_override_ip(con.addr));
     vc->set_context(NET_VCONNECTION_IN);
     vc->accept_object = this;
     SET_CONTINUATION_HANDLER(vc, (NetVConnHandler)&UnixNetVConnection::acceptEvent);
@@ -424,6 +426,7 @@ NetAccept::acceptFastEvent(int event, void *ep)
     vc->options.packet_tos  = opt.packet_tos;
     vc->options.ip_family   = opt.ip_family;
     vc->apply_options();
+    vc->control_flags.set_flag(ContFlags::DEBUG_OVERRIDE, diags->test_override_ip(con.addr));
     vc->set_context(NET_VCONNECTION_IN);
     SET_CONTINUATION_HANDLER(vc, (NetVConnHandler)&UnixNetVConnection::mainEvent);