sippy 2.1.0__tar.gz → 2.2.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sippy
-Version: 2.1.0
+Version: 2.2.0
 Summary: RFC3261 SIP Stack and Back-to-Back User Agent (B2BUA)
 Home-page: http://www.b2bua.org/
 Author: Sippy Software, Inc.
@@ -14,6 +14,7 @@ Description-Content-Type: text/markdown
 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++)
 
@@ -33,6 +34,13 @@ Sippy B2BUA doesn't perform any media relaying or processing, therefore it
 doesn't introduce any additional packet loss, delay or jitter into the media
 path. 
 
+## News
+
+- Support for WebRTC clients has been added via RFC7118-compatible secure
+  websocket (`wss`) interface. Combined with the functionality provided
+  by the RTPProxy's `dtls_gw` and `ice_lite` modules allows building
+  high-capacity WebRTC<->SIP gateways.
+
 ## Features
 
 - 5,000-10,000 simultaneous sessions per server
@@ -66,8 +74,8 @@ path.
 To get started, you can use the b2bua_simple implementation. The following
 example will cause the b2bua run in the foreground so you can see the SIP
 messaging. If you make a call to the IP address of your host machine, the b2bua
-will recieve the call on its UAC side, and it will send a new call leg out its
-UAS side to the IP address 192.168.1.1. It is expected that 192.168.1.1 is some
+will recieve the call on its UAS side, and it will send a new call leg out its
+UAC side to the IP address 192.168.1.1. It is expected that 192.168.1.1 is some
 sort of SIP switch or termination gateway.
 
 `b2bua_simple -f -n 192.168.1.1`

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

@@ -16,6 +16,13 @@ Sippy B2BUA doesn't perform any media relaying or processing, therefore it
 doesn't introduce any additional packet loss, delay or jitter into the media
 path. 
 
+## News
+
+- Support for WebRTC clients has been added via RFC7118-compatible secure
+  websocket (`wss`) interface. Combined with the functionality provided
+  by the RTPProxy's `dtls_gw` and `ice_lite` modules allows building
+  high-capacity WebRTC<->SIP gateways.
+
 ## Features
 
 - 5,000-10,000 simultaneous sessions per server
@@ -49,8 +56,8 @@ path.
 To get started, you can use the b2bua_simple implementation. The following
 example will cause the b2bua run in the foreground so you can see the SIP
 messaging. If you make a call to the IP address of your host machine, the b2bua
-will recieve the call on its UAC side, and it will send a new call leg out its
-UAS side to the IP address 192.168.1.1. It is expected that 192.168.1.1 is some
+will recieve the call on its UAS side, and it will send a new call leg out its
+UAC side to the IP address 192.168.1.1. It is expected that 192.168.1.1 is some
 sort of SIP switch or termination gateway.
 
 `b2bua_simple -f -n 192.168.1.1`

sippy-2.2.0/pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"

{sippy-2.1.0 → sippy-2.2.0}/requirements.txt

@@ -1,2 +1,3 @@
 ElPeriodic>=1.1
 pycryptodome
+websockets

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

@@ -8,7 +8,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name = "sippy",
-    version = "2.1.0",
+    version = "2.2.0",
     packages = find_packages(),
 
     install_requires = requirements,

{sippy-2.1.0 → sippy-2.2.0}/sippy/B2BRoute.py

@@ -26,6 +26,7 @@
 
 from sippy.SipHeader import SipHeader
 from sippy.SipConf import SipConf
+from sippy.B2BTransforms import getTransProc
 
 try:
     from urllib import unquote
@@ -33,6 +34,11 @@ except ImportError:
     from urllib.parse import unquote
 from socket import getaddrinfo, SOCK_STREAM, AF_INET, AF_INET6
 
+SRC_WSS = '[[WSS]]'
+SRC_PROXY = '[[PROXY]]'
+DST_SIP_UA = 'sip-ua'
+DST_WSS_UA = 'wss-ua'
+
 class B2BRoute(object):
     rnum = None
     addrinfo = None
@@ -48,6 +54,7 @@ class B2BRoute(object):
     forward_on_fail = False
     user = None
     passw = None
+    pass_auth = True
     cli = None
     cli_set = False
     params = None
@@ -70,6 +77,7 @@ class B2BRoute(object):
             self.forward_on_fail = cself.forward_on_fail
             self.user = cself.user
             self.passw = cself.passw
+            self.pass_auth = cself.pass_auth
             self.cli = cself.cli
             self.cli_set = cself.cli_set
             self.params = dict(cself.params)
@@ -105,7 +113,8 @@ class B2BRoute(object):
             port = SipConf.default_port
         else:
             port = int(hostport[1])
