sippy 2.2.2__tar.gz → 2.2.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sippy
-Version: 2.2.2
+Version: 2.2.3
 Summary: RFC3261 SIP Stack and Back-to-Back User Agent (B2BUA)
 Home-page: http://www.b2bua.org/
 Author: Sippy Software, Inc.

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

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

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

@@ -27,7 +27,7 @@
 
 from __future__ import print_function
 
-from os import remove, chown, chmod
+from os import remove, chown, chmod, pipe, read, write, close
 import socket
 from errno import EPIPE, ENOTCONN, EBADF, ECONNABORTED
 from select import poll, POLLIN, POLLNVAL
@@ -48,19 +48,30 @@ class _Acceptor(Thread):
     pollobj = None
     fileno = None
 
-    def __init__(self, clicm):
+    def __init__(self, clicm, wakeup_r):
         Thread.__init__(self)
         self.clicm = clicm
         self.pollobj = poll()
         self.fileno = self.clicm.serversock.fileno()
+        self.wakeup_r = wakeup_r
         self.pollobj.register(self.fileno, POLLIN)
+        self.pollobj.register(self.wakeup_r, POLLIN)
         self.start()
 
     def run(self):
         #print(self.run, 'enter')
         while True:
             #print(self.run, 'cycle')
-            pollret = dict(self.pollobj.poll()).get(self.fileno, 0)
+            revents = dict(self.pollobj.poll())
+            if self.wakeup_r in revents and (revents[self.wakeup_r] & POLLIN):
+                try:
+                    # drain the pipe (best-effort)
+                    read(self.wakeup_r, 1024)
+                except OSError:
+                    dump_exception('CLIConnectionManager: unhandled exception draining wakeup socket')
+                    pass
+                break
+            pollret = revents.get(self.fileno, 0)
             if pollret & POLLNVAL != 0:
                 break
             if pollret & POLLIN == 0:
@@ -74,16 +85,18 @@ class _Acceptor(Thread):
                     break
                 else:
                     raise
-            except Exception as e:
-                dump_exception('CLIConnectionManager: unhandled exception when accepting incoming connection')
+            except Exception:
+                dump_exception('CLIConnectionManager: unhandled exception accepting incoming connection')
                 break
             #print(self.run, 'handle_accept')
             ED2.callFromThread(self.clicm.handle_accept, clientsock, addr)
         self.clicm = None
+        close(self.wakeup_r)
         #print(self.run, 'exit')
 
 class CLIConnectionManager(object):
     command_cb = None
+    address = None
     tcp = False
     accept_list: list = None
     serversock = None
@@ -116,7 +129,9 @@ class CLIConnectionManager(object):
             if sock_mode != None:
                 chmod(address, sock_mode)
         self.serversock.listen(backlog)
-        self.atr = _Acceptor(self)
+        wakeup_r, self._wakeup_w = pipe()
+        self.atr = _Acceptor(self, wakeup_r)
+        self.address = address
 
     def handle_accept(self, conn, address):
         #print(self.handle_accept)
@@ -126,15 +141,23 @@ class CLIConnectionManager(object):
                 return
         try:
             cm = CLIManager(conn, self.command_cb)
-        except Exception as e:
-            dump_exception('CLIConnectionManager: unhandled exception when setting up incoming connection handler')
+        except Exception:
+            dump_exception('CLIConnectionManager: unhandled exception setting up incoming connection handler')
             conn.close()
             return
 
     def shutdown(self):
+        try:
+            write(self._wakeup_w, b'\x01')
+        except OSError:
+            dump_exception('CLIConnectionManager: unhandled exception waking up acceptor')
+            pass
+        close(self._wakeup_w)
         self.serversock.close()
         self.command_cb = None
         self.atr.join()
+        if not self.tcp:
+            remove(self.address)
 
 class _CLIManager_w(Thread):
     daemon = True
@@ -257,7 +280,7 @@ class CLIManager(object):
         try:
             self.command_cb(self, cmd)
         except:
-            dump_exception('CLIManager: unhandled exception when processing incoming data')
+            dump_exception('CLIManager: unhandled exception processing incoming data')
             self.close()
 
     def send(self, data):

{sippy-2.2.2 → sippy-2.2.3}/sippy/Rtp_proxy/Client/Worker/external.py

@@ -101,21 +101,23 @@ class RTPPLWorker_external(Thread):
             if wi == None:
                 break
             command, result_callback, callback_parameters = wi
+            ex = None
             try:
                 data, rtpc_delay = self.send_raw(command)
                 if len(data) == 0:
                     data, rtpc_delay = None, None
             except Exception as e:
+                data, rtpc_delay, ex = None, None, e
+            if result_callback is not None:
+                ED2.callFromThread(self.dispatch, result_callback, data, ex, callback_parameters)
+            elif ex is not None:
                 dump_exception('RTPPLWorker_external: unhandled exception I/O RTPproxy')
-                data, rtpc_delay = None, None
-            if result_callback != None:
-                ED2.callFromThread(self.dispatch, result_callback, data, callback_parameters)
-            if rtpc_delay != None:
+            if rtpc_delay is not None:
                 ED2.callFromThread(self.userv.register_delay, rtpc_delay)
         self.userv = None
 
-    def dispatch(self, result_callback, data, callback_parameters):
+    def dispatch(self, result_callback, data, ex, callback_parameters):
         try:
-            result_callback(data, *callback_parameters)
+            result_callback(data, *callback_parameters, ex=ex)
         except:
             dump_exception('RTPPLWorker_external: unhandled exception when processing RTPproxy reply')

