From 0358c3416cd3c7603312051f05e274719d65b9ae Mon Sep 17 00:00:00 2001 From: Dominik Pataky Date: Tue, 31 Mar 2020 16:28:33 +0200 Subject: [PATCH] Fix logger in collector; fix header dates --- netflow/__init__.py | 2 +- netflow/analyzer.py | 2 +- netflow/collector.py | 4 ++-- netflow/utils.py | 2 +- netflow/v9.py | 2 +- test_netflow.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/netflow/__init__.py b/netflow/__init__.py index abb1297..b4e0a8a 100644 --- a/netflow/__init__.py +++ b/netflow/__init__.py @@ -3,7 +3,7 @@ """ This file belongs to https://github.com/bitkeks/python-netflow-v9-softflowd. -Copyright 2017-2020 Dominik Pataky +Copyright 2016-2020 Dominik Pataky Licensed under MIT License. See LICENSE. """ diff --git a/netflow/analyzer.py b/netflow/analyzer.py index ed2d70e..b84a00f 100644 --- a/netflow/analyzer.py +++ b/netflow/analyzer.py @@ -4,7 +4,7 @@ Reference analyzer script for NetFlow Python package. This file belongs to https://github.com/bitkeks/python-netflow-v9-softflowd. -Copyright 2017-2020 Dominik Pataky +Copyright 2016-2020 Dominik Pataky Licensed under MIT License. See LICENSE. """ diff --git a/netflow/collector.py b/netflow/collector.py index 1c16908..abc1832 100644 --- a/netflow/collector.py +++ b/netflow/collector.py @@ -4,7 +4,7 @@ Reference collector script for NetFlow v1, v5, and v9 Python package. This file belongs to https://github.com/bitkeks/python-netflow-v9-softflowd. -Copyright 2017-2020 Dominik Pataky +Copyright 2016-2020 Dominik Pataky Licensed under MIT License. See LICENSE. """ import argparse @@ -38,7 +38,7 @@ class QueuingRequestHandler(socketserver.BaseRequestHandler): def handle(self): data = self.request[0] # get content, [1] would be the socket self.server.queue.put(RawPacket(time.time(), self.client_address, data)) - logging.debug( + logger.debug( "Received %d bytes of data from %s", len(data), self.client_address ) diff --git a/netflow/utils.py b/netflow/utils.py index 33028ac..767897a 100644 --- a/netflow/utils.py +++ b/netflow/utils.py @@ -3,7 +3,7 @@ """ This file belongs to https://github.com/bitkeks/python-netflow-v9-softflowd. -Copyright 2017-2020 Dominik Pataky +Copyright 2016-2020 Dominik Pataky Licensed under MIT License. See LICENSE. """ diff --git a/netflow/v9.py b/netflow/v9.py index 613bdd0..1493a59 100644 --- a/netflow/v9.py +++ b/netflow/v9.py @@ -8,7 +8,7 @@ Created for learning purposes and unsatisfying alternatives. Reference: https://www.cisco.com/en/US/technologies/tk648/tk362/technologies_white_paper09186a00800a3db9.html This script is specifically implemented in combination with softflowd. See https://github.com/djmdjm/softflowd -Copyright 2017, 2018 Dominik Pataky +Copyright 2016-2020 Dominik Pataky Licensed under MIT License. See LICENSE. """ diff --git a/test_netflow.py b/test_netflow.py index 12667cd..cb7041f 100755 --- a/test_netflow.py +++ b/test_netflow.py @@ -5,7 +5,7 @@ This file contains tests for the NetFlow collector for versions 1, 5 and 9. The test packets (defined below as hex streams) were extracted from "real" softflowd exports based on a sample PCAP capture file. -Copyright 2017-2020 Dominik Pataky +Copyright 2016-2020 Dominik Pataky Licensed under MIT License. See LICENSE. """ import gzip