-        self.ainfo = getaddrinfo(hostport[0], port, af, SOCK_STREAM)
+        if not hostport[0] in (DST_SIP_UA, DST_WSS_UA):
+            self.ainfo = getaddrinfo(hostport[0], port, af, SOCK_STREAM)
         self.params = {}
         extra_headers = []
         for a, v in [x.split('=', 1) for x in route[1:]]:
@@ -131,7 +140,9 @@ class B2BRoute(object):
             elif a == 'forward_on_fail':
                 self.forward_on_fail = True
             elif a == 'auth':
-                self.user, self.passw = v.split(':', 1)
+                self.pass_auth = False
+                if v != 'nopass':
+                    self.user, self.passw = v.split(':', 1)
             elif a == 'cli':
                 self.cli = v
                 if len(self.cli) == 0:
@@ -153,6 +164,8 @@ class B2BRoute(object):
                     self.params['outbound_proxy'] = (v, 5060)
                 else:
                     self.params['outbound_proxy'] = (host_port[0], int(host_port[1]))
+            elif a == 'po_proc':
+                self.params['po_proc'] = getTransProc(v)
             else:
                 self.params[a] = v
         if len(extra_headers) > 0:

sippy-2.2.0/sippy/B2BTransforms.py

@@ -0,0 +1,99 @@
+# Copyright (c) 2024 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.
+
+import sys
+
+from sippy.SipRequest import SipRequest
+from sippy.CCEvents import CCEventTry
+
+class HDR2Xattrs():
+    # Source: https://github.com/sippy/b2bua/pull/38
+    # Author: @twmobius
+    hdr_name:str
+    def __init__(self, hdr_name:str):
+        self.hdr_name = hdr_name
+
+    def __call__(self, cc:'CallController', req:SipRequest):
+        hfs = req.getHFs(self.hdr_name)
+
+        if len(hfs) == 0:
+            return
+
+        extra_attributes = []
+
+        for header in hfs:
+            kvPairs = header.body.body.split(';')
+            for pair in kvPairs:
+                [key, _, value] = pair.partition("=")
+                if value != '':
+                    extra_attributes.append((key, value))
+        if len(extra_attributes) == 0:
+            return
+        if cc.extra_attributes is None:
+            cc.extra_attributes = extra_attributes
+        else:
+            cc.extra_attributes.extend(extra_attributes)
+
+class VAL2Xattrs():
+    # Source: https://github.com/sippy/b2bua/pull/39
+    # Author: @twmobius
+    doO: bool = True
+    doA: bool = True
+    radius_parameters: list
+    def __init__(self, v:str):
+        radius_parameters = []
+        pairs = v.split(',')
+        for pair in pairs:
+            [key, _, value] = pair.partition("=")
+            if value == '': raise ValueError(f'{v}: comma-separated list of key=value pairs is expected')
+            radius_parameters.append((key, value))
+        self.radius_parameters = radius_parameters
+
+    def __call__(self, cc:'CallController', _:CCEventTry):
+        if self.doO and cc.acctO is not None:
+            cc.acctO.addAttributes(self.radius_parameters)
+        if self.doA and cc.acctA is not None:
+            cc.acctA.addAttributes(self.radius_parameters)
+
+class Nop():
+    def __init__(self, v:str): pass
+    def __call__(self, *a, **kwa): pass
+
+class VAL2XattrsA(VAL2Xattrs): doO = False
+class VAL2XattrsO(VAL2Xattrs): doA = False
+
+def getTransProc(value:str):
+    rparts = value.split('[', 1)
+    if not len(rparts) == 2 or not value.endswith(']'):
+        raise ValueError(f'getTransProc: `{value}` should be in the format `function[argument]`')
+    fname = rparts[0]
+    bts = sys.modules[__name__]
+    fclass = getattr(bts, fname)
+    farg = rparts[1][:-1]
+    return fclass(farg)
+
+if __name__ == '__main__':
+    for t in ('HDR2Xattrs[X-foo-hdr]', 'VAL2Xattrs[foo=bar,baz=xxx]', 'VAL2XattrsA[foo=bar,baz=xxx]', 'VAL2XattrsO[foo=bar,baz=xxx]'):
+        p = getTransProc(t)

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

@@ -43,6 +43,7 @@ except NameError:
     _uobj = bytes
 
 class _Acceptor(Thread):
+    daemon = True
     clicm = None
     pollobj = None
     fileno = None
@@ -53,7 +54,6 @@ class _Acceptor(Thread):
         self.pollobj = poll()
         self.fileno = self.clicm.serversock.fileno()
         self.pollobj.register(self.fileno, POLLIN)
