nuntium

Merge lp:~sergiusens/nuntium/telepathy_switch into lp:nuntium

  1. telepathy_switch
  2. Merge into trunk
Proposed by Sergio Schvezov
Status: Merged
Approved by: Manuel de la Peña
Approved revision: 42
Merged at revision: 45
Proposed branch: lp:~sergiusens/nuntium/telepathy_switch
Merge into: lp:nuntium
Diff against target: 28 lines (+8/-3)
1 file modified
telepathy/service.go (+8/-3)
To merge this branch: bzr merge lp:~sergiusens/nuntium/telepathy_switch
Reviewer Review Type Date Requested Status
Manuel de la Peña (community) Approve
Review via email: mp+225142@code.launchpad.net

Commit message

Improving incoming dbus method call handling for the mms service interface

To post a comment you must log in.
Revision history for this message
Manuel de la Peña (mandel) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'telepathy/service.go'
2--- telepathy/service.go 2014-04-28 17:34:06 +0000
3+++ telepathy/service.go 2014-07-01 12:15:58 +0000
4@@ -79,8 +79,13 @@
5 var reply *dbus.Message
6
7 for msg := range service.msgChan {
8- switch {
9- case msg.Interface == MMS_SERVICE_DBUS_IFACE && msg.Member == "GetMessages":
10+ if msg.Interface != MMS_SERVICE_DBUS_IFACE {
11+ log.Println("Received unkown method call on", msg.Interface, msg.Member)
12+ reply = dbus.NewErrorMessage(msg, "org.freedesktop.DBus.Error.UnknownMethod", "Unknown method")
13+ continue
14+ }
15+ switch msg.Member {
16+ case "GetMessages":
17 reply = dbus.NewMethodReturnMessage(msg)
18 //TODO implement store and forward
19 var payload []ServicePayload
20@@ -88,7 +93,7 @@
21 log.Print("Cannot parse payload data from services")
22 reply = dbus.NewErrorMessage(msg, "Error.InvalidArguments", "Cannot parse services")
23 }
24- case msg.Interface == MMS_SERVICE_DBUS_IFACE && msg.Member == "GetProperties":
25+ case "GetProperties":
26 reply = dbus.NewMethodReturnMessage(msg)
27 if err := reply.AppendArgs(service.Properties); err != nil {
28 log.Print("Cannot parse payload data from services")

Subscribers

People subscribed via source and target branches