import sys
import gobject
+import string
import dbus
import dbus.service
@dbus.service.method("net.connman.Notification",
in_signature='', out_signature='')
def Release(self):
- print("Release")
- self.app.release()
+ print "Release %s" % (self._object_path)
+ session_name = self._object_path.split('/')[-1]
+ self.app.release(session_name)
@dbus.service.method("net.connman.Notification",
in_signature='a{sv}', out_signature='')
def Update(self, settings):
- print "Update called"
+ print "Update called at %s" % (self._object_path)
try:
for key in settings.keys():
dbus.service.Object.__init__(self, bus, object_path)
self.manager = None
- self.notify_path = object_path + "/notify"
- self.notify = None
- self.session_path = None
self.mainloop = mainloop
- self.session = None
+ self.sessions = {}
try:
bus = dbus.SystemBus()
bus.watch_name_owner('net.connman', self.connman_name_owner_changed)
except dbus.DBusException:
traceback.print_exc()
- exit(1)
def connman_name_owner_changed(self, proxy):
try:
else:
print "connman disappeared on D-Bus"
self.manager = None
- self.session = None
- if self.notify:
- self.notify.remove_from_connection()
- self.notify = None
+ for s in self.sessions.keys():
+ self.sessions[s]['notify'].remove_from_connection()
+ self.sessions[s]['notify'] = None
+
+ self.sessions = {}
except dbus.DBusException:
traceback.print_exc()
- exit(1)
- def release(self):
- if self.session:
- self.manager.DestroySession(self.session_path)
- self.session = None
- if self.notify:
- self.notify.remove_from_connection()
- self.notify = None
+ def release(self, session_name):
+ s = self.find_session(session_name)
+ if not s:
+ return
+ if s['session']:
+ s['session'].Destroy()
+ s['session'] = None
+ if s['notify']:
+ s['notify'].remove_from_connection()
+ s['notify'] = None
+ del self.sessions[session_name]
+
+ def type_convert(self, key, value):
+ if key in [ "AllowedBearers" ]:
+ return value
+ elif key in [ "RoamingPolicy", "ConnectionType" ]:
+ if len(value) > 0:
+ return value[0]
+ elif key in [ "Priority", "AvoidHandover",
+ "StayConnected", "EmergencyCall" ]:
+ flag = str(value[0]).strip().lower()
+ val = flag not in ['false', 'f', 'n', '0']
+ return dbus.Boolean(val)
+ elif key in [ "PeriodicConnect", "IdleTimeout" ]:
+ val = value[0]
+ return dbus.UInt32(val)
+
+ return value
+
+ def find_session(self, session_name):
+ if not session_name in self.sessions.keys():
+ return None
+ return self.sessions[session_name]
@dbus.service.method("com.example.TestSession",
in_signature='', out_signature='')
- def CreateSession(self):
+ def CreateSession(self, session_name):
print "Create session"
- if self.session:
- print "already running a session -> drop reqest"
+ s = self.find_session(session_name)
+ if s and s['session'] :
+ print "Session %s already created-> drop reqest" % (session_name)
return
try:
bus = dbus.SystemBus()
- self.notify = Notification(bus, self, self.notify_path)
- self.notify.add_to_connection(bus, self.notify_path)
-
- #settings = { "AllowedBearers" : [ "ethernet", "*" ] }
- settings = { "AllowedBearers" : [ "ethernet" ] }
- self.session_path = self.manager.CreateSession(settings, self.notify_path)
-
- print "notify path %s" % (self.notify_path)
- print "session path %s" % (self.session_path)
-
- self.session = dbus.Interface(bus.get_object("net.connman", self.session_path),
+ if s == None:
+ s = {}
+ s['notify_path'] = self._object_path + "/" + session_name
+ s['notify'] = Notification(bus, self, s['notify_path'])
+ s['notify'].add_to_connection(bus, s['notify_path'])
+ if not 'settings' in s.keys():
+ s['settings'] = {};
+ s['session_path'] = self.manager.CreateSession(s['settings'], s['notify_path'])
+ print "notify path %s" % (s['notify_path'])
+ print "session path %s" % (s['session_path'])
+ s['session'] = dbus.Interface(bus.get_object("net.connman", s['session_path']),
"net.connman.Session")
+ self.sessions[session_name] = s
- except dbus.DBusException:
+ except dbus.DBusException, e:
+ if e.get_dbus_name() in ['net.connman.Error.Failed']:
+ print e.get_dbus_message()
+ return
traceback.print_exc()
- exit(1)
@dbus.service.method("com.example.TestSession",
in_signature='', out_signature='')
- def DestroySession(self):
+ def DestroySession(self, session_name):
print "Destroy session"
- if self.session == None:
- print "no session running -> drop request"
+ s = self.find_session(session_name)
+ if s == None or s['session'] == None:
+ print "The session is not running -> drop request"
return
try:
- self.release()
+ self.release(session_name)
except dbus.DBusException:
traceback.print_exc()
- exit(1)
@dbus.service.method("com.example.TestSession",
in_signature='', out_signature='')
- def Connect(self):
+ def Connect(self, session_name):
print "Connect session"
+
+ s = self.find_session(session_name)
+ if s == None or s['session'] == None:
+ print "The session is not running -> drop request"
+ return
+
try:
- self.session.Connect()
+ s['session'].Connect()
except dbus.DBusException, e:
- if e.get_dbus_name() in ['net.connman.Error.InProgress',
- 'net.connman.Error.AlreadyConnected']:
+ if e.get_dbus_name() in ['net.connman.Error.Failed']:
print e.get_dbus_message()
return
traceback.print_exc()
- exit(1)
@dbus.service.method("com.example.TestSession",
in_signature='', out_signature='')
- def Disconnect(self):
+ def Disconnect(self, session_name):
print "Disconnect session"
+
+ s = self.find_session(session_name)
+ if s == None or s['session'] == None:
+ print "The session is not running -> drop request"
+ return
+
try:
- self.session.Disconnect()
+ s['session'].Disconnect()
except dbus.DBusException, e:
- if e.get_dbus_name() in ['net.connman.Error.AlreadyDisabled',
- 'net.connman.Error.NotConnected']:
+ if e.get_dbus_name() in ['net.connman.Error.Failed']:
print e.get_dbus_message()
return
traceback.print_exc()
- exit(1)
+
+ @dbus.service.method("com.example.TestSession",
+ in_signature='', out_signature='')
+ def Change(self, session_name, key, value):
+ print "Update session settings"
+
+ s = self.find_session(session_name)
+ if s == None or s['session'] == None:
+ print "The session is not running -> drop request"
+ return
+
+ try:
+ val = self.type_convert(key, value)
+ s['session'].Change(key, val)
+ except dbus.DBusException, e:
+ if e.get_dbus_name() in ['net.connman.Error.Failed']:
+ print e.get_dbus_message()
+ return
+ traceback.print_exc()
+
+ @dbus.service.method("com.example.TestSession",
+ in_signature='', out_signature='')
+ def Configure(self, session_name, key, value):
+ print "Configure session settings"
+ s = self.find_session(session_name)
+ if s == None:
+ s = {}
+ s['notify_path'] = None
+ s['notify'] = None
+ if not 'settings' in s.keys():
+ s['settings'] = {};
+ s['session_path'] = None
+ s['session'] = None
+ self.sessions[session_name] = s
+ if s and s['session']:
+ print "The session is running, use change -> drop request"
+ return
+ val = self.type_convert(key, value)
+ s['settings'][key] = val
def main():
if len(sys.argv) < 2:
print ""
print " enable"
print " disable"
- print " create <app_path>"
- print " destroy <app_path>"
- print " connect <app_path>"
- print " disconnect <app_path>"
+ print " create <app_path> <session_name>"
+ print " destroy <app_path> <session_name>"
+ print " connect <app_path> <session_name>"
+ print " disconnect <app_path> <session_name>"
+ print " change <app_path> <session_name> <key> <value>"
+ print " configure <app_path> <session_name> <key> <value>"
print ""
print " run <app_path>"
sys.exit(1)
app_path = sys.argv[2]
bus = dbus.SessionBus()
+ app_name = "com.example.SessionApplication.%s" % (string.strip(app_path, "/"))
+
if sys.argv[1] == "run":
- name = dbus.service.BusName("com.example.SessionApplication", bus)
+ name = dbus.service.BusName(app_name, bus)
mainloop = gobject.MainLoop()
app = SessionApplication(bus, app_path, mainloop)
mainloop.run()
return
- app = dbus.Interface(bus.get_object("com.example.SessionApplication", app_path),
+ app = dbus.Interface(bus.get_object(app_name, app_path),
"com.example.TestSession")
if sys.argv[1] == "create":
- app.CreateSession()
+ app.CreateSession(sys.argv[3])
elif sys.argv[1] == "destroy":
- app.DestroySession()
+ app.DestroySession(sys.argv[3])
elif sys.argv[1] == "connect":
- app.Connect()
+ app.Connect(sys.argv[3])
elif sys.argv[1] == "disconnect":
- app.Disconnect()
+ app.Disconnect(sys.argv[3])
+
+ elif sys.argv[1] == "change":
+ if len(sys.argv) < 5:
+ print "Arguments missing"
+ sys.exit(1)
+
+ app.Change(sys.argv[3], sys.argv[4], sys.argv[5:])
+
+ elif sys.argv[1] == "configure":
+ if len(sys.argv) < 5:
+ print "Arguments missing"
+ sys.exit(1)
+
+ app.Configure(sys.argv[3], sys.argv[4], sys.argv[5:])
+
+ else:
+ print "Unknown command '%s'" % sys.argv[1]
+ sys.exit(1)
if __name__ == '__main__':
main()
projects / platform / upstream / connman.git / blobdiff