-        self.setDaemon(True)
         self.start()
 
     def run(self):
@@ -85,7 +85,7 @@ class _Acceptor(Thread):
 class CLIConnectionManager(object):
     command_cb = None
     tcp = False
-    accept_list = None
+    accept_list: list = None
     serversock = None
     atr = None
 
@@ -120,9 +120,10 @@ class CLIConnectionManager(object):
 
     def handle_accept(self, conn, address):
         #print(self.handle_accept)
-        if self.tcp and self.accept_list != None and address[0] not in self.accept_list:
-            conn.close()
-            return
+        if self.tcp and self.accept_list is not None:
+            if address[0] not in self.accept_list: # pylint: disable=unsupported-membership-test
+                conn.close()
+                return
         try:
             cm = CLIManager(conn, self.command_cb, address)
         except Exception as e:
@@ -136,6 +137,7 @@ class CLIConnectionManager(object):
         self.atr.join()
 
 class _CLIManager_w(Thread):
+    daemon = True
     clim = None
     wbuffer = None
     w_available = None
@@ -148,7 +150,6 @@ class _CLIManager_w(Thread):
         self.clim = clim
         self.w_available = Condition()
         self.wbuffer = bytes()
-        self.setDaemon(True)
         self.start()
 
     def run(self):
@@ -195,6 +196,7 @@ class _CLIManager_w(Thread):
         self.w_available.release()
 
 class _CLIManager_r(Thread):
+    daemon = True
     clim = None
 
     def __init__(self, clientsock, clim):
@@ -202,7 +204,6 @@ class _CLIManager_r(Thread):
         Thread.__init__(self)
         self.clientsock = clientsock
         self.clim = clim
-        self.setDaemon(True)
         self.start()
 
     def run(self):
@@ -274,7 +275,7 @@ class CLIManager(object):
         try:
             self.clientsock.shutdown(socket.SHUT_RDWR)
         except Exception as e:
-            if not isinstance(e, socket.error) or e.errno != ENOTCONN:
+            if not isinstance(e, socket.error) or e.errno != ENOTCONN: # pylint: disable=no-member
                 dump_exception('self.clientsock.shutdown(socket.SHUT_RDWR)')
         self.clientsock.close()
         self.wthr = None

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

@@ -43,11 +43,6 @@ class EventListener(object):
     cb_with_ts = False
     randomize_runs = None
 
-    def __cmp__(self, other):
-        if other == None:
-            return 1
-        return cmp(self.etime, other.etime)
-
     def __lt__(self, other):
         return self.etime < other.etime
 

{sippy-2.1.0 → sippy-2.2.0}/sippy/Core/Exceptions.py

@@ -34,7 +34,7 @@ class StdException(Exception):
 
     def __init__(self, *args):
         pin_exception(self, 2)
-        super(self.__class__, self).__init__(*args)
+        super(StdException, self).__init__(*args)
 
 def dump_exception(msg, f = sys.stdout, extra = None):
     exc_type, exc_value, exc_traceback = sys.exc_info()

{sippy-2.1.0 → sippy-2.2.0}/sippy/Exceptions/RtpProxyError.py

@@ -36,3 +36,6 @@ class RtpProxyError(Exception):
 
     def getResponse(self, req):
         return SdpParseError.getResponse(self, req)
+
+    def getReason(self):
+        return SdpParseError.getReason(self)

{sippy-2.1.0 → sippy-2.2.0}/sippy/Exceptions/SipParseError.py

@@ -48,9 +48,13 @@ class SdpParseError(SipParseError):
         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)
+        if (reason:=self.getReason()) is not None:
             rsh = SipHeader(body = reason)
             resp.appendHeader(rsh)
         return resp
+
+    def getReason(self):
+        if self.arg is not None and len(self.arg) > 0:
+            return SipReason(protocol='SIP', cause=self.code,
+                             reason=self.arg)
+        return None

{sippy-2.1.0 → sippy-2.2.0}/sippy/External_command.py

@@ -36,6 +36,7 @@ from sippy.Core.EventDispatcher import ED2
 _MAX_WORKERS = 20
 
 class _Worker(Thread):
+    daemon = True
     command = None
     master = None
 
@@ -43,7 +44,6 @@ class _Worker(Thread):
         Thread.__init__(self)
         self.command = command
         self.master = master
-        self.setDaemon(True)
         self.start()
 
     def run(self):

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

@@ -68,10 +68,10 @@ class MsgBody(object):
     def __str__(self):
         return str(self.content)
 
-    def localStr(self, local_addr = None, local_port = None):
+    def localStr(self, local_addr = None):
         if type(self.content) in str_types:
             return self.content
