dprevot/netflow
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix merge for Python3

Browse source
This commit is contained in:
Dominik Pataky 2017-10-28 17:34:55 +02:00
parent 9df5bd426e
commit 92d8e724bf
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
main.py
View file

@ -1,8 +1,14 @@
#!/usr/bin/env python3
import logging import logging
import argparse import argparse
import sys import sys
import SocketServer import socketserver
from netflow.collector_v9 import ExportPacket
try:
from netflow.collector_v9 import ExportPacket
except ImportError:
print("Netflow v9 not installed as package! Running from directory.")
from src.netflow.collector_v9 import ExportPacket
logging.getLogger().setLevel(logging.INFO) logging.getLogger().setLevel(logging.INFO)
ch = logging.StreamHandler(sys.stdout) ch = logging.StreamHandler(sys.stdout)
@ -19,7 +25,7 @@ parser.add_argument('-cport', type=int, default=2055,
help='collector listener port') help='collector listener port')
class SoftflowUDPHandler(SocketServer.BaseRequestHandler): class SoftflowUDPHandler(socketserver.BaseRequestHandler):
# We need to save the templates our NetFlow device # We need to save the templates our NetFlow device
# send over time. Templates are not resended every # send over time. Templates are not resended every
# time a flow is sent to the collector. # time a flow is sent to the collector.
@ -28,7 +34,7 @@ class SoftflowUDPHandler(SocketServer.BaseRequestHandler):
@classmethod @classmethod
def get_server(cls, host, port): def get_server(cls, host, port):
logging.info("Listening on interface {}:{}".format(host, port)) logging.info("Listening on interface {}:{}".format(host, port))
server = SocketServer.UDPServer((host, port), cls) server = socketserver.UDPServer((host, port), cls)
return server return server
def handle(self): def handle(self):

11
setup.py
View file

@ -1,16 +1,15 @@
#!/usr/bin/env python #!/usr/bin/env python3
from setuptools import setup, find_packages from setuptools import setup, find_packages
import os import os
data_files = [(d, [os.path.join(d, f) for f in files]) data_files = [(d, [os.path.join(d, f) for f in files])
for d, folders, files in os.walk(os.path.join('src', 'config'))] for d, folders, files in os.walk(os.path.join('src', 'config'))]
setup(name='python-netflow-v9-softflowd', setup(name='netflow-v9',
version='1.0', version='0.5',
description='NetFlow v9 parser and collector implemented in Python 3. Developed to be used with softflowd v0.9.9', description='NetFlow v9 parser and collector implemented in Python 3. Developed to be used with softflowd v0.9.9',
author='coox', author='Dominik Pataky',
author_email='gro.rotarocedten@mod', author_email='dom@netdecorator.org',
packages=find_packages('src'), packages=find_packages('src'),
package_dir={'': 'src'}, package_dir={'': 'src'},
) )