"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/main/snort_config.cc" between
snort3-3.1.29.0.tar.gz and snort3-3.1.30.0.tar.gz

About: Snort 3 is a network intrusion prevention and detection system (IDS/IPS) combining the benefits of signature, protocol and anomaly-based inspection.

snort_config.cc  (snort3-3.1.29.0):snort_config.cc  (snort3-3.1.30.0)
skipping to change at line 359 skipping to change at line 359
memcpy(&homenet, &conf->homenet, sizeof(homenet)); memcpy(&homenet, &conf->homenet, sizeof(homenet));
if (conf->obfuscation_net.get_family() != 0) if (conf->obfuscation_net.get_family() != 0)
memcpy(&obfuscation_net, &conf->obfuscation_net, sizeof(obfuscation_net) ); memcpy(&obfuscation_net, &conf->obfuscation_net, sizeof(obfuscation_net) );
} }
// merge in everything from the command line config // merge in everything from the command line config
void SnortConfig::merge(const SnortConfig* cmd_line_conf) void SnortConfig::merge(const SnortConfig* cmd_line_conf)
{ {
// -D / -H / -Q / -r / -T / -x / --alert-before-pass / --create-pidfile / -- enable-inline-test / --mem-check / // -D / -H / -Q / -r / -T / -x / --alert-before-pass / --create-pidfile / -- enable-inline-test / --mem-check /
// --nolock-pidfile / --pause / --pcap-file / --pcap-dir / --pcap-list / --p cap-show / --pedantic / --piglet / // --nolock-pidfile / --pause / --pcap-file / --pcap-dir / --pcap-list / --p cap-show / --pedantic /
// --shell / --show-file-codes // --shell / --show-file-codes
run_flags |= cmd_line_conf->run_flags; run_flags |= cmd_line_conf->run_flags;
// -A / -C / -d / -e / -f / -O / -U / -X / -y / --nostamps // -A / -C / -d / -e / -f / -O / -U / -X / -y / --nostamps
output_flags |= cmd_line_conf->output_flags; output_flags |= cmd_line_conf->output_flags;
// -B // -B
if (cmd_line_conf->obfuscation_net.get_family() != 0) if (cmd_line_conf->obfuscation_net.get_family() != 0)
memcpy(&obfuscation_net, &cmd_line_conf->obfuscation_net, sizeof(obfusca tion_net)); memcpy(&obfuscation_net, &cmd_line_conf->obfuscation_net, sizeof(obfusca tion_net));
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)