Fixed the git merge failure on my end.

Ben0xA · Oct 9, 2012 · 2e1b4fc · 2e1b4fc
1 parent 6255c09
commit 2e1b4fc
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 11 deletions.
diff --git a/VS.NET/ben9/ben9.suo b/VS.NET/ben9/ben9.suo
diff --git a/VS.NET/ben9/ben9/ben9.vb b/VS.NET/ben9/ben9/ben9.vb
@@ -5,7 +5,7 @@ Public Module ben9
 #End Region
 
     Sub Main()
-        clt.Connect("localhost", 4444)
+        clt.Connect("192.168.135.35", 4444)
         System.Threading.Thread.Sleep(200)
     End Sub
 

diff --git a/VS.NET/ben9/ben9/obj/Debug/ben9.exe b/VS.NET/ben9/ben9/obj/Debug/ben9.exe
diff --git a/VS.NET/ben9/ben9/obj/Debug/ben9.pdb b/VS.NET/ben9/ben9/obj/Debug/ben9.pdb
diff --git a/VS.NET/ben9/ben9listener/ben9listener.vb b/VS.NET/ben9/ben9listener/ben9listener.vb
@@ -6,7 +6,7 @@ Public Module ben9listener
 
     Sub Main()
         Console.WriteLine("[*]Starting listener service.")
-        srv.Listen("localhost", 4444)
+        srv.Listen("192.168.135.35", 4444)
         Console.ReadLine()
     End Sub
 

diff --git a/VS.NET/ben9/ben9listener/obj/Debug/ben9listener.exe b/VS.NET/ben9/ben9listener/obj/Debug/ben9listener.exe
diff --git a/VS.NET/ben9/ben9listener/obj/Debug/ben9listener.pdb b/VS.NET/ben9/ben9listener/obj/Debug/ben9listener.pdb
diff --git a/ben9-listener.py b/ben9-listener.py
@@ -42,8 +42,8 @@
     csocket, address = read.accept()
     text = csocket.recv(300)
     text = time.strftime("%m/%d/%Y %H:%M:%S",time.localtime()) + "|" + text 
-    text = text + "|" + address[0] + "|" + str(socket.gethostbyaddr(address[0])[0]) 
-    print text
+    text = text + "|" + address[0] + "|" + str(socket.gethostbyaddr(address[0])[0])
+
     if opts.logfile:
       logfile.write(text + "\n")
     else:

diff --git a/ben9.py b/ben9.py
@@ -2,21 +2,18 @@
 
 import socket
 import getpass
-import time
 
 # create socket object
 xport = socket.socket(socket.AF_INET,socket.SOCK_STREAM)
 rslt = 0
 
 # send message to server; fail quietly if server is not running
 try:
-    xport.connect(('192.168.135.35',4444))
+    xport.connect(('localhost',4444))
     xport.setblocking(0)
     # export in psv time|username|ip|machine_name
-    msg = time.strftime("%m/%d/%Y %H:%M:%S",time.gmtime()) + '|' + getpass.getuser() + '|'
-    msg += socket.gethostbyname(socket.gethostname()) + '|' + os.getenv('HOSTNAME')
+    msg = getpass.getuser()
     rslt = xport.send(msg.encode())
-    xport.send(msg.encode())
 except:
   print "failcamping"
 

diff --git a/nbproject/project.properties b/nbproject/project.properties
@@ -1,5 +1,6 @@
+file.reference.Development-ben9=.
 java.lib.path=
 main.file=ben9-listener.py
 platform.active=default
 python.lib.path=
-src.integgroll.dir=integgroll
+src.ben9.dir=${file.reference.Development-ben9}
diff --git a/nbproject/project.xml b/nbproject/project.xml
@@ -5,7 +5,7 @@
         <data xmlns="http://nbpython.dev.java.net/ns/php-project/1">
             <name>ben9</name>
             <sources>
-                <root id="src.integgroll.dir"/>
+                <root id="src.ben9.dir"/>
             </sources>
             <tests/>
         </data>