add redisprogram and bump package version

pirate · pirate · commit f3ac47ba0068 · 2017-04-12T14:23:52.000-07:00
diff --git a/README.md b/README.md
@@ -47,13 +47,13 @@ node1.send('hi alice!')
 python3 examples/lan_chat.py
 ```
 
-**To simulate a small network topology with 6 nodes:**
+**Simulate a small network topology with 6 nodes:**
 
 ```bash
 python3 examples/small_network.py
 ```
 
-**To simulate a larger network with randomized connections between nodes:**
+**Simulate a larger network with randomized connections between nodes:**
 
 ```bash
 python3 examples/large_network.py
diff --git a/mesh/programs.py b/mesh/programs.py
@@ -1,4 +1,5 @@
 import re
+import os
 import threading
 from time import sleep
 
@@ -61,6 +62,7 @@ def recv(self, packet, interface):
 def R(pattern):
     return re.compile(pattern)
 
+
 class RoutedProgram(BaseProgram):
     """Base program which easily routes messages to handler functions.
 
@@ -96,3 +98,60 @@ def send(self, message, interface):
             self.node.log('\n> [SENT]  %s' % line)
             packet = bytes(line, 'utf-8') if type(line) is str else line
             self.node.send(packet, interface)
+
+
+class RedisProgram(BaseProgram):
+    """
+        A program which places all incoming an outgoing packets into a redis queue.
+        The keys used for the queue can be passed in, these are the defaults:
+            db:        redis://127.0.0.1/0
+            in  queue: node-{pid}-recv
+            out queue: node-{pid}-send
+    """
+    def __init__(self, node, recv_key=None, send_key=None, redis_conf=None):
+        super(RedisProgram, self).__init__(node)
+        import redis
+        pid = os.getpid()
+        self.recv_key = recv_key or 'node-{}-recv'.format(pid)
+        self.send_key = send_key or 'node-{}-send'.format(pid)
+        self.nodeq = redis.Redis(**(redis_conf or {
+            'host': '127.0.0.1',
+            'port': 6379,
+            'db': 0,
+        }))
+
+    def run(self):
+        print('[√] Redis program is buffering IO to db:{0} keys:{1} & {2}.'.format(
+            0, self.recv_key, self.send_key))
+
+        while self.keep_listening:
+            for interface in self.node.interfaces:
+                if self.get_recvs(interface):
+                    continue
+                if self.put_sends():
+                    continue
+
+                sleep(0.01)
+
+    def recv(self, packet, interface):
+        print('[IN]:  {}'.format(packet))
+        self.nodeq.rpush(self.recv_key, packet)
+
+    def send(self, packet, interface=None):
+        print('[OUT]: {}'.format(packet))
+        self.node.send(packet, interface)
+
+    def get_recvs(self, interface):
+        try:
+            msg = self.node.inq[interface].get(timeout=0)
+            self.recv(msg, interface)
+            return True
+        except Empty:
+            return False
+
+    def put_sends(self):
+        out = self.nodeq.rpop(self.send_key)
+        if out:
+            self.send(out)
+            return True
+        return False
diff --git a/mesh_networking.egg-info/PKG-INFO b/mesh_networking.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: mesh-networking
-Version: 0.0.2
+Version: 0.0.3
 Summary: A library for creating flexible network topologies
 Home-page: https://github.com/pirate/mesh-networking
 Author: Nick Sweeting
diff --git a/mesh_networking.egg-info/top_level.txt b/mesh_networking.egg-info/top_level.txt
@@ -1 +1 @@
-
+mesh
diff --git a/setup.py b/setup.py
@@ -1,12 +1,11 @@
-from setuptools import setup, find_packages
-
+from setuptools import setup
 
 SHORT_DESC = 'A library for creating flexible network topologies'
 LONG_DESC = 'This library helps you test large networks of nodes across physical and simulated links.'
 
 setup(
     name='mesh-networking',
-    version='0.0.2',
+    version='0.0.3',
     description=SHORT_DESC,
     long_description=LONG_DESC,
 
@@ -35,7 +34,7 @@
     ],
     keywords='networking routing mesh osi scapy udp tcp iptables irc',
 
-    packages=find_packages('mesh', exclude=['misc', 'examples']),
+    packages=['mesh'],
     test_suite='mesh.tests',
     install_requires=[],
 )
