remove proxy

Pipfile

@@ -13,6 +13,7 @@ async-timeout = "*"
 [dev-packages]
 twine = "*"
 pytest-asyncio = "*"
+"flake8" = "*"
 
 [requires]
 python_version = "3.6"

aiosip/application.py

@@ -13,7 +13,7 @@
 from collections import MutableMapping
 
 from . import __version__
-from .dialog import Dialog, ProxyDialog
+from .dialog import Dialog
 from .dialplan import BaseDialplan
 from .protocol import UDP, TCP, WS
 from .peers import UDPConnector, TCPConnector, WSConnector
@@ -128,17 +128,6 @@ async def prepare(self, status_code, *args, **kwargs):
 
                 return dialog
 
-            async def proxy(self, message, proxy_peer=None, dialog_factory=ProxyDialog):
-                if not proxy_peer:
-                    proxy_peer = await self.app.connect(
-                        remote_addr=(message.to_details.host, message.to_details.port),
-                        protocol=peer.protocol
-                    )
-
-                dialog = self._create_dialog(dialog_factory=dialog_factory, proxy_peer=proxy_peer)
-                dialog.proxy(message)
-                return dialog
-
         request = Request()
         await route(request, msg)
 

aiosip/dialog.py

@@ -447,51 +447,3 @@ async def close(self, timeout=None):
                     self._close()
 
         self._close()
-
-
-class ProxyDialog(DialogBase):
-    def __init__(self, *args, proxy_peer, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.proxy_peer = proxy_peer
-        self._incoming = asyncio.Queue()
-
-    @property
-    def dialog_id(self):
-        return frozenset((self.to_details['params']['tag'],
-                          self.from_details['params'].get('tag'),
-                          self.call_id))
-
-    async def receive_message(self, msg):
-        if 'tag' not in self.from_details['params'] and 'tag' in msg.to_details['params']:
-            del self.app._dialogs[self.dialog_id]
-            self.from_details['params']['tag'] = msg.to_details['params']['tag']
-            self.app._dialogs[self.dialog_id] = self
-
-        await self._incoming.put(msg)
-
-    async def recv(self):
-        return await self._incoming.get()
-
-    def proxy(self, message):
-        # TODO: should be cleaner
-        if not isinstance(message.headers['Via'], list):
-            message.headers['Via'] = [message.headers['Via'], ]
-
-        if f'{self.peer.peer_addr[0]}:{self.peer.peer_addr[1]}' in message.headers['Via'][0]:
-            message.headers['Via'].insert(0, self.proxy_peer.generate_via_headers())
-            self.proxy_peer.send_message(message)
-        elif f'{self.peer.local_addr[0]}:{self.peer.local_addr[1]}' in message.headers['Via'][0]:
-            message.headers['Via'].pop(0)
-            self.proxy_peer.send_message(message)
-        elif f'{self.proxy_peer.peer_addr[0]}:{self.proxy_peer.peer_addr[1]}' in message.headers['Via'][0]:
-            message.headers['Via'].insert(0, self.peer.generate_via_headers())
-            self.peer.send_message(message)
-        elif f'{self.proxy_peer.local_addr[0]}:{self.proxy_peer.local_addr[1]}' in message.headers['Via'][0]:
-            message.headers['Via'].pop(0)
-            self.peer.send_message(message)
-        else:
-            message.headers['Via'].insert(0, self.proxy_peer.generate_via_headers())
-            self.proxy_peer.send_message(message)
-
-    async def close(self, *args, **kwargs):
-        self._close()

aiosip/peers.py

@@ -9,7 +9,7 @@
 from . import utils
 from .contact import Contact
 from .protocol import UDP, TCP, WS
-from .dialog import Dialog, InviteDialog, ProxyDialog
+from .dialog import Dialog, InviteDialog
 
 LOG = logging.getLogger(__name__)
 
@@ -35,8 +35,7 @@ def send_message(self, msg):
     def _create_dialog(self, method, from_details, to_details, contact_details=None, password=None, call_id=None,
                        headers=None, payload=None, cseq=0, inbound=False, dialog_factory=Dialog, **kwargs):
 
-        if not issubclass(dialog_factory, ProxyDialog):
-            from_details.add_tag()
+        from_details.add_tag()
 
         if not call_id:
             call_id = str(uuid.uuid4())