Commits

Tim Tomes committed d1011f5

Made minor aesthetic changes to the code.

Comments (0)

Files changed (1)

     parser.add_argument('-l', help='list input mode. path to list file.', dest='list_file', action='store')
     parser.add_argument('-x', help='xml input mode. path to Nessus/Nmap XML file.', dest='xml_file', action='store')
     parser.add_argument('-s', help='single input mode. path to target, remote URL or local path.', dest='target', action='store')
-    parser.add_argument('-t', help='socket timeout in seconds. default is 8 seconds.', dest='timeout', type=int, action='store')
     parser.add_argument('-o', help='output directory', dest='output', action='store')
+    parser.add_argument('-t', help='socket timeout in seconds. default is 8 seconds.', dest='timeout', type=int, action='store')
     parser.add_argument('-v', help='verbose mode', dest='verbose', action='store_true', default=False)
     parser.add_argument('-b', help='open results in browser', dest='browser', action='store_true', default=False)
     opts = parser.parse_args()
 
     # process options
+    # input source
     if opts.list_file:
         try:
             targets = open(opts.list_file).read().split()
     else:
         print '[!] Input mode required.'
         return
-    timeout = opts.timeout if opts.timeout else 8
-
-    # setup data storage location
+    # storage location
     if opts.output:
         directory = opts.output
         if os.path.isdir(directory):
     else:
         random.seed()
         directory = time.strftime('%y%m%d_%H%M%S', time.localtime()) + '_%04d' % random.randint(1, 10000)
+    # connection timeout
+    timeout = opts.timeout if opts.timeout else 8
 
     print '[*] Analyzing %d targets.' % (len(targets))
     print '[*] Storing data in \'%s/\'' % (directory)