Changeset 18 for test/blackhat-demo/jregistrate-collect

Timestamp:

08/01/15 19:04:49 (9 years ago)

Author:

tim

Message:

.

File:

• test/blackhat-demo/jregistrate-collect (modified) (9 diffs)

test/blackhat-demo/jregistrate-collect

@@ -34 +34 @@
 parser = argparse.ArgumentParser(
     description="")
-parser.add_argument('-c', dest='cases', type=str, default='{"valid":"0012-5969","invalid":"0012-9999"}',
-                    help='JSON representation of echo timing cases.')
-parser.add_argument('--no-tcpts', action='store_true', help='Disbale TCP timestamp profiling')
+parser.add_argument('--no-tcpts', action='store_true', help='Disable TCP timestamp profiling')
 parser.add_argument('--no-control', action='store_true', help='Do not collect separate control data.  Instead, synthesize it from test and train data.')
 parser.add_argument('session_name', default=None,
@@ -55 +53 @@
 protocol = 'http'
 
-cases = json.loads(options.cases)
+cases = {"valid":"0012-8846","invalid":"0012-9999"}
 
 
@@ -69 +67 @@
 
 
-def sendRequest(data=None):
+def sendRequest(case_data):
     method = 'POST'
     path = '/jregistrate/register'
     url = "%s://%s:%d%s" % (protocol,hostname,port,path)
     headers = {"Content-Type":"application/x-www-form-urlencoded"}
-    body = (b'member_id='+data.encode('utf-8')+b'&last_four=1111&zip_code=97219&username=bob&password=&conf_pwd=')
+    body = (b'member_id='+case_data.encode('utf-8')+b'&last_four=1111&zip_code=97219&username=bob&password=&conf_pwd=')
     req = requests.Request(method, url, headers=headers, data=body).prepare()
 
@@ -82 +80 @@
             session = requests.Session()
             response = session.send(req, verify=False)
-            #print(repr(response.raw._original_response.local_address))
             reported = extractReportedRuntime(response.headers, response.text)
             retry = False
@@ -89 +86 @@
             time.sleep(1.0)
             sys.stderr.write("ERROR: retrying...\n")
-        #print(data.encode('utf-8'), reported)
         
     return {'userspace_rtt':response.elapsed.microseconds*1000,
@@ -170 +166 @@
                 sample_order[i] = (sample_order[i][0],sample_order[0][1])
             random.shuffle(sample_order)
-            #print('after', sample_order)
             
         results = []
@@ -179 +174 @@
                                  sample_order[i][1]))
 
-        #print(results)
         db.addProbes(results)
         db.conn.commit()
@@ -185 +179 @@
 
         if (time.time() > next_report):
-            #s = time.time()
             reportProgress(db, sample_types, start)
-            #print("reportProgress time:", time.time()-s)
             next_report += report_interval
 
@@ -194 +186 @@
 stopSniffer(sniffer)
 
-start = time.time()
 associatePackets(sniffer_fp, db)
 sniffer_fp.close()
-end = time.time()
-print("associate time:", end-start)
 
 if options.no_control: