From: Josh Date: Thu, 11 Dec 2014 16:20:41 +0000 (-0600) Subject: pulling in latest from Russ X-Git-Tag: 3.0.0-233~1089^2~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ab8a45bc0e61437bdedd14567afc925c4bca36f;p=thirdparty%2Fsnort3.git pulling in latest from Russ --- 1ab8a45bc0e61437bdedd14567afc925c4bca36f diff --cc extra/FindSnort.cmake index c646a7467,79288ca2f..8a0cdffc3 --- a/extra/FindSnort.cmake +++ b/extra/FindSnort.cmake @@@ -1,25 -1,25 +1,4 @@@ --## Copyright (C) 2014 Cisco and/or its affiliates. All rights reserved. --## This program is free software; you can redistribute it and/or modify --## it under the terms of the GNU General Public License Version 2 as --## published by the Free Software Foundation. You may not use, modify or --## distribute this program under any other version of the GNU General --## Public License. --## --## This program is distributed in the hope that it will be useful, --## but WITHOUT ANY WARRANTY; without even the implied warranty of --## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --## GNU General Public License for more details. --## --## You should have received a copy of the GNU General Public License --## along with this program; if not, write to the Free Software --## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -- --# # --# Locate DAQ library --# This module defines --# DAQ_FOUND, if false, do not try to link to Lua --# # SNORT_FOUND - Found Snort # SNORT_EXECUTABLE - The Snort++ executable # SNORT_INCLUDE_DIR - Snort include directory diff --cc src/codecs/ip/cd_routing.cc index d15efd0aa,d15efd0aa..886d41785 --- a/src/codecs/ip/cd_routing.cc +++ b/src/codecs/ip/cd_routing.cc @@@ -71,7 -71,7 +71,7 @@@ struct IP6Route uint8_t ip6rte0_seg_left; uint8_t ip6rte0_reserved; uint8_t ip6rte0_bitmap[3]; -- struct in6_addr ip6rte0_addr[1]; /* Up to 23 IP6 addresses */ ++ struct snort_in6_addr ip6rte0_addr[1]; /* Up to 23 IP6 addresses */ } ; #endif