sippy 2.2.0__tar.gz → 2.2.2__tar.gz

sippy-2.2.2/MANIFEST.in

@@ -0,0 +1,4 @@
+include README.md
+include requirements.txt
+include sippy/dictionary
+recursive-include sippy/UI/static *

{sippy-2.2.0/sippy.egg-info → sippy-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: sippy
-Version: 2.2.0
+Version: 2.2.2
 Summary: RFC3261 SIP Stack and Back-to-Back User Agent (B2BUA)
 Home-page: http://www.b2bua.org/
 Author: Sippy Software, Inc.
@@ -15,8 +15,19 @@ License-File: LICENSE
 Requires-Dist: ElPeriodic>=1.1
 Requires-Dist: pycryptodome
 Requires-Dist: websockets
-
-[![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++)
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
+
+[![Build Status@GitHub](https://github.com/sippy/b2bua/actions/workflows/python-wheels.yml/badge.svg?branch=master)](https://github.com/sippy/b2bua/actions/workflows/python-wheels.yml?query=branch%3Amaster++)
 
 # Sippy B2BUA
 

{sippy-2.2.0 → sippy-2.2.2}/README.md

@@ -1,4 +1,4 @@
-[![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++)
+[![Build Status@GitHub](https://github.com/sippy/b2bua/actions/workflows/python-wheels.yml/badge.svg?branch=master)](https://github.com/sippy/b2bua/actions/workflows/python-wheels.yml?query=branch%3Amaster++)
 
 # Sippy B2BUA
 

{sippy-2.2.0 → sippy-2.2.2}/setup.py

@@ -8,19 +8,18 @@ with open("README.md", "r") as fh:
 
 setup(
     name = "sippy",
-    version = "2.2.0",
+    version = "2.2.2",
     packages = find_packages(),
 
     install_requires = requirements,
-    package_data = {
-        '': ['dictionary', '*.md']
-        },
+    include_package_data=True,
     test_suite = 'tests',
 
     entry_points = {
         'console_scripts': [
             'b2bua_simple = sippy.b2bua_simple:main_func',
-            'b2bua_radius = sippy.b2bua_radius:main_func',
+            'b2bua_radius = sippy.b2bua:main_func',
+            'b2bua = sippy.b2bua:main_func',
             ],
         },
 

sippy-2.2.0/sippy/B2BRoute.py → sippy-2.2.2/sippy/B2B/Route.py

@@ -26,7 +26,7 @@
 
 from sippy.SipHeader import SipHeader
 from sippy.SipConf import SipConf
-from sippy.B2BTransforms import getTransProc
+from sippy.B2B.Transforms import getTransProc
 
 try:
     from urllib import unquote
@@ -82,7 +82,7 @@ class B2BRoute(object):
             self.cli_set = cself.cli_set
             self.params = dict(cself.params)
             self.ainfo = cself.ainfo
-            if cself.extra_headers != None:
+            if cself.extra_headers is not None:
                 self.extra_headers = tuple([x.getCopy() for x in cself.extra_headers])
             return
         route = sroute.split(';')
@@ -183,7 +183,7 @@ class B2BRoute(object):
         if 'gt' in self.params:
             timeout, skip = self.params['gt'].split(',', 1)
             self.params['group_timeout'] = (int(timeout), rnum + int(skip))
-        if self.extra_headers != None:
+        if self.extra_headers is not None:
             self.extra_headers = self.extra_headers + tuple(pass_headers)
         else:
             self.extra_headers = tuple(pass_headers)

sippy-2.2.2/sippy/B2B/SimpleAPI.py

@@ -0,0 +1,142 @@
+# Copyright (c) 2003-2005 Maxim Sobolev. All rights reserved.
+# Copyright (c) 2006-2025 Sippy Software, Inc. 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 ..CLIManager import CLIConnectionManager, CLIManager
+from ..Time.MonoTime import MonoTime
+from .States import CCStateConnected, CCStateARComplete
+
+class B2BSimpleAPI(CLIConnectionManager):
+    global_config = None
+
+    def __init__(self, global_config):
+        cmdfile = global_config['b2bua_socket']
+        self.global_config = global_config
+        if cmdfile.startswith('tcp:'):
+            parts = cmdfile[4:].split(':', 1)
+            if len(parts) == 1:
+                address = (parts[0], 12345)
+            else:
+                address = (parts[0], int(parts[1]))
+            super().__init__(self.recvCommand, address, tcp = True)
+        else:
+            if cmdfile.startswith('unix:'):
+                cmdfile = cmdfile[5:]
+            super().__init__(self.recvCommand, cmdfile)
+
+    def recvCommand(self, clim, cmd):
+        ccm = self.global_config['_cmap']
+        args = cmd.split()
+        cmd = args.pop(0).lower()
+        if cmd == 'q':
+            clim.close()
+            return False
+        if cmd == 'l':
+            res = 'In-memory calls:\n'
+            total = 0
+            for (cid, sname), uaast, uaost in ccm.listActiveCalls():
+                res += f'{cid}: {sname} ('
+                if uaast is not None:
+                    _s, _t, _h, _p, _cld, _cli = uaast
+                    res += f'{_s} {_t}:{_h}:{_p} {_cld} {_cli} -> '
+                else:
+                    res += 'N/A -> '
+                if uaost is not None:
+                    _s, _t, _h, _p, _cld, _cli = uaost
+                    res += f'{_s} {_t}:{_h}:{_p} {_cld} {_cli})\n'
+                else:
+                    res += 'N/A)\n'
+                total += 1
+            res += 'Total: %d\n' % total
+            clim.send(res)
+            return False
+        if cmd == 'lt':
+            res = 'In-memory server transactions:\n'
+            for tid, t in self.global_config['_sip_tm'].tserver.iteritems():
+                res += '%s %s %s\n' % (tid, t.method, t.state)
+            res += 'In-memory client transactions:\n'
+            for tid, t in self.global_config['_sip_tm'].tclient.iteritems():
+                res += '%s %s %s\n' % (tid, t.method, t.state)
+            clim.send(res)
+            return False
+        if cmd in ('lt', 'llt'):
+            if cmd == 'llt':
+                mindur = 60.0
+            else:
+                mindur = 0.0
+            ctime = MonoTime()
+            res = 'In-memory server transactions:\n'
+            for tid, t in self.global_config['_sip_tm'].tserver.iteritems():
+                duration = ctime - t.rtime
+                if duration < mindur:
+                    continue
+                res += '%s %s %s %s\n' % (tid, t.method, t.state, duration)
+            res += 'In-memory client transactions:\n'
+            for tid, t in self.global_config['_sip_tm'].tclient.iteritems():
+                duration = ctime - t.rtime
+                if duration < mindur:
+                    continue
+                res += '%s %s %s %s\n' % (tid, t.method, t.state, duration)
+            clim.send(res)
+            return False
+        if cmd == 'd':
+            if len(args) != 1:
+                clim.send('ERROR: syntax error: d <call-id>\n')
+                return False
+            if args[0] == '*':
+                self.discAll()
+                clim.send('OK\n')
+                return False
+            dlist = [x for x in ccm.ccmap if str(x.cId) == args[0]]
+            if len(dlist) == 0:
+                clim.send('ERROR: no call with id of %s has been found\n' % args[0])
+                return False
+            for cc in dlist:
+                cc.disconnect()
+            clim.send('OK\n')
+            return False
+        if cmd == 'r':
+            if len(args) != 1:
+                clim.send('ERROR: syntax error: r [<id>]\n')
+                return False
+            idx = int(args[0])
+            dlist = [x for x in ccm.ccmap if x.id == idx]
+            if len(dlist) == 0:
+                clim.send('ERROR: no call with id of %d has been found\n' % idx)
+                return False
+            for cc in dlist:
+                if not cc.proxied:
+                    continue
+                if cc.state == CCStateConnected:
+                    cc.disconnect(MonoTime().getOffsetCopy(-60), origin = 'media_timeout')
+                    continue
+                if cc.state == CCStateARComplete:
+                    cc.uaO.disconnect(MonoTime().getOffsetCopy(-60), origin = 'media_timeout')
+                    continue
+            clim.send('OK\n')
+            return False
+        clim.send('ERROR: unknown command\n')
+        return False
+
+    def set_rtp_io_socket(self, rtpp_nsock, rtpp_nsock_spec):
+        CLIManager(rtpp_nsock, self.recvCommand)

sippy-2.2.2/sippy/B2B/States.py

@@ -0,0 +1,36 @@
+# Copyright (c) 2003-2005 Maxim Sobolev. All rights reserved.
+# Copyright (c) 2006-2025 Sippy Software, Inc. 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.
+
+class CCStateIdle(object):
+    sname = 'Idle'
+class CCStateWaitRoute(object):
+    sname = 'WaitRoute'
+class CCStateARComplete(object):
+    sname = 'ARComplete'
+class CCStateConnected(object):
+    sname = 'Connected'
+class CCStateDead(object):
+    sname = 'Dead'
+class CCStateDisconnecting(object):
+    sname = 'Disconnecting'

{sippy-2.2.0 → sippy-2.2.2}/sippy/CCEvents.py

@@ -25,19 +25,21 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 from sippy.Time.MonoTime import MonoTime
+from sippy.SipHeader import SipHeader
+from sippy.SipWarning import SipWarning
 
 class CCEventGeneric(object):
     data = None
     name = None
     rtime = None
     origin = None
-    reason = None
+    reason_rfc3326 = None
     extra_headers = None
     seq = 1
 
     def __init__(self, data = None, rtime = None, origin = None):
         self.data = data
-        if rtime == None:
+        if rtime is None:
             self.rtime = MonoTime()
         else:
             self.rtime = rtime
@@ -50,12 +52,20 @@ class CCEventGeneric(object):
 
     def getCopy(self):
         cself = self.__class__(self.data, self.rtime, self.origin)
-        if self.reason != None:
-            cself.reason = self.reason.getCopy()
-        if self.extra_headers != None:
-            cself.extra_headers = tuple([x.getCopy() for x in self.extra_headers])
+        if self.extra_headers is not None:
+            cself.extra_headers = tuple(x.getCopy() for x in self.extra_headers)
+        if self.reason_rfc3326 is not None:
+            cself.reason_rfc3326 = self.reason_rfc3326.getCopy()
         return cself
 
+    def getExtraHeaders(self):
+        extra_headers = []
+        if self.extra_headers is not None:
+            extra_headers.extend(self.extra_headers)
+        if self.reason_rfc3326 is not None:
+            extra_headers.append(SipHeader(body = self.reason_rfc3326))
+        return tuple(extra_headers) if len(extra_headers) > 0 else None
+
     def __str__(self):
         return self.name
 
@@ -64,7 +74,7 @@ class CCEventTry(CCEventGeneric):
     max_forwards = None
 
     def getCopy(self):
-        cself = CCEventGeneric.getCopy(self)
+        cself = super().getCopy()
         cself.max_forwards = self.max_forwards
         return cself
 
@@ -75,35 +85,27 @@ class CCEventTry(CCEventGeneric):
 
 class CCEventRing(CCEventGeneric):
     name = 'CCEventRing'
-    pass
 
 class CCEventPreConnect(CCEventGeneric):
     name = 'CCEventPreConnect'
-    pass
 
 class CCEventConnect(CCEventGeneric):
     name = 'CCEventConnect'
-    pass
 
 class CCEventUpdate(CCEventGeneric):
     name = 'CCEventUpdate'
     max_forwards = None
 
     def getCopy(self):
-        cself = CCEventGeneric.getCopy(self)
+        cself = super().getCopy()
         cself.max_forwards = self.max_forwards
         return cself
 
 class CCEventInfo(CCEventGeneric):
     name = 'CCEventInfo'
-    pass
 
 class CCEventDisconnect(CCEventGeneric):
     name = 'CCEventDisconnect'
-    pass
-
-from sippy.SipHeader import SipHeader
-from sippy.SipWarning import SipWarning
 
 class CCEventFail(CCEventGeneric):
     name = 'CCEventFail'
@@ -111,14 +113,25 @@ class CCEventFail(CCEventGeneric):
     warning = None
 
     def getCopy(self):
-        cself = CCEventGeneric.getCopy(self)
-        if self.challenges != None:
+        cself = super().getCopy()
+        if self.challenges is not None:
             cself.challenges = [x.getCopy() for x in self.challenges]
+        if self.warning is not None:
+            cself.warning = self.warning.getCopy()
         return cself
 
+    def getExtraHeaders(self):
+        extra_headers = []
+        if (eh := super().getExtraHeaders()) is not None:
+            extra_headers.extend(eh)
+        if self.challenges is not None:
+            extra_headers.extend(self.challenges)
+        if self.warning is not None:
+            extra_headers.append(self.warning)
+        return tuple(extra_headers) if len(extra_headers) > 0 else None
+
     def setWarning(self, eistr):
         self.warning = SipHeader(body = SipWarning(text = eistr))
 
 class CCEventRedirect(CCEventGeneric):
     name = 'CCEventRedirect'
-    pass

{sippy-2.2.0 → sippy-2.2.2}/sippy/CLIManager.py

@@ -125,7 +125,7 @@ class CLIConnectionManager(object):
                 conn.close()
                 return
         try:
-            cm = CLIManager(conn, self.command_cb, address)
+            cm = CLIManager(conn, self.command_cb)
         except Exception as e:
             dump_exception('CLIConnectionManager: unhandled exception when setting up incoming connection handler')
             conn.close()
@@ -169,7 +169,16 @@ class _CLIManager_w(Thread):
                 self.wbuffer = None
             self.w_available.release()
             while True:
-                res = self.clientsock.send(wbuffer)
+                try:
+                    res = self.clientsock.send(wbuffer)
+                except BrokenPipeError:
+                    self.clim = None
+                    return
+                except socket.error as why:
+                    if why.errno != EBADF:
+                        raise
+                    self.clim = None
+                    return
                 if res == len(wbuffer):
                     break
                 if res > 0:
@@ -235,14 +244,12 @@ class CLIManager(object):
     clientsock = None
     command_cb = None
     close_pendind = False
-    raddr = None
     wthr = None
     rthr = None
 
-    def __init__(self, clientsock, command_cb, raddr):
+    def __init__(self, clientsock, command_cb):
         self.clientsock = clientsock
         self.command_cb = command_cb
-        self.raddr = raddr
         self.wthr = _CLIManager_w(clientsock, self)
         self.rthr = _CLIManager_r(clientsock, self)
 
@@ -276,7 +283,7 @@ class CLIManager(object):
             self.clientsock.shutdown(socket.SHUT_RDWR)
         except Exception as e:
             if not isinstance(e, socket.error) or e.errno != ENOTCONN: # pylint: disable=no-member
-                dump_exception('self.clientsock.shutdown(socket.SHUT_RDWR)')
+                dump_exception('CLIManager: unhandled exception in self.clientsock.shutdown(socket.SHUT_RDWR)')
         self.clientsock.close()
         self.wthr = None
         self.rthr = None

{sippy-2.2.0 → sippy-2.2.2}/sippy/Core/EventDispatcher.py

@@ -29,12 +29,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 threading import Lock, local as t_local
 from random import random
 import sys, traceback, signal
 from _thread import get_ident
 from sippy.Time.MonoTime import MonoTime
 from sippy.Core.Exceptions import dump_exception, StdException
+from queue import Queue
 
 from elperiodic.ElPeriodic import ElPeriodic
 
@@ -123,6 +124,8 @@ class EventDispatcher2(Singleton):
     ed_inum = 0
     elp = None
     bands = None
+    _exception = None
+    tloc_data = None
 
     def __init__(self, freq = 100.0):
         EventDispatcher2.state_lock.acquire()
@@ -140,6 +143,7 @@ class EventDispatcher2(Singleton):
         self.elp = ElPeriodic(freq)
         self.elp.CFT_enable(signal.SIGURG)
         self.bands = [(freq, 0),]
+        self.tloc_data = t_local()
 
     def signal(self, signum, frame):
         self.signals_pending.append(signum)
@@ -233,16 +237,35 @@ class EventDispatcher2(Singleton):
     def dispatchThreadCallback(self, thread_cb, cb_params):
         try:
             thread_cb(*cb_params)
-        except Exception as ex:
-            if isinstance(ex, SystemExit):
-                raise
+        except BaseException as ex:
+            if isinstance(ex, (SystemExit, KeyboardInterrupt)):
+                self._exception = ex
+                return
             dump_exception('EventDispatcher2: unhandled exception when processing from-thread-call')
-        #print('dispatchThreadCallback dispatched', thread_cb, cb_params)
+
+    def dispatchThreadCallbackSync(self, res_cb_q, thread_cb, cb_params):
+        try:
+            res = thread_cb(*cb_params)
+        except BaseException as ex:
+            rval = (None, ex)
+        else:
+            rval = (res, None)
+        res_cb_q.put(rval)
 
     def callFromThread(self, thread_cb, *cb_params):
         self.elp.call_from_thread(self.dispatchThreadCallback, thread_cb, cb_params)
         #print('EventDispatcher2.callFromThread completed', str(self), thread_cb, cb_params)
 
+    def callFromThreadSync(self, thread_cb, *cb_params):
+        if not hasattr(self.tloc_data, 'res_cb_q'):
+            self.tloc_data.res_cb_q = Queue()
+        res_cb_q = self.tloc_data.res_cb_q
+        self.elp.call_from_thread(self.dispatchThreadCallbackSync, res_cb_q, thread_cb, cb_params)
+        res, ex = res_cb_q.get()
+        if ex is not None:
+            raise ex
+        return res
+
     def loop(self, timeout = None, freq = None):
         if freq != None and self.bands[0][0] != freq:
             for fb in self.bands:
@@ -255,8 +278,7 @@ class EventDispatcher2(Singleton):
             self.bands.insert(0, fb)
         self.endloop = False
         self.last_ts = MonoTime()
-        if timeout != None:
-            etime = self.last_ts.getOffsetCopy(timeout)
+        etime = None if timeout is None else self.last_ts.getOffsetCopy(timeout)
         while True:
             if len(self.signals_pending) > 0:
                 self.dispatchSignals()
@@ -275,6 +297,10 @@ class EventDispatcher2(Singleton):
                 break
             self.elp.procrastinate()
             self.last_ts = MonoTime()
+            if self._exception is not None:
+                ex = self._exception
+                self._exception = None
+                raise ex
         return self.el_rval
 
     def breakLoop(self, rval=0):

sippy-2.2.2/sippy/Exceptions/RtpProxyError.py

@@ -0,0 +1,30 @@
+# 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 .SipHandlingError import SipHandlingError
+
+class RtpProxyError(SipHandlingError):
+    code = 502
+    msg = 'Bad Gateway'

sippy-2.2.2/sippy/Exceptions/SdpParseError.py

@@ -0,0 +1,33 @@
+# 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 .SipHandlingError import SipHandlingError
+from .RtpProxyError import RtpProxyError
+
+class SdpParseError(SipHandlingError):
+    code = 488
+    msg = 'Not Acceptable Here'
+
+SdpHandlingErrors = (SdpParseError, RtpProxyError)

sippy-2.2.0/sippy/Exceptions/SipParseError.py → sippy-2.2.2/sippy/Exceptions/SipHandlingError.py

@@ -24,33 +24,23 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 from sippy.SipReason import SipReason
-from sippy.SipHeader import SipHeader
 
-class SipParseError(Exception):
+class SipHandlingError(Exception):
+    code: int
+    msg: str
     sip_response = None
     arg = None
 
-    def __init__(self, arg, sip_response = None):
+    def __init__(self, arg):
         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 (reason:=self.getReason()) is not None:
-            rsh = SipHeader(body = reason)
-            resp.appendHeader(rsh)
+        reason = self.getReason()
+        resp = req.genResponse(self.code, self.msg, ext_reason = reason)
         return resp
 
     def getReason(self):