stream.cc (snort3-3.1.28.0) | : | stream.cc (snort3-3.1.29.0) | ||
---|---|---|---|---|
skipping to change at line 95 | skipping to change at line 95 | |||
} | } | |||
//------------------------------------------------------------------------- | //------------------------------------------------------------------------- | |||
// key foo | // key foo | |||
//------------------------------------------------------------------------- | //------------------------------------------------------------------------- | |||
Flow* Stream::get_flow( | Flow* Stream::get_flow( | |||
PktType type, IpProtocol proto, | PktType type, IpProtocol proto, | |||
const SfIp* srcIP, uint16_t srcPort, | const SfIp* srcIP, uint16_t srcPort, | |||
const SfIp* dstIP, uint16_t dstPort, | const SfIp* dstIP, uint16_t dstPort, | |||
uint16_t vlan, uint32_t mplsId, uint16_t addressSpaceId, | uint16_t vlan, uint32_t mplsId, uint32_t addressSpaceId, | |||
int16_t ingress_group, int16_t egress_group) | int16_t ingress_group, int16_t egress_group) | |||
{ | { | |||
FlowKey key; | FlowKey key; | |||
const SnortConfig* sc = SnortConfig::get_conf(); | const SnortConfig* sc = SnortConfig::get_conf(); | |||
key.init(sc, type, proto, srcIP, srcPort, dstIP, dstPort, vlan, mplsId, | key.init(sc, type, proto, srcIP, srcPort, dstIP, dstPort, vlan, mplsId, | |||
addressSpaceId, ingress_group, egress_group); | addressSpaceId, ingress_group, egress_group); | |||
return get_flow(&key); | return get_flow(&key); | |||
} | } | |||
skipping to change at line 161 | skipping to change at line 161 | |||
if (!flow) | if (!flow) | |||
return nullptr; | return nullptr; | |||
return flow->get_flow_data(flowdata_id); | return flow->get_flow_data(flowdata_id); | |||
} | } | |||
FlowData* Stream::get_flow_data( | FlowData* Stream::get_flow_data( | |||
PktType type, IpProtocol proto, | PktType type, IpProtocol proto, | |||
const SfIp* srcIP, uint16_t srcPort, | const SfIp* srcIP, uint16_t srcPort, | |||
const SfIp* dstIP, uint16_t dstPort, | const SfIp* dstIP, uint16_t dstPort, | |||
uint16_t vlan, uint32_t mplsId, | uint16_t vlan, uint32_t mplsId, | |||
uint16_t addressSpaceID, unsigned flowdata_id, | uint32_t addressSpaceID, unsigned flowdata_id, | |||
int16_t ingress_group, int16_t egress_group) | int16_t ingress_group, int16_t egress_group) | |||
{ | { | |||
Flow* flow = get_flow( | Flow* flow = get_flow( | |||
type, proto, srcIP, srcPort, dstIP, dstPort, | type, proto, srcIP, srcPort, dstIP, dstPort, | |||
vlan, mplsId, addressSpaceID, ingress_group, | vlan, mplsId, addressSpaceID, ingress_group, | |||
egress_group); | egress_group); | |||
if (!flow) | if (!flow) | |||
return nullptr; | return nullptr; | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added |