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 5ac56203689559251a49729f1b9b2194cc8961b2..05819901ef8777d770761e5e7de56049a69c0a72 100644 (file)
--- 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 4ac2141fa98f3b2fbd60541e37daee27e882fd45..7108b55ddea4c1ce4638569f32d6cb21c5e21818 100644 (file)
--- 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 aa96db558fe1d8eea37cda608421578d568414b6..a88d54850dc51c6d2b3bf673c40ba3e4e580f72b 100644 (file)
--- 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 75324a255669f21dc9cd87578cc70561d4371495..57f910ba31e0324fba640d9c04e825adc88db073 100644 (file)
--- 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 71f9548c44e7b736a828b0852051688e5311d61a..59a21f5dee3196b1a02beb40ad534bd2e8d5dafd 100644 (file)
--- 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 7b536b35f8c73582cb67ca4820eebd4f28a20c01..7a7f89ebdccf2cc713c901c5d604ddedfa8d9f80 100644 (file)
--- 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 28c18e91e0417617b69f6d41d166be59fb0bbc6c..d01198f1356a44b31d6752148b46ccc2e81e7ce4 100644 (file)
--- 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