-        return self.content.localStr(local_addr, local_port)
+        return self.content.localStr(local_addr)
 
     def getType(self):
         return self.mtype.name.lower()

{sippy-2.1.0 → sippy-2.2.0}/sippy/MultipartMixBody.py

@@ -30,7 +30,7 @@ class MultipartMixBody():
     boundary = None
 
     def __init__(self, body = None, ctype = None):
-        if body == None:
+        if body is None:
             return
         sep = f'--{ctype.params["boundary"]}'
         bparts = body.split(sep)
@@ -53,9 +53,9 @@ class MultipartMixBody():
         s += f'{bnd[:-2]}--\r\n'
         return s
 
-    def localStr(self, local_addr = None, local_port = None):
+    def localStr(self, local_addr = None):
         bnd = f'--{self.boundary}\r\n'
-        parts = [f'{bnd}Content-Type: {p.mtype}\r\n{p.localStr(local_addr, local_port)}'
+        parts = [f'{bnd}Content-Type: {p.mtype}\r\n{p.localStr(local_addr)}'
                  for p in self.parts]
         s = ''.join(parts)
         s += f'{bnd[:-2]}--\r\n'

{sippy-2.1.0 → sippy-2.2.0}/sippy/MyConfigParser.py

@@ -33,6 +33,7 @@ except ImportError:
     from configparser import RawConfigParser
     _boolean_states = RawConfigParser.BOOLEAN_STATES
 from sippy.SipConf import SipConf
+from sippy.B2BTransforms import getTransProc
 
 SUPPORTED_OPTIONS = { \
  'acct_enable':       ('B', 'enable or disable Radius accounting'), \
@@ -98,6 +99,13 @@ SUPPORTED_OPTIONS = { \
                              'and "SUBSCRIBE" messages. Address in the format ' \
                              '"host[:port]"'),
  'nat_traversal':     ('B', 'enable NAT traversal for signalling'), \
+ 'wss_socket':        ('S', 'WSS (SIP via websockets, RFC7118) socket ' \
+                             'configuration. Configuration in the format ' \
+                             '"host:port:cert_file:key_file", where "cert_file" ' \
+                             '/ "key_file" are paths to the TLS certificate ' \
+                             'and key file respectively in the X.509 PEM format'),
+ 'pre_auth_proc': ('S', 'internal routine to be executed before authentication '\
+                        'is being processed. E.g. "HDR2Xattrs[X-foo-hdr]."'), \
  'xmpp_b2bua_id':     ('I', 'ID passed to the XMPP socket server')}
 
 class MyConfigParser(RawConfigParser):
@@ -193,7 +201,8 @@ class MyConfigParser(RawConfigParser):
             if _value <= 0:
                 raise ValueError('max_credit_time should be more than zero')
         elif key == 'allowed_pts':
-            self['_allowed_pts'] = [int(x) for x in value.split(',')]
+            self['_allowed_pts'] = [int(x) if not (x.startswith('[') and x.endswith(']')) \
+                                           else x[1:-1] for x in value.split(',')]
         elif key in ('accept_ips', 'rtp_proxy_clients'):
             self['_' + key] = [x.strip() for x in value.split(',')]
         elif key == 'pass_headers':
@@ -210,6 +219,8 @@ class MyConfigParser(RawConfigParser):
             if _value <= 0 or _value > 65535:
                 raise ValueError('sip_port should be in the range 1-65535')
             self['_sip_port'] = _value
+        elif key == 'pre_auth_proc':
+            self['_pre_auth_proc'] = getTransProc(value)
         self[key] = value
 
     def options_help(self):

sippy-2.2.0/sippy/Network_server.py

@@ -0,0 +1,150 @@
+# Copyright (c) 2003-2005 Maxim Sobolev. All rights reserved.
+# Copyright (c) 2006-2024 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 typing import Optional, Tuple, List, Union
+from queue import Queue
+from abc import ABC, abstractmethod
+from random import random, randint
+
+from sippy.Core.Exceptions import dump_exception
+from sippy.Time.MonoTime import MonoTime
+from sippy.Time.Timeout import Timeout
+from sippy.SipConf import MyPort
+
+class Remote_address():
+    transport: str
+    address: Tuple[str, int]
+    received: str
+
+    def __init__(self, address:Tuple[str, int], transport:str):
+        self.transport = transport
+        self.address = address
+        self.received = address[0]
+
+    def __str__(self):
+        return f'{self.transport}:{self.address[0]}:{self.address[1]}'
+
+class Network_server_opts():
+    laddress: Optional[Tuple[str, Union[int, callable, MyPort]]] = None
+    data_callback: Optional[callable] = None
+    direct_dispatch: bool = False
+    ploss_out_rate: float = 0.0
+    pdelay_out_max: float = 0.0
+    ploss_in_rate: float = 0.0
+    pdelay_in_max: float = 0.0
+
+    def __init__(self, *args:Optional[Tuple[str, int]], o:Optional['Network_server_opts'] = None):
+        if o != None:
+            self.laddress, self.data_callback, self.direct_dispatch, \
+              self.ploss_out_rate, self.pdelay_out_max, self.ploss_in_rate, \
+              self.pdelay_in_max = o.laddress, o.data_callback, o.direct_dispatch, \
+              o.ploss_out_rate, o.pdelay_out_max, o.ploss_in_rate, o.pdelay_in_max
+            return
+        self.laddress, self.data_callback = args
+
+    def getCopy(self) -> 'Network_server_opts':
+        return self.__class__(o = self)
+
+    def isWildCard(self) -> bool:
+        return False
+
+class Network_server(ABC):
+    transport: str
+    uopts: Network_server_opts
+    sendqueue: Queue
+    stats: List[int]
+
+    def __init__(self, uopts:Network_server_opts):
+        self.uopts = uopts.getCopy()
+        self.sendqueue = Queue()
+        self.stats = [0, 0, 0]
+
+    def getSIPaddr(self) -> Tuple[Tuple[str, int], int]:
+        return (self.uopts.laddress, self.transport)
+
+    def addr2str(self, address):
+        return f'{self.transport}:{address[0]}:{address[1]}'
+
+    def send_to(self, data:Union[bytes, str], address:object, delayed:bool = False):
+        if not isinstance(data, bytes):
+            data = data.encode('utf-8')
+        if self.uopts.ploss_out_rate > 0.0 and not delayed:
+            if random() < self.uopts.ploss_out_rate:
+                return
+        if self.uopts.pdelay_out_max > 0.0 and not delayed:
+            pdelay = self.uopts.pdelay_out_max * random()
+            Timeout(self.send_to, pdelay, 1, data, address, True)
+            return
+        self.sendqueue.put((data, address))
+ 
+    def handle_read(self, data:bytes, address:Remote_address, rtime:MonoTime, delayed:bool = False):
+        if len(data) > 0 and self.uopts.data_callback != None:
+            self.stats[2] += 1
+            if self.uopts.ploss_in_rate > 0.0 and not delayed:
+                if random() < self.uopts.ploss_in_rate:
+                    return
+            if self.uopts.pdelay_in_max > 0.0 and not delayed:
+                pdelay = self.uopts.pdelay_in_max * random()
+                Timeout(self.handle_read, pdelay, 1, data, address, rtime.getOffsetCopy(pdelay), True)
+                return
+            try:
+                self.uopts.data_callback(data, address, self, rtime)
+            except Exception as ex:
+                if isinstance(ex, SystemExit):
+                    raise 
+                dump_exception(f'{self.__class__}: unhandled exception when processing incoming data')
+
+    @abstractmethod
+    def join(self):
+        pass
+
+    def shutdown(self):
+        self.sendqueue.put(None)
+        self.join()
+        self.uopts.data_callback = None
+
+class PortAllocationError(Exception): pass
+
+class RTP_port_allocator():
+    min_port: int
+    max_port: int
+
+    def __init__(self, min_port:Optional[int]=None, max_port:Optional[int]=None):
+        if min_port is None: min_port = 1024
+        if max_port is None: max_port = 65535
+        if min_port % 2 != 0:
+            min_port += 1
+        assert min_port <= max_port, f'min_port={min_port} > max_port={max_port}'
+        self.min_port = min_port
+        self.max_port = max_port
+
+    def __call__(self, ntry: int) -> int:
+        rlen = self.max_port - self.min_port
+        if ntry > (rlen // 2):
+            raise PortAllocationError(f'No free ports available after {ntry} tries')
+        port = self.min_port + (randint(0, rlen // 2) * 2)
+        assert port <= self.max_port, f'port={port} > self.max_port={self.max_port}'
+        return port

{sippy-2.1.0 → sippy-2.2.0}/sippy/RadiusAccounting.py

@@ -188,3 +188,7 @@ class RadiusAccounting(object):
         else:
             message = 'Error sending Acct/%s request (delay is %.3f)\n' % (self.origin, delay)
         self.global_config['_sip_logger'].write(message, call_id = sip_cid)
+
+    def addAttributes(self, attributes):
+        self._attributes.extend(tuple(x) for x in attributes \
+                                if tuple(x) not in self._attributes)