Merge pull request #1172 from cortesi/solidcore

First steps to solidifying the core

2 files changed, 8 insertions, 11 deletions

diff --git a/examples/flowbasic b/examples/flowbasic
index 4a87b86a..d8d55caa 100644..100755
--- a/examples/flowbasic
+++ b/examples/flowbasic
@@ -8,7 +8,7 @@
     Note that request and response messages are not automatically replied to,
     so we need to implement handlers to do this.
 """
-from mitmproxy import flow
+from mitmproxy import flow, controller
 from mitmproxy.proxy import ProxyServer, ProxyConfig
 
 
@@ -19,18 +19,15 @@ class MyMaster(flow.FlowMaster):
         except KeyboardInterrupt:
             self.shutdown()
 
+    @controller.handler
     def handle_request(self, f):
         f = flow.FlowMaster.handle_request(self, f)
-        if f:
-            f.reply()
-        return f
+        print(f)
 
+    @controller.handler
     def handle_response(self, f):
         f = flow.FlowMaster.handle_response(self, f)
-        if f:
-            f.reply()
         print(f)
-        return f
 
 
 config = ProxyConfig(
diff --git a/examples/stickycookies b/examples/stickycookies
index 8f11de8d..43e5371d 100644..100755
--- a/examples/stickycookies
+++ b/examples/stickycookies
@@ -21,19 +21,19 @@ class StickyMaster(controller.Master):
         except KeyboardInterrupt:
             self.shutdown()
 
-    def handle_request(self, flow):
+    @controller.handler
+    def request(self, flow):
         hid = (flow.request.host, flow.request.port)
         if "cookie" in flow.request.headers:
             self.stickyhosts[hid] = flow.request.headers.get_all("cookie")
         elif hid in self.stickyhosts:
             flow.request.headers.set_all("cookie", self.stickyhosts[hid])
-        flow.reply()
 
-    def handle_response(self, flow):
+    @controller.handler
+    def response(self, flow):
         hid = (flow.request.host, flow.request.port)
         if "set-cookie" in flow.response.headers:
             self.stickyhosts[hid] = flow.response.headers.get_all("set-cookie")
-        flow.reply()
 
 
 config = proxy.ProxyConfig(port=8080)