tcp_stream_session.cc (snort3-3.1.28.0) | : | tcp_stream_session.cc (snort3-3.1.29.0) | ||
---|---|---|---|---|
skipping to change at line 313 | skipping to change at line 313 | |||
egress_index = p->pkth->ingress_index; | egress_index = p->pkth->ingress_index; | |||
egress_group = p->pkth->ingress_group; | egress_group = p->pkth->ingress_group; | |||
ingress_index = p->pkth->egress_index; | ingress_index = p->pkth->egress_index; | |||
ingress_group = p->pkth->egress_group; | ingress_group = p->pkth->egress_group; | |||
} | } | |||
daq_flags = p->pkth->flags; | daq_flags = p->pkth->flags; | |||
address_space_id = p->pkth->address_space_id; | address_space_id = p->pkth->address_space_id; | |||
} | } | |||
void TcpStreamSession::get_packet_header_foo(DAQ_PktHdr_t* pkth, uint32_t dir) | void TcpStreamSession::get_packet_header_foo(DAQ_PktHdr_t* pkth, const DAQ_PktHd r_t* orig, uint32_t dir) | |||
{ | { | |||
if ( (dir & PKT_FROM_CLIENT) || (egress_index == DAQ_PKTHDR_UNKNOWN && | if ( (dir & PKT_FROM_CLIENT) || (egress_index == DAQ_PKTHDR_UNKNOWN && | |||
egress_group == DAQ_PKTHDR_UNKNOWN) ) | egress_group == DAQ_PKTHDR_UNKNOWN) ) | |||
{ | { | |||
pkth->ingress_index = ingress_index; | pkth->ingress_index = ingress_index; | |||
pkth->ingress_group = ingress_group; | pkth->ingress_group = ingress_group; | |||
pkth->egress_index = egress_index; | pkth->egress_index = egress_index; | |||
pkth->egress_group = egress_group; | pkth->egress_group = egress_group; | |||
} | } | |||
else | else | |||
{ | { | |||
pkth->ingress_index = egress_index; | pkth->ingress_index = egress_index; | |||
pkth->ingress_group = egress_group; | pkth->ingress_group = egress_group; | |||
pkth->egress_index = ingress_index; | pkth->egress_index = ingress_index; | |||
pkth->egress_group = ingress_group; | pkth->egress_group = ingress_group; | |||
} | } | |||
pkth->opaque = 0; | pkth->opaque = 0; | |||
pkth->flags = daq_flags; | pkth->flags = daq_flags; | |||
pkth->address_space_id = address_space_id; | pkth->address_space_id = address_space_id; | |||
pkth->tenant_id = orig->tenant_id; | ||||
} | } | |||
void TcpStreamSession::reset() | void TcpStreamSession::reset() | |||
{ | { | |||
if ( tcp_init ) | if ( tcp_init ) | |||
clear_session(true, false, false ); | clear_session(true, false, false ); | |||
} | } | |||
void TcpStreamSession::cleanup(Packet* p) | void TcpStreamSession::cleanup(Packet* p) | |||
{ | { | |||
End of changes. 2 change blocks. | ||||
1 lines changed or deleted | 2 lines changed or added |