diff options
author | Aldo Cortesi <aldo@corte.si> | 2013-12-08 01:09:46 -0800 |
---|---|---|
committer | Aldo Cortesi <aldo@corte.si> | 2013-12-08 01:09:46 -0800 |
commit | 7aeaf9d4488d57c012cd1252ba5d0b2d6dcd1894 (patch) | |
tree | 6500a7d1c84226d343227244642ae29e2c9e4205 /libmproxy/flow.py | |
parent | 2956c144d30558141ec43bec798a424974ffa6f1 (diff) | |
parent | bb4748fb8f5dd5ef6bc7bf70ee4e6db7ad019f28 (diff) | |
download | mitmproxy-7aeaf9d4488d57c012cd1252ba5d0b2d6dcd1894.tar.gz mitmproxy-7aeaf9d4488d57c012cd1252ba5d0b2d6dcd1894.tar.bz2 mitmproxy-7aeaf9d4488d57c012cd1252ba5d0b2d6dcd1894.zip |
Merge pull request #161 from mitmproxy/external_webapp
External webapp
Diffstat (limited to 'libmproxy/flow.py')
-rw-r--r-- | libmproxy/flow.py | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/libmproxy/flow.py b/libmproxy/flow.py index a4e9136b..b6770806 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -2,7 +2,7 @@ This module provides more sophisticated flow tracking. These match requests with their responses, and provide filtering and interception facilities. """ -import hashlib, Cookie, cookielib, copy, re, urlparse, os +import hashlib, Cookie, cookielib, copy, re, urlparse, os, threading import time, urllib import tnetstring, filt, script, utils, encoding, proxy from email.utils import parsedate_tz, formatdate, mktime_tz @@ -1367,17 +1367,19 @@ class FlowMaster(controller.Master): self.stream = None app.mapp.config["PMASTER"] = self - def start_app(self, domain, ip): - self.server.apps.add( - app.mapp, - domain, - 80 - ) - self.server.apps.add( - app.mapp, - ip, - 80 - ) + def start_app(self, host, port, external): + if not external: + self.server.apps.add( + app.mapp, + host, + port + ) + else: + print host + threading.Thread(target=app.mapp.run,kwargs={ + "use_reloader": False, + "host": host, + "port": port}).start() def add_event(self, e, level="info"): """ |