From: davis mcpherson <davis.mcpherson@gmail.com>
Date: Tue, 26 Apr 2016 12:51:48 +0000 (-0400)
Subject: fix copyright, uncrustify, alpha order file lists in Makefile.am
X-Git-Tag: 3.0.0-233~422^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=12a43bb4e01c86831bcba4fefc4a33ea73e14662;p=thirdparty%2Fsnort3.git

fix copyright, uncrustify, alpha order file lists in Makefile.am
---

diff --git a/src/stream/libtcp/tcp_stream_session.cc b/src/stream/libtcp/tcp_stream_session.cc
index 5ac562036..05819901e 100644
--- a/src/stream/libtcp/tcp_stream_session.cc
+++ b/src/stream/libtcp/tcp_stream_session.cc
@@ -1,5 +1,5 @@
 //--------------------------------------------------------------------------
-// Copyright (C) 2015-2015 Cisco and/or its affiliates. All rights reserved.
+// Copyright (C) 2015-2016 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
diff --git a/src/stream/libtcp/tcp_stream_session.h b/src/stream/libtcp/tcp_stream_session.h
index 4ac2141fa..7108b55dd 100644
--- a/src/stream/libtcp/tcp_stream_session.h
+++ b/src/stream/libtcp/tcp_stream_session.h
@@ -1,5 +1,5 @@
 //--------------------------------------------------------------------------
-// Copyright (C) 2015-2015 Cisco and/or its affiliates. All rights reserved.
+// Copyright (C) 2015-2016 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
diff --git a/src/stream/tcp/CMakeLists.txt b/src/stream/tcp/CMakeLists.txt
index aa96db558..a88d54850 100644
--- a/src/stream/tcp/CMakeLists.txt
+++ b/src/stream/tcp/CMakeLists.txt
@@ -1,8 +1,10 @@
 add_library( stream_tcp STATIC
-    stream_tcp.cc
-    stream_tcp.h
+    ips_stream_reassemble.cc
+    ips_stream_size.cc
     segment_overlap_editor.h
     segment_overlap_editor.cc
+    stream_tcp.cc
+    stream_tcp.h
     tcp_module.cc
     tcp_module.h
     tcp_defs.h
@@ -50,8 +52,6 @@ add_library( stream_tcp STATIC
     tcp_state_time_wait.h 
     tcp_stream_state_machine.cc
     tcp_stream_state_machine.h
-    ips_stream_reassemble.cc
-    ips_stream_size.cc
 )
 
 add_subdirectory ( test )
diff --git a/src/stream/tcp/Makefile.am b/src/stream/tcp/Makefile.am
index 75324a255..57f910ba3 100644
--- a/src/stream/tcp/Makefile.am
+++ b/src/stream/tcp/Makefile.am
@@ -2,10 +2,12 @@
 noinst_LIBRARIES = libstream_tcp.a
 
 libstream_tcp_a_SOURCES = \
-stream_tcp.cc \
-stream_tcp.h \
+ips_stream_reassemble.cc \
+ips_stream_size.cc \
 segment_overlap_editor.h \
 segment_overlap_editor.cc \
+stream_tcp.cc \
+stream_tcp.h \
 tcp_module.cc \
 tcp_module.h \
 tcp_debug_trace.h \
@@ -28,8 +30,6 @@ tcp_tracker.cc \
 tcp_tracker.h \
 tcp_session.cc \
 tcp_session.h \
-tcp_stream_state_machine.cc \
-tcp_stream_state_machine.h \
 tcp_state_closed.cc \
 tcp_state_close_wait.cc \
 tcp_state_closing.cc \
@@ -54,8 +54,8 @@ tcp_state_none.h \
 tcp_state_syn_recv.h \
 tcp_state_syn_sent.h \
 tcp_state_time_wait.h \
-ips_stream_reassemble.cc \
-ips_stream_size.cc
+tcp_stream_state_machine.cc \
+tcp_stream_state_machine.h
 
 #if BUILD_CPPUTESTS
 #SUBDIRS = test
diff --git a/src/stream/tcp/tcp_normalizers.cc b/src/stream/tcp/tcp_normalizers.cc
index 71f9548c4..59a21f5de 100644
--- a/src/stream/tcp/tcp_normalizers.cc
+++ b/src/stream/tcp/tcp_normalizers.cc
@@ -23,7 +23,6 @@
 #include "tcp_module.h"
 #include "tcp_normalizers.h"
 
-
 class TcpNormalizerFirst : public TcpNormalizer
 {
 public:
diff --git a/src/stream/tcp/tcp_stream_state_machine.cc b/src/stream/tcp/tcp_stream_state_machine.cc
index 7b536b35f..7a7f89ebd 100644
--- a/src/stream/tcp/tcp_stream_state_machine.cc
+++ b/src/stream/tcp/tcp_stream_state_machine.cc
@@ -1,5 +1,5 @@
 //--------------------------------------------------------------------------
-// Copyright (C) 2015-2015 Cisco and/or its affiliates. All rights reserved.
+// Copyright (C) 2015-2016 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
diff --git a/src/stream/tcp/tcp_stream_state_machine.h b/src/stream/tcp/tcp_stream_state_machine.h
index 28c18e91e..d01198f13 100644
--- a/src/stream/tcp/tcp_stream_state_machine.h
+++ b/src/stream/tcp/tcp_stream_state_machine.h
@@ -1,5 +1,5 @@
 //--------------------------------------------------------------------------
-// Copyright (C) 2015-2015 Cisco and/or its affiliates. All rights reserved.
+// Copyright (C) 2015-2016 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