From 425df067eb07ca2043368de384745e26f9fd2882 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Mon, 7 Jan 2013 16:44:22 +0100
Subject: [PATCH] Fix for an --os-pwn with ICMPsh (it was crashing because
 methods interleaved with Metasploit ones)

---
 lib/takeover/icmpsh.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/takeover/icmpsh.py b/lib/takeover/icmpsh.py
index 366e08b48..a7f133701 100644
--- a/lib/takeover/icmpsh.py
+++ b/lib/takeover/icmpsh.py
@@ -45,8 +45,8 @@ class ICMPsh:
         return address
 
     def _prepareIngredients(self, encode=True):
-        self.lhostStr = self._selectLhost()
-        self.rhostStr = self._selectRhost()
+        self.lhostStr = ICMPsh._selectLhost(self)
+        self.rhostStr = ICMPsh._selectRhost(self)
 
     def _runIcmpshMaster(self):
         infoMsg = "running icmpsh master locally"
@@ -82,7 +82,7 @@ class ICMPsh:
             self.writeFile(self._icmpslave, self._icmpslaveRemote, "binary")
 
     def icmpPwn(self):
-        self._prepareIngredients()
+        ICMPsh._prepareIngredients(self)
         self._runIcmpshSlaveRemote()
         self._runIcmpshMaster()