From 68c9c7e1bd0a6a12f448962953d14bb3c8020adf Mon Sep 17 00:00:00 2001
From: byt3bl33d3r <byt3bl33d3r@gmail.com>
Date: Tue, 10 Mar 2015 23:26:32 +0100
Subject: [PATCH] - Fixed Responder plugin calling wrong var - Modified output

---
 libs/responder/Responder.py |  4 ----
 mitmf.py                    | 10 ++++------
 plugins/Responder.py        | 11 +++++++++--
 plugins/SSLstrip+.py        |  2 ++
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/libs/responder/Responder.py b/libs/responder/Responder.py
index 4bebcac..6ade61f 100755
--- a/libs/responder/Responder.py
+++ b/libs/responder/Responder.py
@@ -2503,10 +2503,6 @@ def start_responder(options, ip_address, config):
 
     AnalyzeICMPRedirect()
 
-    print "[*] NBT-NS, LLMNR & MDNS Responder v%s by Laurent Gaffie online" % VERSION
-    if AnalyzeMode:
-        print '[*] Responder is in analyze mode. No NBT-NS, LLMNR, MDNS requests will be poisoned\n'
-
     start_message = "Responder will redirect requests to: %s\n" % ip_address
     start_message += "Challenge set: %s\n" % NumChal
     start_message += "WPAD Proxy Server: %s\n" % WPAD_On_Off
diff --git a/mitmf.py b/mitmf.py
index a736cef..1e989ac 100755
--- a/mitmf.py
+++ b/mitmf.py
@@ -131,8 +131,7 @@ rootLogger.addHandler(fileHandler)
 #####################################################################################################
 
 #All our options should be loaded now, pass them onto plugins
-print "[*] MITMf v%s started... initializing plugins" % mitmf_version
-print "[*] sergio-proxy v%s online" % sergio_version
+print "[*] MITMf v%s online... initializing plugins" % mitmf_version
 
 load = []
 
@@ -170,10 +169,9 @@ else:
             if hasattr(p, 'plugin_reactor'):
                 p.plugin_reactor(strippingFactory) #we pass the default strippingFactory, so the plugins can use it
 
-    print "\n[*] sslstrip v%s by Moxie Marlinspike running..." % sslstrip_version
- 
-    if args.hsts:
-        print "[*] sslstrip+ by Leonardo Nve running..."
+    print "|"
+    print "|_ Sergio-Proxy v%s online" % sergio_version
+    print "|_ SSLstrip v%s by Moxie Marlinspike running..." % sslstrip_version
 
 reactor.run()
 
diff --git a/plugins/Responder.py b/plugins/Responder.py
index 19e8138..9acde6e 100644
--- a/plugins/Responder.py
+++ b/plugins/Responder.py
@@ -19,15 +19,22 @@ class Responder(Plugin):
         self.options = options
         self.interface = options.interface
 
+        RESP_VERSION = "2.1.2"
+
         try:
             config = options.configfile['Responder']
         except Exception, e:
             sys.exit('[-] Error parsing config for Responder: ' + str(e))
 
-        DnsCache.getInstance().setCustomAddress(self.ip_address)
+        DnsCache.getInstance().setCustomAddress(options.ip_address)
 
         for name in ['wpad', 'ISAProxySrv', 'RespProxySrv']:
-            DnsCache.getInstance().setCustomRes(name, self.ip_address)
+            DnsCache.getInstance().setCustomRes(name, options.ip_address)
+
+        print "|  |_ NBT-NS, LLMNR & MDNS Responder v%s by Laurent Gaffie online" % RESP_VERSION
+
+        if options.Analyse:
+            print '|  |_ Responder is in analyze mode. No NBT-NS, LLMNR, MDNS requests will be poisoned'
 
         t = threading.Thread(name='responder', target=start_responder, args=(options, options.ip_address, config))
         t.setDaemon(True)
diff --git a/plugins/SSLstrip+.py b/plugins/SSLstrip+.py
index e96adda..55561e8 100644
--- a/plugins/SSLstrip+.py
+++ b/plugins/SSLstrip+.py
@@ -18,4 +18,6 @@ class HSTSbypass(Plugin):
 		except Exception, e:
 			sys.exit("[-] Error parsing config for SSLstrip+: " + str(e))
 
+		print "|  |_ SSLstrip+ by Leonardo Nve running"
+
 		URLMonitor.getInstance().setHstsBypass(config)