sippy 2.0.2__tar.gz → 2.1.0__tar.gz

{sippy-2.0.2/sippy.egg-info → sippy-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sippy
-Version: 2.0.2
+Version: 2.1.0
 Summary: RFC3261 SIP Stack and Back-to-Back User Agent (B2BUA)
 Home-page: http://www.b2bua.org/
 Author: Sippy Software, Inc.
@@ -12,6 +12,8 @@ Classifier: Operating System :: POSIX
 Classifier: Programming Language :: Python
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: ElPeriodic>=1.1
+Requires-Dist: pycryptodome
 
 [![Build Status@GitHub](https://github.com/sippy/b2bua/workflows/Check%20Python%20Wheels/badge.svg?branch=master)](https://github.com/sippy/b2bua/actions?query=branch%3Amaster++)
 
@@ -51,11 +53,11 @@ path.
 
 ## Installation
 
-### Install libelperiodic (if not installed)
+### Install latest stable version
 
-`pip install ElPeriodic`
+`pip install sippy`
 
-### Install B2BUA
+### Install latest development version
 
 `pip install git+https://github.com/sippy/b2bua`
 

{sippy-2.0.2 → sippy-2.1.0}/README.md

@@ -36,11 +36,11 @@ path.
 
 ## Installation
 
-### Install libelperiodic (if not installed)
+### Install latest stable version
 
-`pip install ElPeriodic`
+`pip install sippy`
 
-### Install B2BUA
+### Install latest development version
 
 `pip install git+https://github.com/sippy/b2bua`
 

{sippy-2.0.2 → sippy-2.1.0}/setup.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 from setuptools import setup, find_packages
 
 requirements = [x.strip() for x in open("requirements.txt", "r").readlines()]
@@ -8,7 +8,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name = "sippy",
-    version = "2.0.2",
+    version = "2.1.0",
     packages = find_packages(),
 
     install_requires = requirements,

{sippy-2.0.2 → sippy-2.1.0}/sippy/CLIManager.py

@@ -253,6 +253,8 @@ class CLIManager(object):
             self.close()
 
     def send(self, data):
+        if self.wthr is None:
+            return
         if not isinstance(data, _uobj):
             data = data.encode('ascii')
         self.wthr.send(data)
@@ -261,10 +263,12 @@ class CLIManager(object):
         return self.send(data)
 
     def close(self):
+        if self.wthr is None:
+            return
         self.wthr.shutdown(soft = True)
 
     def shutdown(self):
-        if self.wthr == None:
+        if self.wthr is None:
             return
         self.wthr.shutdown()
         try:

{sippy-2.0.2 → sippy-2.1.0}/sippy/Core/EventDispatcher.py

@@ -26,15 +26,13 @@
 
 from __future__ import print_function
 
+from functools import partial
 from datetime import datetime
 from heapq import heappush, heappop, heapify
 from threading import Lock
 from random import random
 import sys, traceback, signal
-if sys.version_info[0] < 3:
-    from thread import get_ident
-else:
-    from _thread import get_ident
+from _thread import get_ident
 from sippy.Time.MonoTime import MonoTime
 from sippy.Core.Exceptions import dump_exception, StdException
 
@@ -67,7 +65,8 @@ class EventListener(object):
         self.randomize_runs = None
 
     def get_randomizer(self, p):
-        return lambda x: x * (1.0 + p * (1.0 - 2.0 * random()))
+        def randomizer(p, x): return x * (1.0 + p * (1.0 - 2.0 * random()))
+        return partial(randomizer, p)
 
     def spread_runs(self, p):
         self.randomize_runs = self.get_randomizer(p)
@@ -119,6 +118,7 @@ class EventDispatcher2(Singleton):
     tlisteners = None
     slisteners = None
     endloop = False
+    el_rval = None
     signals_pending = None
     twasted = 0
     tcbs_lock = None
@@ -265,13 +265,11 @@ class EventDispatcher2(Singleton):
         while True:
             if len(self.signals_pending) > 0:
                 self.dispatchSignals()
-                if self.endloop:
-                    return
             if self.endloop:
-                return
+                break
             self.dispatchTimers()
             if self.endloop:
-                return
+                break
             if self.twasted * 2 > len(self.tlisteners):
                 # Clean-up removed timers when their share becomes more than 50%
                 self.tlisteners = [x for x in self.tlisteners if x.cb_func != None]
@@ -282,9 +280,11 @@ class EventDispatcher2(Singleton):
                 break
             self.elp.procrastinate()
             self.last_ts = MonoTime()
+        return self.el_rval
 
-    def breakLoop(self):
+    def breakLoop(self, rval=0):
         self.endloop = True
+        self.el_rval = rval
         #print('breakLoop')
         #import traceback
         #import sys

sippy-2.1.0/sippy/Exceptions/RtpProxyError.py

@@ -0,0 +1,38 @@
+# Copyright (c) 2023 Sippy Software, Inc. All rights reserved.
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this
+# list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation and/or
+# other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+from sippy.Exceptions.SipParseError import SdpParseError
+
+class RtpProxyError(Exception):
+    sip_response = None
+    arg = None
+    code = 502
+    msg = 'Bad Gateway'
+    def __init__(self, arg):
+        super().__init__()
+        self.arg = arg
+
+    def getResponse(self, req):
+        return SdpParseError.getResponse(self, req)

sippy-2.1.0/sippy/Exceptions/SipParseError.py

@@ -0,0 +1,56 @@
+# Copyright (c) 20012-2023 Sippy Software, Inc. All rights reserved.
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this
+# list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation and/or
+# other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+from sippy.SipReason import SipReason
+from sippy.SipHeader import SipHeader
+
+class SipParseError(Exception):
+    sip_response = None
+    arg = None
+
+    def __init__(self, arg, sip_response = None):
+        super().__init__()
+        self.arg = arg
+        self.sip_response = sip_response
+
+    def __str__(self):
+        return str(self.arg)
+
+    def getResponse(self, req=None):
+        return self.sip_response
+
+class SdpParseError(SipParseError):
+    code = 488
+    msg = 'Not Acceptable Here'
+    def getResponse(self, req):
+        if self.sip_response is not None:
+            return self.sip_response
+        resp = req.genResponse(self.code, self.msg)
+        if self.arg is not None and len(self.arg) > 0:
+            reason = SipReason(protocol='SIP', cause=self.code,
+                               reason=self.arg)
+            rsh = SipHeader(body = reason)
+            resp.appendHeader(rsh)
+        return resp

{sippy-2.0.2 → sippy-2.1.0}/sippy/MsgBody.py

@@ -26,8 +26,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 from sippy.SdpBody import SdpBody
-
-b_types = {'application/sdp':SdpBody}
+from sippy.SipContentType import SipContentType
 
 try:
     # Python < 3
@@ -35,28 +34,35 @@ try:
 except NameError:
     str_types = (str,)
 
+DEFAULT_CTYPE = SipContentType('application/sdp')
+DEFAULT_CTYPE.parse()
+
 class MsgBody(object):
     content = None
     mtype = None
     needs_update = True
     parsed = False
 
-    def __init__(self, content = None, mtype = 'application/sdp', cself = None):
+    def __init__(self, content = None, mtype = DEFAULT_CTYPE, cself = None):
         if content != None:
             self.mtype = mtype
             self.content = content
-        else:
+            return
+        if cself is not None:
             if type(cself.content) in str_types:
                 self.content = cself.content
             else:
                 self.content = cself.content.getCopy()
-            self.mtype = cself.mtype
+            self.mtype = cself.mtype.getCopy()
             self.parsed = True
 
     def parse(self):
+        b_types = {'application/sdp':SdpBody,
+                   'multipart/mixed':MultipartMixBody}
         if not self.parsed:
-            if self.mtype in b_types:
-                self.content = b_types[self.mtype](self.content)
+            mtype = self.getType()
+            if mtype in b_types:
+                self.content = b_types[mtype](self.content, ctype=self.mtype)
             self.parsed = True
 
     def __str__(self):
@@ -68,9 +74,12 @@ class MsgBody(object):
         return self.content.localStr(local_addr, local_port)
 
     def getType(self):
-        return self.mtype
+        return self.mtype.name.lower()
 
     def getCopy(self):
         if not self.parsed:
             return MsgBody(self.content)
         return MsgBody(cself = self)
+
+if not 'MultipartMixBody' in globals():
+    from sippy.MultipartMixBody import MultipartMixBody

sippy-2.1.0/sippy/MultipartMixBody.py

@@ -0,0 +1,71 @@
+# Copyright (c) 2023 Sippy Software, Inc. All rights reserved.
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this
+# list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation and/or
+# other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+from sippy.SipHeader import SipHeader
+
+class MultipartMixBody():
+    parts = None
+    boundary = None
+
+    def __init__(self, body = None, ctype = None):
+        if body == None:
+            return
+        sep = f'--{ctype.params["boundary"]}'
+        bparts = body.split(sep)
+        assert len(bparts) > 2
+        assert len(bparts[0]) == 0
+        assert bparts[-1].strip() == '--'
+        parts = [p.lstrip() for p in bparts[1:-1]]
+        self.parts = []
+        for sect in parts:
+            ct, sect = sect.split('\r\n', 1)
+            ct = SipHeader(ct).getBody()
+            sect = MsgBody(sect, ct)
+            self.parts.append(sect)
+        self.boundary = ctype.params["boundary"]
+
+    def __str__(self):
+        bnd = f'--{self.boundary}\r\n'
+        parts = [f'{bnd}Content-Type: {p.mtype}\r\n{p}' for p in self.parts]
+        s = ''.join(parts)
+        s += f'{bnd[:-2]}--\r\n'
+        return s
+
+    def localStr(self, local_addr = None, local_port = None):
+        bnd = f'--{self.boundary}\r\n'
+        parts = [f'{bnd}Content-Type: {p.mtype}\r\n{p.localStr(local_addr, local_port)}'
+                 for p in self.parts]
+        s = ''.join(parts)
+        s += f'{bnd[:-2]}--\r\n'
+        return s
+
+    def getCopy(self):
+        cself = MultipartMixBody()
+        cself.parts = [p.getCopy() for p in self.parts]
+        cself.boundary = self.boundary
+        return cself
+
+if not 'MsgBody' in globals():
+    from sippy.MsgBody import MsgBody

{sippy-2.0.2 → sippy-2.1.0}/sippy/Rtp_proxy_client.py

@@ -227,7 +227,7 @@ class Rtp_proxy_client(Rtp_proxy_client_udp, Rtp_proxy_client_stream):
             return
         if not self.online:
             if not self.caps_done:
-                rtpp_cc = Rtpp_caps_checker(self)
+                Rtpp_caps_checker(self)
                 return
             self.online = True
             self.heartbeat()

{sippy-2.0.2 → sippy-2.1.0}/sippy/Rtp_proxy_client_stream.py

@@ -62,6 +62,7 @@ class _RTPPLWorker(Thread):
     def send_raw(self, command, _recurse = 0, stime = None):
         if _recurse > _MAX_RECURSE:
             raise Exception('Cannot reconnect: %s' % (str(self.userv.address),))
+        _recurse += 1
         if self.s == None:
             self.connect()
         #print('%s.send_raw(%s)' % (id(self), command))
@@ -76,14 +77,14 @@ class _RTPPLWorker(Thread):
                     continue
                 elif why.errno in (EPIPE, ENOTCONN, ECONNRESET):
                     self.s = None
-                    return self.send_raw(command, _recurse + 1, stime)
+                    return self.send_raw(command, _recurse, stime)
                 raise why
         while True:
             try:
                 rval = self.s.recv(1024)
                 if len(rval) == 0:
                     self.s = None
-                    return self.send_raw(command, _MAX_RECURSE, stime)
+                    return self.send_raw(command, _recurse, stime)
                 rval = rval.decode().strip()
                 break
             except socket.error as why:
@@ -91,7 +92,7 @@ class _RTPPLWorker(Thread):
                     continue
                 elif why.errno in (EPIPE, ENOTCONN, ECONNRESET):
                     self.s = None
-                    return self.send_raw(command, _recurse + 1, stime)
+                    return self.send_raw(command, _recurse, stime)
                 raise why
         rtpc_delay = stime.offsetFromNow()
         return (rval, rtpc_delay)

{sippy-2.0.2 → sippy-2.1.0}/sippy/Rtp_proxy_cmd.py

@@ -63,7 +63,7 @@ class UpdateLookupOpts(object):
                 val = val.strip()
                 if len(val) > 0:
                     self.destination_ip = val
-            if s[0] == 'L':
+            elif s[0] == 'L':
                 val, s = extract_to_next_token(s[1:], ('1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '.'))
                 val = val.strip()
                 if len(val) > 0:
@@ -78,7 +78,7 @@ class UpdateLookupOpts(object):
                 if len(val) > 0:
                     self.otherparams += val
 
-    def getstr(self, call_id, swaptags = False):
+    def getstr(self, call_id, swaptags = False, skipnotify = False):
         s = ''
         if self.destination_ip != None:
             s += 'R%s' % (self.destination_ip,)
@@ -102,14 +102,15 @@ class UpdateLookupOpts(object):
             if self.to_tag == None:
                 raise Exception('UpdateLookupOpts::getstr(swaptags = True): to_tag is not set')
             to_tag, from_tag = (self.from_tag, self.to_tag)
-        if self.from_tag != None:
-            s = '%s %s' % (s, self.from_tag)
-        if self.to_tag != None:
-            s = '%s %s' % (s, self.to_tag)
-        if self.notify_socket != None:
-            s = '%s %s' % (s, self.notify_socket)
-        if self.notify_tag != None:
-            s = '%s %s' % (s, self.notify_tag)
+        if from_tag != None:
+            s = '%s %s' % (s, from_tag)
+        if to_tag != None:
+            s = '%s %s' % (s, to_tag)
+        if not skipnotify:
+            if self.notify_socket != None:
+                s = '%s %s' % (s, self.notify_socket)
+            if self.notify_tag != None:
+                s = '%s %s' % (s, self.notify_tag)
         if self.subargs != None:
             s = '%s && %s' % (s, self.subargs)
         return s