.merge-branch-exclude | 44 depcomp | 530 doc/README.flow | 32 doc/README.flow-portscan | 319 doc/README.stream4 | 243 etc/generators | 43 etc/sid | 1 src/codes.c | 408 src/codes.h | 28 src/detection-plugins/sp_respond2.h | 37 src/dynamic-plugins/sf_engine/sfghash.c | 695 src/dynamic-plugins/sf_engine/sfhashfcn.c | 125 src/dynamic-preprocessors/ftptelnet/ftpp_util_kmap.h | 105 src/fatal.h | 39 src/ipv6.c | 196 src/ipv6.h | 65 src/preprocessors/flow/Makefile.am | 16 src/preprocessors/flow/Makefile.in | 574 src/preprocessors/flow/common_defs.h | 60 src/preprocessors/flow/flow.c | 229 src/preprocessors/flow/flow.h | 132 src/preprocessors/flow/flow_cache.c | 664 src/preprocessors/flow/flow_cache.h | 70 src/preprocessors/flow/flow_callback.c | 116 src/preprocessors/flow/flow_callback.h | 47 src/preprocessors/flow/flow_class.c | 46 src/preprocessors/flow/flow_class.h | 31 src/preprocessors/flow/flow_config.h | 29 src/preprocessors/flow/flow_error.h | 33 src/preprocessors/flow/flow_hash.c | 124 src/preprocessors/flow/flow_hash.h | 42 src/preprocessors/flow/flow_print.c | 137 src/preprocessors/flow/flow_print.h | 34 src/preprocessors/flow/flow_stat.c | 150 src/preprocessors/flow/flow_stat.h | 34 src/preprocessors/flow/int-snort/Makefile.am | 7 src/preprocessors/flow/int-snort/Makefile.in | 426 src/preprocessors/flow/int-snort/flow_packet.c | 28 src/preprocessors/flow/int-snort/flow_packet.h | 231 src/preprocessors/flow/portscan/Makefile.am | 11 src/preprocessors/flow/portscan/Makefile.in | 433 src/preprocessors/flow/portscan/flowps.c | 945 src/preprocessors/flow/portscan/flowps.h | 219 src/preprocessors/flow/portscan/flowps_snort.c | 1106 src/preprocessors/flow/portscan/flowps_snort.h | 31 src/preprocessors/flow/portscan/scoreboard.c | 422 src/preprocessors/flow/portscan/scoreboard.h | 73 src/preprocessors/flow/portscan/server_stats.c | 474 src/preprocessors/flow/portscan/server_stats.h | 55 src/preprocessors/flow/portscan/unique_tracker.c | 280 src/preprocessors/flow/portscan/unique_tracker.h | 47 src/preprocessors/snort_stream4_session.c | 502 src/preprocessors/snort_stream4_session.h | 36 src/preprocessors/snort_stream4_udp.c | 522 src/preprocessors/snort_stream4_udp.h | 29 src/preprocessors/spp_flow.c | 457 src/preprocessors/spp_flow.h | 32 src/preprocessors/spp_stream4.c | 7567 ----- src/preprocessors/spp_stream4.h | 31 src/preprocessors/stream.h | 240 src/snort_packet_header.h | 59 src/ubi_BinTree.c | 1077 src/ubi_BinTree.h | 760 src/ubi_SplayTree.c | 396 src/ubi_SplayTree.h | 277 ChangeLog | 913 Makefile.am | 8 Makefile.in | 61 RELEASE.NOTES | 38 aclocal.m4 | 23 config.h.in | 113 configure | 9219 +++--- configure.in | 1165 debian/changelog | 11 debian/rules | 2 doc/CREDITS | 12 doc/INSTALL | 94 doc/Makefile.am | 3 doc/Makefile.in | 3 doc/README.INLINE | 44 doc/README.PerfProfiling | 12 doc/README.filters | 303 doc/README.frag3 | 16 doc/README.ftptelnet | 34 doc/README.http_inspect | 7 doc/README.multipleconfigs | 143 doc/README.reload | 132 doc/README.ssh | 86 doc/README.thresholding | 50 doc/snort_manual.tex |11666 ++++--- etc/Makefile.am | 2 etc/Makefile.in | 2 etc/gen-msg.map | 20 etc/snort.conf | 960 etc/threshold.conf | 72 rpm/snort.spec | 4 snort.8 | 9 snort.pc.in | 16 src/Makefile.am | 5 src/Makefile.in | 27 src/bounds.h | 12 src/build.h | 23 src/byte_extract.c | 28 src/byte_extract.h | 12 src/checksum.h | 4 src/cpuclock.h | 20 src/debug.c | 48 src/decode.c | 2499 + src/decode.h | 792 src/detect.c | 599 src/detect.h | 45 src/detection-plugins/Makefile.am | 110 src/detection-plugins/Makefile.in | 183 src/detection-plugins/detection_options.c | 264 src/detection-plugins/detection_options.h | 38 src/detection-plugins/sp_asn1.c | 16 src/detection-plugins/sp_asn1.h | 4 src/detection-plugins/sp_asn1_detect.c | 58 src/detection-plugins/sp_asn1_detect.h | 4 src/detection-plugins/sp_byte_check.c | 145 src/detection-plugins/sp_byte_check.h | 34 src/detection-plugins/sp_byte_jump.c | 93 src/detection-plugins/sp_byte_jump.h | 20 src/detection-plugins/sp_clientserver.c | 33 src/detection-plugins/sp_clientserver.h | 18 src/detection-plugins/sp_cvs.c | 42 src/detection-plugins/sp_cvs.h | 6 src/detection-plugins/sp_dsize_check.c | 6 src/detection-plugins/sp_dsize_check.h | 2 src/detection-plugins/sp_flowbits.c | 212 src/detection-plugins/sp_flowbits.h | 34 src/detection-plugins/sp_ftpbounce.c | 31 src/detection-plugins/sp_ftpbounce.h | 2 src/detection-plugins/sp_hdr_opt_wrap.c | 53 src/detection-plugins/sp_hdr_opt_wrap.h | 15 src/detection-plugins/sp_icmp_code_check.c | 8 src/detection-plugins/sp_icmp_code_check.h | 2 src/detection-plugins/sp_icmp_id_check.c | 6 src/detection-plugins/sp_icmp_id_check.h | 2 src/detection-plugins/sp_icmp_seq_check.c | 6 src/detection-plugins/sp_icmp_seq_check.h | 2 src/detection-plugins/sp_icmp_type_check.c | 6 src/detection-plugins/sp_icmp_type_check.h | 4 src/detection-plugins/sp_ip_fragbits.c | 30 src/detection-plugins/sp_ip_fragbits.h | 4 src/detection-plugins/sp_ip_id_check.c | 6 src/detection-plugins/sp_ip_id_check.h | 2 src/detection-plugins/sp_ip_proto.c | 6 src/detection-plugins/sp_ip_same_check.c | 6 src/detection-plugins/sp_ip_same_check.h | 2 src/detection-plugins/sp_ip_tos_check.c | 10 src/detection-plugins/sp_ip_tos_check.h | 2 src/detection-plugins/sp_ipoption_check.c | 6 src/detection-plugins/sp_ipoption_check.h | 2 src/detection-plugins/sp_isdataat.c | 30 src/detection-plugins/sp_isdataat.h | 13 src/detection-plugins/sp_pattern_match.c | 893 src/detection-plugins/sp_pattern_match.h | 24 src/detection-plugins/sp_pcre.c | 123 src/detection-plugins/sp_pcre.h | 18 src/detection-plugins/sp_react.c | 107 src/detection-plugins/sp_react.h | 12 src/detection-plugins/sp_replace.c | 579 src/detection-plugins/sp_replace.h | 50 src/detection-plugins/sp_respond.c | 163 src/detection-plugins/sp_respond.h | 7 src/detection-plugins/sp_respond2.c | 367 src/detection-plugins/sp_rpc_check.c | 6 src/detection-plugins/sp_rpc_check.h | 2 src/detection-plugins/sp_session.c | 34 src/detection-plugins/sp_session.h | 2 src/detection-plugins/sp_tcp_ack_check.c | 6 src/detection-plugins/sp_tcp_ack_check.h | 2 src/detection-plugins/sp_tcp_flag_check.c | 10 src/detection-plugins/sp_tcp_flag_check.h | 2 src/detection-plugins/sp_tcp_seq_check.c | 6 src/detection-plugins/sp_tcp_seq_check.h | 2 src/detection-plugins/sp_tcp_win_check.c | 16 src/detection-plugins/sp_tcp_win_check.h | 2 src/detection-plugins/sp_ttl_check.c | 6 src/detection-plugins/sp_ttl_check.h | 2 src/detection-plugins/sp_urilen_check.c | 8 src/detection-plugins/sp_urilen_check.h | 4 src/detection_filter.c | 145 src/detection_filter.h | 58 src/dynamic-examples/Makefile.am | 46 src/dynamic-examples/Makefile.in | 44 src/dynamic-examples/dynamic-preprocessor/Makefile.am | 9 src/dynamic-examples/dynamic-preprocessor/Makefile.in | 11 src/dynamic-examples/dynamic-preprocessor/spp_example.c | 154 src/dynamic-plugins/Makefile.am | 4 src/dynamic-plugins/Makefile.in | 7 src/dynamic-plugins/sf_convert_dynamic.c | 617 src/dynamic-plugins/sf_convert_dynamic.h | 28 src/dynamic-plugins/sf_dynamic_common.h | 7 src/dynamic-plugins/sf_dynamic_define.h | 29 src/dynamic-plugins/sf_dynamic_detection.h | 13 src/dynamic-plugins/sf_dynamic_engine.h | 26 src/dynamic-plugins/sf_dynamic_plugins.c | 353 src/dynamic-plugins/sf_dynamic_preprocessor.h | 70 src/dynamic-plugins/sf_engine/Makefile.am | 13 src/dynamic-plugins/sf_engine/Makefile.in | 13 src/dynamic-plugins/sf_engine/sf_snort_detection_engine.c | 437 src/dynamic-plugins/sf_engine/sf_snort_packet.h | 233 src/dynamic-plugins/sf_engine/sf_snort_plugin_api.h | 23 src/dynamic-plugins/sf_engine/sf_snort_plugin_content.c | 2 src/dynamic-plugins/sf_engine/sf_snort_plugin_hdropts.c | 2 src/dynamic-plugins/sf_preproc_example/sf_dynamic_preproc_lib.c | 25 src/dynamic-plugins/sf_preproc_example/sf_dynamic_preproc_lib.h | 9 src/dynamic-plugins/sp_dynamic.c | 273 src/dynamic-plugins/sp_dynamic.h | 40 src/dynamic-plugins/sp_preprocopt.c | 100 src/dynamic-plugins/sp_preprocopt.h | 43 src/dynamic-preprocessors/Makefile.am | 32 src/dynamic-preprocessors/Makefile.in | 32 src/dynamic-preprocessors/dcerpc/Makefile.am | 13 src/dynamic-preprocessors/dcerpc/Makefile.in | 16 src/dynamic-preprocessors/dcerpc/dcerpc.c | 46 src/dynamic-preprocessors/dcerpc/dcerpc.h | 58 src/dynamic-preprocessors/dcerpc/dcerpc_config.c | 176 src/dynamic-preprocessors/dcerpc/dcerpc_util.c | 4 src/dynamic-preprocessors/dcerpc/dcerpc_util.h | 8 src/dynamic-preprocessors/dcerpc/sf_dcerpc.dsp | 4 src/dynamic-preprocessors/dcerpc/sf_preproc_info.h | 4 src/dynamic-preprocessors/dcerpc/smb_andx_decode.c | 189 src/dynamic-preprocessors/dcerpc/smb_andx_decode.h | 18 src/dynamic-preprocessors/dcerpc/smb_andx_structs.h | 232 src/dynamic-preprocessors/dcerpc/smb_file_decode.c | 10 src/dynamic-preprocessors/dcerpc/smb_file_decode.h | 10 src/dynamic-preprocessors/dcerpc/smb_file_structs.h | 32 src/dynamic-preprocessors/dcerpc/smb_structs.h | 194 src/dynamic-preprocessors/dcerpc/snort_dcerpc.c | 257 src/dynamic-preprocessors/dcerpc/snort_dcerpc.h | 59 src/dynamic-preprocessors/dcerpc/spp_dcerpc.c | 347 src/dynamic-preprocessors/dcerpc/spp_dcerpc.h | 8 src/dynamic-preprocessors/dcerpc2/Makefile.am | 13 src/dynamic-preprocessors/dcerpc2/Makefile.in | 15 src/dynamic-preprocessors/dcerpc2/dce2_cl.c | 36 src/dynamic-preprocessors/dcerpc2/dce2_co.c | 506 src/dynamic-preprocessors/dcerpc2/dce2_co.h | 8 src/dynamic-preprocessors/dcerpc2/dce2_config.c | 321 src/dynamic-preprocessors/dcerpc2/dce2_config.h | 44 src/dynamic-preprocessors/dcerpc2/dce2_debug.c | 92 src/dynamic-preprocessors/dcerpc2/dce2_debug.h | 18 src/dynamic-preprocessors/dcerpc2/dce2_event.c | 15 src/dynamic-preprocessors/dcerpc2/dce2_event.h | 2 src/dynamic-preprocessors/dcerpc2/dce2_http.c | 4 src/dynamic-preprocessors/dcerpc2/dce2_list.h | 2 src/dynamic-preprocessors/dcerpc2/dce2_roptions.c | 198 src/dynamic-preprocessors/dcerpc2/dce2_session.h | 17 src/dynamic-preprocessors/dcerpc2/dce2_smb.c | 319 src/dynamic-preprocessors/dcerpc2/dce2_smb.h | 5 src/dynamic-preprocessors/dcerpc2/dce2_stats.h | 567 src/dynamic-preprocessors/dcerpc2/dce2_tcp.c | 2 src/dynamic-preprocessors/dcerpc2/dce2_utils.h | 2 src/dynamic-preprocessors/dcerpc2/includes/dcerpc.h | 2 src/dynamic-preprocessors/dcerpc2/includes/smb.h | 14 src/dynamic-preprocessors/dcerpc2/sf_dce2.dsp | 4 src/dynamic-preprocessors/dcerpc2/sf_preproc_info.h | 2 src/dynamic-preprocessors/dcerpc2/snort_dce2.c | 654 src/dynamic-preprocessors/dcerpc2/snort_dce2.h | 2 src/dynamic-preprocessors/dcerpc2/spp_dce2.c | 610 src/dynamic-preprocessors/dns/Makefile.am | 13 src/dynamic-preprocessors/dns/Makefile.in | 16 src/dynamic-preprocessors/dns/sf_dns.dsp | 4 src/dynamic-preprocessors/dns/sf_preproc_info.h | 4 src/dynamic-preprocessors/dns/spp_dns.c | 577 src/dynamic-preprocessors/dns/spp_dns.h | 63 src/dynamic-preprocessors/dynamic_preprocessors.dsp | 8 src/dynamic-preprocessors/ftptelnet/Makefile.am | 13 src/dynamic-preprocessors/ftptelnet/Makefile.in | 15 src/dynamic-preprocessors/ftptelnet/ftpp_eo_log.c | 2 src/dynamic-preprocessors/ftptelnet/ftpp_eo_log.h | 2 src/dynamic-preprocessors/ftptelnet/ftpp_si.c | 362 src/dynamic-preprocessors/ftptelnet/ftpp_si.h | 75 src/dynamic-preprocessors/ftptelnet/ftpp_ui_client_lookup.c | 1 src/dynamic-preprocessors/ftptelnet/ftpp_ui_config.c | 14 src/dynamic-preprocessors/ftptelnet/ftpp_ui_config.h | 30 src/dynamic-preprocessors/ftptelnet/ftpp_ui_server_lookup.c | 6 src/dynamic-preprocessors/ftptelnet/hi_util_kmap.c | 4 src/dynamic-preprocessors/ftptelnet/hi_util_xmalloc.c | 2 src/dynamic-preprocessors/ftptelnet/hi_util_xmalloc.h | 2 src/dynamic-preprocessors/ftptelnet/pp_ftp.c | 94 src/dynamic-preprocessors/ftptelnet/pp_telnet.c | 51 src/dynamic-preprocessors/ftptelnet/pp_telnet.h | 6 src/dynamic-preprocessors/ftptelnet/sf_ftptelnet.dsp | 4 src/dynamic-preprocessors/ftptelnet/sf_preproc_info.h | 5 src/dynamic-preprocessors/ftptelnet/snort_ftptelnet.c | 1098 src/dynamic-preprocessors/ftptelnet/snort_ftptelnet.h | 41 src/dynamic-preprocessors/ftptelnet/spp_ftptelnet.c | 480 src/dynamic-preprocessors/ftptelnet/spp_ftptelnet.h | 2 src/dynamic-preprocessors/libs/sfcommon.h | 4 src/dynamic-preprocessors/libs/sfdynamic_preproc_libs.dsp | 8 src/dynamic-preprocessors/libs/sfparser.c | 2 src/dynamic-preprocessors/libs/ssl.c | 34 src/dynamic-preprocessors/libs/ssl.h | 50 src/dynamic-preprocessors/sf_dynamic_initialize/sf_dynamic_initialize.dsp | 257 src/dynamic-preprocessors/smtp/Makefile.am | 13 src/dynamic-preprocessors/smtp/Makefile.in | 16 src/dynamic-preprocessors/smtp/sf_preproc_info.h | 4 src/dynamic-preprocessors/smtp/sf_smtp.dsp | 8 src/dynamic-preprocessors/smtp/smtp_config.c | 303 src/dynamic-preprocessors/smtp/smtp_config.h | 42 src/dynamic-preprocessors/smtp/smtp_log.c | 32 src/dynamic-preprocessors/smtp/smtp_log.h | 4 src/dynamic-preprocessors/smtp/smtp_normalize.c | 22 src/dynamic-preprocessors/smtp/smtp_normalize.h | 2 src/dynamic-preprocessors/smtp/smtp_util.c | 28 src/dynamic-preprocessors/smtp/smtp_util.h | 4 src/dynamic-preprocessors/smtp/smtp_xlink2state.c | 40 src/dynamic-preprocessors/smtp/smtp_xlink2state.h | 2 src/dynamic-preprocessors/smtp/snort_smtp.c | 928 src/dynamic-preprocessors/smtp/snort_smtp.h | 31 src/dynamic-preprocessors/smtp/spp_smtp.c | 326 src/dynamic-preprocessors/ssh/Makefile.am | 12 src/dynamic-preprocessors/ssh/Makefile.in | 15 src/dynamic-preprocessors/ssh/sf_preproc_info.h | 4 src/dynamic-preprocessors/ssh/sf_ssh.dsp | 4 src/dynamic-preprocessors/ssh/spp_ssh.c | 818 src/dynamic-preprocessors/ssh/spp_ssh.h | 82 src/dynamic-preprocessors/ssl/Makefile.am | 12 src/dynamic-preprocessors/ssl/Makefile.in | 15 src/dynamic-preprocessors/ssl/sf_preproc_info.h | 4 src/dynamic-preprocessors/ssl/sf_ssl.dsp | 8 src/dynamic-preprocessors/ssl/spp_ssl.c | 436 src/dynamic-preprocessors/ssl/spp_ssl.h | 47 src/event.h | 22 src/event_queue.c | 129 src/event_queue.h | 27 src/event_wrapper.c | 100 src/event_wrapper.h | 34 src/fpcreate.c | 2035 - src/fpcreate.h | 161 src/fpdetect.c | 634 src/fpdetect.h | 49 src/generators.h | 89 src/inline.c | 158 src/inline.h | 15 src/ipv6_port.h | 37 src/log.c | 111 src/log.h | 38 src/log_text.c | 52 src/log_text.h | 4 src/mempool.c | 80 src/mempool.h | 21 src/mstring.c | 501 src/mstring.h | 14 src/output-plugins/spo_alert_arubaaction.c | 13 src/output-plugins/spo_alert_fast.c | 27 src/output-plugins/spo_alert_full.c | 22 src/output-plugins/spo_alert_prelude.c | 48 src/output-plugins/spo_alert_sf_socket.c | 167 src/output-plugins/spo_alert_syslog.c | 62 src/output-plugins/spo_alert_test.c | 12 src/output-plugins/spo_alert_unixsock.c | 12 src/output-plugins/spo_alert_unixsock.h | 14 src/output-plugins/spo_csv.c | 18 src/output-plugins/spo_database.c | 207 src/output-plugins/spo_database.h | 2 src/output-plugins/spo_log_ascii.c | 42 src/output-plugins/spo_log_ascii.h | 2 src/output-plugins/spo_log_null.c | 8 src/output-plugins/spo_log_null.h | 2 src/output-plugins/spo_log_tcpdump.c | 57 src/output-plugins/spo_unified.c | 231 src/output-plugins/spo_unified.h | 3 src/output-plugins/spo_unified2.c | 352 src/output-plugins/spo_unified2.h | 143 src/parser.c |14914 +++++----- src/parser.h | 418 src/parser/IpAddrSet.c | 101 src/parser/IpAddrSet.h | 32 src/pcap_pkthdr32.h | 14 src/pcrm.c | 109 src/pcrm.h | 2 src/plugbase.c | 2242 - src/plugbase.h | 378 src/ppm.c | 421 src/ppm.h | 366 src/preprocessors/HttpInspect/client/hi_client.c | 486 src/preprocessors/HttpInspect/event_output/hi_eo_log.c | 4 src/preprocessors/HttpInspect/include/hi_client.h | 13 src/preprocessors/HttpInspect/include/hi_eo_events.h | 3 src/preprocessors/HttpInspect/include/hi_include.h | 30 src/preprocessors/HttpInspect/include/hi_si.h | 2 src/preprocessors/HttpInspect/include/hi_ui_config.h | 17 src/preprocessors/HttpInspect/include/hi_util_xmalloc.h | 2 src/preprocessors/HttpInspect/normalization/hi_norm.c | 5 src/preprocessors/HttpInspect/session_inspection/hi_si.c | 12 src/preprocessors/HttpInspect/user_interface/hi_ui_config.c | 54 src/preprocessors/HttpInspect/utils/hi_util_kmap.c | 4 src/preprocessors/HttpInspect/utils/hi_util_xmalloc.c | 2 src/preprocessors/Makefile.am | 3 src/preprocessors/Makefile.in | 5 src/preprocessors/Stream5/snort_stream5_icmp.c | 82 src/preprocessors/Stream5/snort_stream5_icmp.h | 12 src/preprocessors/Stream5/snort_stream5_session.c | 230 src/preprocessors/Stream5/snort_stream5_session.h | 31 src/preprocessors/Stream5/snort_stream5_tcp.c | 1359 src/preprocessors/Stream5/snort_stream5_tcp.h | 34 src/preprocessors/Stream5/snort_stream5_udp.c | 280 src/preprocessors/Stream5/snort_stream5_udp.h | 21 src/preprocessors/Stream5/stream5_common.c | 394 src/preprocessors/Stream5/stream5_common.h | 288 src/preprocessors/perf-base.c | 60 src/preprocessors/perf-base.h | 181 src/preprocessors/perf-event.c | 26 src/preprocessors/perf-event.h | 17 src/preprocessors/perf-flow.c | 87 src/preprocessors/perf-flow.h | 35 src/preprocessors/perf.c | 295 src/preprocessors/perf.h | 73 src/preprocessors/portscan.c | 488 src/preprocessors/portscan.h | 43 src/preprocessors/sfprocpidstats.c | 14 src/preprocessors/snort_httpinspect.c | 329 src/preprocessors/snort_httpinspect.h | 24 src/preprocessors/spp_arpspoof.c | 385 src/preprocessors/spp_bo.c | 311 src/preprocessors/spp_bo.h | 2 src/preprocessors/spp_frag3.c | 1775 - src/preprocessors/spp_frag3.h | 1 src/preprocessors/spp_httpinspect.c | 474 src/preprocessors/spp_httpinspect.h | 3 src/preprocessors/spp_perfmonitor.c | 456 src/preprocessors/spp_perfmonitor.h | 8 src/preprocessors/spp_rpc_decode.c | 1073 src/preprocessors/spp_sfportscan.c | 494 src/preprocessors/spp_sfportscan.h | 8 src/preprocessors/spp_stream5.c | 1628 - src/preprocessors/spp_stream5.h | 3 src/preprocessors/str_search.h | 6 src/preprocessors/stream_api.h | 53 src/preprocessors/stream_ignore.c | 22 src/preprocessors/stream_ignore.h | 8 src/preprocids.h | 89 src/profiler.c | 325 src/profiler.h | 24 src/rate_filter.c | 296 src/rate_filter.h | 51 src/rules.h | 166 src/sf_sdlist.c | 6 src/sf_types.h | 186 src/sfthreshold.c | 976 src/sfthreshold.h | 24 src/sfutil/Makefile.am | 7 src/sfutil/Makefile.in | 10 src/sfutil/acsmx.c | 25 src/sfutil/acsmx.h | 2 src/sfutil/acsmx2.c | 108 src/sfutil/acsmx2.h | 5 src/sfutil/asn1.c | 56 src/sfutil/asn1.h | 13 src/sfutil/bnfa_search.c | 95 src/sfutil/ipobj.c | 24 src/sfutil/mpse.c | 22 src/sfutil/mpse.h | 4 src/sfutil/sfActionQueue.c | 88 src/sfutil/sfActionQueue.h | 39 src/sfutil/sfPolicy.c | 507 src/sfutil/sfPolicy.h | 164 src/sfutil/sfPolicyUserData.c | 165 src/sfutil/sfPolicyUserData.h | 184 src/sfutil/sf_ip.c | 381 src/sfutil/sf_ip.h | 19 src/sfutil/sf_iph.c | 88 src/sfutil/sf_ipvar.c | 76 src/sfutil/sf_textlog.h | 2 src/sfutil/sf_vartable.c | 8 src/sfutil/sf_vartable.h | 4 src/sfutil/sfeventq.c | 205 src/sfutil/sfeventq.h | 67 src/sfutil/sfghash.c | 30 src/sfutil/sfghash.h | 1 src/sfutil/sfhashfcn.c | 65 src/sfutil/sfksearch.c | 54 src/sfutil/sfksearch.h | 5 src/sfutil/sflsq.c | 61 src/sfutil/sflsq.h | 38 src/sfutil/sfportobject.c | 155 src/sfutil/sfportobject.h | 14 src/sfutil/sfrf.c | 853 src/sfutil/sfrf.h | 182 src/sfutil/sfrt.c | 66 src/sfutil/sfrt.h | 22 src/sfutil/sfrt_dir.c | 30 src/sfutil/sfrt_dir.h | 8 src/sfutil/sfrt_trie.h | 15 src/sfutil/sfthd.c | 1169 src/sfutil/sfthd.h | 247 src/sfutil/sfxhash.c | 4 src/sfutil/util_math.c | 2 src/sfutil/util_math.h | 2 src/sfutil/util_net.c | 6 src/sfutil/util_net.h | 4 src/signature.c | 897 src/signature.h | 102 src/snort.c | 6872 ++-- src/snort.h | 1762 - src/snprintf.c | 2 src/spo_plugbase.h | 57 src/tag.c | 167 src/tag.h | 15 src/target-based/Makefile.am | 6 src/target-based/Makefile.in | 6 src/target-based/sf_attribute_table.y | 16 src/target-based/sf_attribute_table_parser.l | 13 src/target-based/sftarget_hostentry.c | 8 src/target-based/sftarget_hostentry.h | 8 src/target-based/sftarget_protocol_reference.c | 6 src/target-based/sftarget_protocol_reference.h | 6 src/target-based/sftarget_reader.c | 375 src/target-based/sftarget_reader.h | 36 src/util.c | 1314 src/util.h | 203 src/win32/Makefile.am | 1 src/win32/Makefile.in | 1 src/win32/WIN32-Code/inet_aton.c | 7 src/win32/WIN32-Code/misc.c | 4 src/win32/WIN32-Code/syslog.c | 46 src/win32/WIN32-Code/win32_service.c | 10 src/win32/WIN32-Includes/config.h | 18 src/win32/WIN32-Includes/stdint.h | 242 src/win32/WIN32-Prj/build_all.dsp | 8 src/win32/WIN32-Prj/sf_engine_initialize.dsp | 91 src/win32/WIN32-Prj/snort.dsp | 136 src/win32/WIN32-Prj/snort.dsw | 15 src/win32/WIN32-Prj/snort_initialize.dsp | 274 src/win32/WIN32-Prj/snort_installer.nsi | 12 529 files changed, 63685 insertions(+), 63409 deletions(-)
New commits: commit a340cc359b805a9ae1cda28ad0146744c3f9dc7f Author: Stig Thormodsrud <[email protected]> Date: Fri Apr 2 11:07:22 2010 -0700 2.8.5.2-vyatta-2 commit a5d70fdfdb74bc5b5ecd5e0dbf4fd2779fb7896b Author: Stig Thormodsrud <[email protected]> Date: Thu Apr 1 17:30:22 2010 -0700 add init pidfile (cherry picked from commit 64a19da20d9166570d2a73377f6efa95b0a9efc2) commit 076424bd26c3ec167dae86f8a10e7ed6c305ad27 Author: Stig Thormodsrud <[email protected]> Date: Thu Apr 1 15:49:57 2010 -0700 Revert "comment out loopback rule" This reverts commit 7f782a93e2652c83406e1e36dac78672747b57c1. (cherry picked from commit fcf593d281420d780999d1b66523c0d9a4d9f168) commit 12ddfa70fbb71764a2623d923b11619a3d0f8144 Author: Stig Thormodsrud <[email protected]> Date: Thu Apr 1 15:48:40 2010 -0700 comment out loopback rule (cherry picked from commit 7f782a93e2652c83406e1e36dac78672747b57c1) commit 50d6c880bb9af4c7d8b120b24b983350dd02b094 Author: Stig Thormodsrud <[email protected]> Date: Thu Apr 1 15:33:45 2010 -0700 Add vyatta section to snort.conf (cherry picked from commit 138bada4cf7c1e7a204044c885065dba22e80b1a) commit 0c587e5f4647ebac84587102109bbfb3b5e63b90 Author: Stig Thormodsrud <[email protected]> Date: Thu Apr 1 15:24:56 2010 -0700 create consistent pidfile (cherry picked from commit 24c63b08c9fa0611171c567ff884e2b373ffe9c8) commit 4b78e026662b9edf1724c30bfa67c8c0c49bc39b Author: Stig Thormodsrud <[email protected]> Date: Thu Apr 1 15:18:26 2010 -0700 Merge in snort-2.8.5.2 (cherry picked from commit 545e1da16112acf19e112153cd802321ea81db5c) http://suva.vyatta.com/git/?p=vyatta-snort.git;a=commitdiff;h=a340cc359b805a9ae1cda28ad0146744c3f9dc7f http://suva.vyatta.com/git/?p=vyatta-snort.git;a=commitdiff;h=a5d70fdfdb74bc5b5ecd5e0dbf4fd2779fb7896b http://suva.vyatta.com/git/?p=vyatta-snort.git;a=commitdiff;h=076424bd26c3ec167dae86f8a10e7ed6c305ad27 http://suva.vyatta.com/git/?p=vyatta-snort.git;a=commitdiff;h=12ddfa70fbb71764a2623d923b11619a3d0f8144 http://suva.vyatta.com/git/?p=vyatta-snort.git;a=commitdiff;h=50d6c880bb9af4c7d8b120b24b983350dd02b094 http://suva.vyatta.com/git/?p=vyatta-snort.git;a=commitdiff;h=0c587e5f4647ebac84587102109bbfb3b5e63b90 http://suva.vyatta.com/git/?p=vyatta-snort.git;a=commitdiff;h=4b78e026662b9edf1724c30bfa67c8c0c49bc39b _______________________________________________ svn mailing list [email protected] http://mailman.vyatta.com/mailman/listinfo/svn
