1 files changed, 36 insertions, 28 deletions
diff --git a/project2/proj2_s4498062/dns_server.py b/project2/proj2_s4498062/dns_server.py
index f1d4b09..0fcf981 100644
--- a/project2/proj2_s4498062/dns_server.py
+++ b/project2/proj2_s4498062/dns_server.py
@@ -1,28 +1,36 @@
-#!/usr/bin/env python2
-
-""" DNS server
-
-This script contains the code for starting a DNS server.
-"""
-
-import dns.server
-
-if __name__ == "__main__":
-    # Parse arguments
-    import argparse
-    parser = argparse.ArgumentParser(description="DNS Server")
-    parser.add_argument("-c", "--caching", action="store_true",
-            help="Enable caching")
-    parser.add_argument("-t", "--ttl", metavar="time", type=int, default=0, 
-            help="TTL value of cached entries (if > 0)")
-    parser.add_argument("-p", "--port", type=int, default=5353,
-            help="Port which server listens on")
-    args = parser.parse_args()
-
-    # Start server
-    server = dns.server.Server(args.port, args.caching, args.ttl)
-    try:
-        server.serve()
-    except KeyboardInterrupt:
-        server.shutdown()
-        print()
+#!/usr/bin/env python2
+
+""" DNS server
+
+This script contains the code for starting a DNS server.
+"""
+
+import dns.server
+
+def main():
+    """Run the server"""
+    # Parse arguments
+    import argparse
+    parser = argparse.ArgumentParser(description="DNS Server")
+    parser.add_argument(
+        "-c", "--caching", action="store_true",
+        help="Enable caching")
+    parser.add_argument(
+        "-t", "--ttl", metavar="time", type=int, default=0,
+        help="TTL value of cached entries (if > 0)")
+    parser.add_argument(
+        "-p", "--port", type=int, default=5353,
+        help="Port which server listens on")
+    args = parser.parse_args()
+
+    # Start server
+    server = dns.server.Server(args.port, args.caching, args.ttl)
+    try:
+        server.serve()
+    except KeyboardInterrupt:
+        server.shutdown()
+        print()
+
+if __name__ == "__main__":
+    main()
+