From 5180ba5af2ee3e90d48a414f54db12e194a00319 Mon Sep 17 00:00:00 2001 From: Daniel Borkmann Date: Sun, 5 May 2013 13:30:05 +0200 Subject: oui: minor: rename update file Signed-off-by: Daniel Borkmann --- oui-update.py | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ update-oui.py | 81 ----------------------------------------------------------- 2 files changed, 81 insertions(+), 81 deletions(-) create mode 100755 oui-update.py delete mode 100755 update-oui.py diff --git a/oui-update.py b/oui-update.py new file mode 100755 index 0000000..52af122 --- /dev/null +++ b/oui-update.py @@ -0,0 +1,81 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# +# update-oui.py -- update netsniff-ng oui.conf from official IEEE OUI list +# +# Copyright (C) 2013 Tobias Klauser +# +# 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. + +import os +import sys +import re +import getopt +try: + from urllib2 import urlopen # Python 2.x +except ImportError: + from urllib.request import urlopen # Python 3.x + +DEFAULT_OUPUT_FILE = "oui.conf" +DEFAULT_OUI_URL = "http://standards.ieee.org/develop/regauth/oui/oui.txt" + +OUI_PATTERN = re.compile(b"^\s*([a-fA-F0-9]{2})-([a-fA-F0-9]{2})-([a-fA-F0-9]{2})\s+\(hex\)\s+(.*)$") + +def usage(): + print("""usage: {0} [OPTION...] +available options: + -f force overwrite of existing file + -o set output file (default: {1}) + -u set URL to fetch OUI list from (default: {2}) + -h show this help and exit""".format(os.path.basename(sys.argv[0]), + DEFAULT_OUPUT_FILE, DEFAULT_OUI_URL)) + +def main(): + try: + opts, args = getopt.getopt(sys.argv[1:], "fo:u:h") + except getopt.GetoptError as err: + print(str(err)) + usage() + sys.exit(-1) + + overwrite = False + output_file = DEFAULT_OUPUT_FILE + oui_url = DEFAULT_OUI_URL + for o, a in opts: + if o == '-f': + overwrite = True + elif o == '-o': + output_file = a + elif o == '-u': + oui_url = a + elif o == '-h': + usage() + sys.exit(0) + else: + assert False, "unhandled option" + + if not overwrite and os.path.exists(output_file): + print("Eror: output file {} already exists".format(output_file)) + sys.exit(-1) + + print("Updating OUI information in {} from {}... ".format(output_file, oui_url)) + + fh_file = open(output_file, 'w') + fh_url = urlopen(oui_url) + + n = 0 + for line in fh_url: + m = OUI_PATTERN.match(line) + if m: + fh_file.write("0x{}{}{}, {}\n".format(m.group(1), m.group(2), m.group(3), m.group(4))) + n += 1 + + print("{} OUIs written to {}".format(n, output_file)) + + fh_url.close() + fh_file.close() + +if __name__ == '__main__': + main() diff --git a/update-oui.py b/update-oui.py deleted file mode 100755 index 52af122..0000000 --- a/update-oui.py +++ /dev/null @@ -1,81 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# -# update-oui.py -- update netsniff-ng oui.conf from official IEEE OUI list -# -# Copyright (C) 2013 Tobias Klauser -# -# 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. - -import os -import sys -import re -import getopt -try: - from urllib2 import urlopen # Python 2.x -except ImportError: - from urllib.request import urlopen # Python 3.x - -DEFAULT_OUPUT_FILE = "oui.conf" -DEFAULT_OUI_URL = "http://standards.ieee.org/develop/regauth/oui/oui.txt" - -OUI_PATTERN = re.compile(b"^\s*([a-fA-F0-9]{2})-([a-fA-F0-9]{2})-([a-fA-F0-9]{2})\s+\(hex\)\s+(.*)$") - -def usage(): - print("""usage: {0} [OPTION...] -available options: - -f force overwrite of existing file - -o set output file (default: {1}) - -u set URL to fetch OUI list from (default: {2}) - -h show this help and exit""".format(os.path.basename(sys.argv[0]), - DEFAULT_OUPUT_FILE, DEFAULT_OUI_URL)) - -def main(): - try: - opts, args = getopt.getopt(sys.argv[1:], "fo:u:h") - except getopt.GetoptError as err: - print(str(err)) - usage() - sys.exit(-1) - - overwrite = False - output_file = DEFAULT_OUPUT_FILE - oui_url = DEFAULT_OUI_URL - for o, a in opts: - if o == '-f': - overwrite = True - elif o == '-o': - output_file = a - elif o == '-u': - oui_url = a - elif o == '-h': - usage() - sys.exit(0) - else: - assert False, "unhandled option" - - if not overwrite and os.path.exists(output_file): - print("Eror: output file {} already exists".format(output_file)) - sys.exit(-1) - - print("Updating OUI information in {} from {}... ".format(output_file, oui_url)) - - fh_file = open(output_file, 'w') - fh_url = urlopen(oui_url) - - n = 0 - for line in fh_url: - m = OUI_PATTERN.match(line) - if m: - fh_file.write("0x{}{}{}, {}\n".format(m.group(1), m.group(2), m.group(3), m.group(4))) - n += 1 - - print("{} OUIs written to {}".format(n, output_file)) - - fh_url.close() - fh_file.close() - -if __name__ == '__main__': - main() -- cgit v1.2.3-54-g00ecf