{sippy-2.2.2 → sippy-2.2.3}/sippy/Rtp_proxy/Client/stream.py

@@ -88,15 +88,18 @@ def test(class_obj):
     class robj(object):
         rval = None
     r = robj()
-    def display(res, ro, arg):
+    def display(res, ro, arg, ex=None):
         print(res, arg)
-        ro.rval = (res, arg)
+        ro.rval = (res, arg, ex)
         ED2.breakLoop()
     rc = class_obj({'_sip_address':'1.2.3.4'})
     rc.send_command('VF 123456', display, r, 'abcd')
     ED2.loop()
     rc.shutdown()
-    assert(r.rval == (u'0', u'abcd'))
+    res, arg, ex = r.rval
+    if ex:
+        raise ex
+    assert((res, arg) == (u'0', u'abcd'))
     print('passed')
 
 if __name__ == '__main__':

{sippy-2.2.2 → sippy-2.2.3}/sippy/Rtp_proxy/Client/udp.py

@@ -181,8 +181,10 @@ class Rtp_proxy_client_udp(Rtp_proxy_client_net):
 
 class selftest(object):
 
-    def gotreply(self, ED2, rtpc, *args):
+    def gotreply(self, ED2, rtpc, *args, ex=None):
         print(args)
+        if ex:
+            print("Error:", ex)
         rtpc.shutdown()
         ED2.breakLoop()
 

{sippy-2.2.2 → sippy-2.2.3}/sippy/Rtp_proxy/Cmd/sequencer.py

@@ -24,6 +24,8 @@
 # (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.Core.Exceptions import dump_exception
+
 class Rtp_proxy_cmd_sequencer(object):
     rtp_proxy_client = None
     comqueue = None
@@ -43,7 +45,9 @@ class Rtp_proxy_cmd_sequencer(object):
         self.inflight = (command, result_callback, callback_parameters)
         self.rtp_proxy_client.send_command(command, self.result_callback)
 
-    def result_callback(self, result):
+    def result_callback(self, result, ex=None):
+        if ex is not None:
+            dump_exception('Rtp_proxy_cmd_sequencer: unhandled exception I/O RTPproxy')
         command, result_callback, callback_parameters = self.inflight
         self.inflight = None
         if self.rtp_proxy_client != None and len(self.comqueue) > 0:

{sippy-2.2.2 → sippy-2.2.3}/sippy/Rtp_proxy/client.py

@@ -48,7 +48,7 @@ class Rtpp_caps_checker(object):
             self.caps_requested += 1
             rtpc.send_command('VF %s' % vers, self.caps_query_done, vers)
 
-    def caps_query_done(self, result, vers):
+    def caps_query_done(self, result, vers, ex=None):
         self.caps_received += 1
         vname = CAPSTABLE[vers]
         if result == '1':
@@ -207,7 +207,7 @@ class Rtp_proxy_client(Rtp_proxy_client_udp, Rtp_proxy_client_stream):
             return
         self.send_command('V', self.version_check_reply)
 
-    def version_check_reply(self, version):
+    def version_check_reply(self, version, ex=None):
         if self.shut_down:
             return
         if version == '20040107':
@@ -225,7 +225,7 @@ class Rtp_proxy_client(Rtp_proxy_client_udp, Rtp_proxy_client_stream):
             return
         self.send_command('Ib', self.heartbeat_reply)
 
-    def heartbeat_reply(self, stats):
+    def heartbeat_reply(self, stats, ex=None):
         #print('heartbeat_reply', self.address, stats, self.online)
         if self.shut_down:
             return
@@ -293,8 +293,10 @@ class Rtp_proxy_client(Rtp_proxy_client_udp, Rtp_proxy_client_stream):
 def test(cmd = 'VF 123456', **kwargs):
     from sippy.Core.EventDispatcher import ED2
     from sippy.Time.Timeout import Timeout
-    def display(*args):
+    def display(*args, ex=None):
         print(args)
+        if ex:
+            print("Error:", ex)
         ED2.breakLoop()
     def waitonline(rpc):
         if rpc.online:

{sippy-2.2.2 → sippy-2.2.3}/sippy/Rtp_proxy/session.py

@@ -94,7 +94,7 @@ class Rtp_proxy_session(object):
     def version(self, result_callback):
         self.rtp_proxy_client.send_command('V', self.version_result, result_callback)
 
-    def version_result(self, result, result_callback):
+    def version_result(self, result, result_callback, ex=None):
         result_callback(result)
 
     def play_caller(self, prompt_name, times = 1, result_callback = None, index = 0):
@@ -167,7 +167,7 @@ class Rtp_proxy_session(object):
         command = 'Q %s %s %s' % ('%s-%d' % (self.call_id, index), self.from_tag, self.to_tag)
         self.rtp_proxy_client.send_command(command, self.stats_result, (result_callback, callback_parameters))
 
-    def stats_result(self, result, args):
+    def stats_result(self, result, args, ex=None):
         t1 = result.split()
         result_callback, callback_parameters = args
         if len(t1) == 1:

{sippy-2.2.2 → sippy-2.2.3}/sippy/b2bua.py

@@ -818,6 +818,7 @@ def main_func():
     finally:
         if '_wss_server' in global_config:
             global_config['_wss_server'].shutdown()
+        clis.shutdown()
 
 if __name__ == '__main__':
     main_func()

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sippy
-Version: 2.2.2
+Version: 2.2.3
 Summary: RFC3261 SIP Stack and Back-to-Back User Agent (B2BUA)
 Home-page: http://www.b2bua.org/
 Author: Sippy Software, Inc.