client/server, python3

Author: m32

.gitignore

@@ -51,3 +51,5 @@ coverage.xml
 # Sphinx documentation
 docs/_build/
 
+turnc-udpc.json
+turnc-udpd.json

client.config

@@ -0,0 +1,7 @@
+{
+    "realm": "trisoft.com.pl",
+    "username": "passuser",
+    "userpass": "password",
+    "turnhost": "192.168.2.106",
+    "turnport": 3478
+}

logging.config

@@ -16,14 +16,14 @@ formatter=form01
 args=(sys.stdout,)
 
 [loggers]
-keys=root,jostedal
+keys=root,sturn
 
 [logger_root]
 level=NOTSET
 handlers=hand01
 
-[logger_jostedal]
+[logger_sturn]
 level=NOTSET
 handlers=hand01
 propagate=0
-qualname=jostedal
+qualname=sturn

example.config renamed to server.config

@@ -1,4 +1,6 @@
 {
+    "turnhost": "192.168.2.106",
+    "turnport": 3478,
     "software": "Sturn",
     "realm":    "trisoft.com.pl",
 

setup.py

@@ -9,7 +9,7 @@
     requires=['Twisted'],
 
     author='Grzegorz Makarewicz',
-    url='http://www.pexip.com',
+    url='https://github.com/m32/sturn',
 
     license='MIT',
 

stunc.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env vpython3
+import sys
 import socket
+import json
 from sturn import stun
 from sturn.stun import agent, attributes ,authentication
 
@@ -19,18 +21,20 @@ def close(self):
         self.conn.close()
 
     def Request(self, data):
-        print('req', data.format())
         self.conn.sendto(data, (self.host, self.port))
         resp = self.conn.recvfrom(maxMessageSize)
         #import pdb; pdb.set_trace()
         resp = agent.Message.decode(resp[0])
-        print('resp', resp.format())
         return resp
 
 def main():
-    #cls = Demo('192.168.2.104', 3478, '192.168.2.104', 54320)
-    cls = Demo('drugi.trisoft.com.pl', 3478, '192.168.2.104', 54320)
+    with open(sys.argv[1]) as fp:
+        config = json.load(fp)
+    cls = Demo(config['turnhost'], config['turnport'])
     req = agent.Message.encode(stun.METHOD_BINDING, stun.CLASS_REQUEST)
     resp = cls.Request(req)
 
+    address = resp.get_attr(stun.ATTR_XOR_MAPPED_ADDRESS, stun.ATTR_MAPPED_ADDRESS)
+    print('public address: family:{} port:{} address:{}'.format(address.family, address.port, address.address))
+
 main()

sturn/stun/agent.py

@@ -54,7 +54,7 @@ def decode(cls, data):
         assert data[0] >> 6 == stun.MSG_STUN, \
             "Stun message MUST start with 0b00"
         msg_type, msg_length, magic_cookie, transaction_id = cls._struct.unpack_from(data)
-#         assert magic_cookie == MAGIC_COOKIE, \
+#         assert magic_cookie == stun.MAGIC_COOKIE, \
 #             "Incorrect magic cookie ({:#x})".format(magic_cookie)
         assert msg_length % 4 == 0, \
             "Message not aliged to 4 byte boundary"
@@ -66,10 +66,18 @@ def decode(cls, data):
         while offset < cls._struct.size + msg_length:
             attr_type, attr_length = Attribute.struct.unpack_from(data, offset)
             offset += Attribute.struct.size
-            attr = cls.get_attr_cls(attr_type).decode(data, offset, attr_length)
+            clst = cls.get_attr_cls(attr_type)
+            attr = clst.decode(data, offset, attr_length)
             msg._attributes.append(attr)
-            offset += len(attr)
-            offset += attr.padding
+            #print(clst, type(attr), 'type: %04X/%d'%(attr_type, attr_type), 'offset:', offset, attr)
+            try:
+                offset += len(attr)
+            except:
+                offset += clst._struct.size
+            try:
+                offset += attr.padding
+            except:
+                pass
         return msg
 
     @classmethod
@@ -121,7 +129,7 @@ def __repr__(self):
                 "magic_cookie={:#010x}, transaction_id={}, attributes={})".format(
                     type(self).__name__, self.msg_method, self.msg_class,
                     len(self) - self._struct.size,
-                    self.magic_cookie, self.transaction_id.encode('hex'),
+                    self.magic_cookie, self.transaction_id.hex(),
                     self._attributes))
 
     def format(self):
@@ -142,6 +150,7 @@ class Attribute(bytes):
     """STUN message attribute structure
     :see: http://tools.ietf.org/html/rfc5389#section-15
     """
+    _struct = struct.Struct('>2H')
     struct = struct.Struct('>2H')
 
     def __new__(cls, data, *args, **kwargs):

sturn/stun/attributes.py

@@ -27,7 +27,7 @@ def encode(cls, msg, username):
         return cls(username.encode('utf8'))
 
     def __repr__(self, *args, **kwargs):
-        return "USERNAME({!r})".format(str(self))
+        return "USERNAME({})".format(str(self))
 
 
 @attribute

sturn/stun/protocol.py

@@ -60,7 +60,7 @@ def _stun_received(self, msg, addr):
         handler = self._handlers.get((msg.msg_method, msg.msg_class))
         if handler:
             logger.info("%s Received STUN", self)
-            logger.debug(msg.format())
+            #logger.debug(msg.format())
             handler(msg, addr)
         else:
             logger.info("%s Received unrecognized STUN", self)

sturn/stun/server.py

@@ -19,7 +19,7 @@ def respond(self, response, addr):
         response.add_attr(attributes.Fingerprint)
         self.transport.write(response, addr)
         logger.info("%s Sending response", self)
-        logger.debug(response.format())
+        #logger.debug(response.format())
 
     def _stun_binding_request(self, msg, addr):
         if msg.msg_class == stun.CLASS_REQUEST:
@@ -40,7 +40,7 @@ def _stun_binding_request(self, msg, addr):
                 response.add_attr(attributes.Software, self.software)
         self.transport.write(response, addr)
         logger.info("%s Sending response", self)
-        logger.debug(response.format())
+        #logger.debug(response.format())
 
     def _stun_binding_indication(self, msg, addr):
         pass