Merge branch 'master' of or3st3s@baryon.com.ar:workspace/pymin into suse

[software/pymin.git] / pymin / services / ppp / __init__.py

diff --git a/pymin/services/ppp/__init__.py b/pymin/services/ppp/__init__.py
index 91070e79cc652441b6909e36cda6a06a31939aab..caf8f4ed1cd308f3b23525c81a75105dec6ef790 100644 (file)
--- a/pymin/services/ppp/__init__.py
+++ b/pymin/services/ppp/__init__.py
@@ -1,6 +1,8 @@
 # vim: set encoding=utf-8 et sw=4 sts=4 :
 
 # vim: set encoding=utf-8 et sw=4 sts=4 :
 

+import os

 from os import path
 from os import path

+from signal import SIGTERM

 
 from pymin.seqtools import Sequence
 from pymin.dispatcher import Handler, handler, HandlerError
 
 from pymin.seqtools import Sequence
 from pymin.dispatcher import Handler, handler, HandlerError


@@ -104,7 +106,7 @@ class PppHandler(Restorable, ConfigWriter, ReloadHandler, TransactionalHandler):
         for name in names:
             if name in self.conns:
                 if not self.conns[name]._running:
         for name in names:
             if name in self.conns:
                 if not self.conns[name]._running:

-                    call(('pon', name))
+                    call(('pppd', 'call', name))

                     self.conns[name]._running = True
                     self._dump_attr('conns')
             else:
                     self.conns[name]._running = True
                     self._dump_attr('conns')
             else:


@@ -119,6 +121,12 @@ class PppHandler(Restorable, ConfigWriter, ReloadHandler, TransactionalHandler):
             if name in self.conns:
                 if self.conns[name]._running:
                     call(('poff', name))
             if name in self.conns:
                 if self.conns[name]._running:
                     call(('poff', name))

+                    if path.exists('/var/run/ppp-' + name + '.pid'):
+                        pid = file('/var/run/ppp-' + name + '.pid').readline()
+                        try:
+                            os.kill(int(pid.strip()), SIGTERM)
+                        except OSError:
+                            pass # XXX report error?

                     self.conns[name]._running = False
                     self._dump_attr('conns')
             else:
                     self.conns[name]._running = False
                     self._dump_attr('conns')
             else:


@@ -178,6 +186,7 @@ class PppHandler(Restorable, ConfigWriter, ReloadHandler, TransactionalHandler):
 
 
 if __name__ == '__main__':
 
 
 if __name__ == '__main__':

+

     p = PppHandler()
     p.conn.add('ppp_c','nico','nico',type='PPP',device='tty0')
     p.conn.add('pppoe_c','fede','fede',type='OE',device='tty1')
     p = PppHandler()
     p.conn.add('ppp_c','nico','nico',type='PPP',device='tty0')
     p.conn.add('pppoe_c','fede','fede',type='OE',device='tty1')


@@ -185,3 +194,4 @@ if __name__ == '__main__':
     p.commit()
     print p.conn.list()
     print p.conn.show()
     p.commit()
     print p.conn.list()
     print p.conn.show()

+