mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #2518 from AkihiroSuda/vendor-gobus-v5
vendor godbus/dbus v5
This commit is contained in:
commit
6a176585c6
46 changed files with 2657 additions and 1290 deletions
|
@ -4,7 +4,7 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/godbus/dbus"
|
dbus "github.com/godbus/dbus/v5"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@ github.com/golang/protobuf aa810b61a9c79d51363740d207bb46cf8e620ed5
|
||||||
google.golang.org/grpc 7a6a684ca69eb4cae85ad0a484f2e531598c047b # v1.12.2
|
google.golang.org/grpc 7a6a684ca69eb4cae85ad0a484f2e531598c047b # v1.12.2
|
||||||
google.golang.org/genproto 694d95ba50e67b2e363f3483057db5d4910c18f9
|
google.golang.org/genproto 694d95ba50e67b2e363f3483057db5d4910c18f9
|
||||||
|
|
||||||
github.com/godbus/dbus 5f6efc7ef2759c81b7ba876593971bfce311eab3 # v4.0.0
|
github.com/godbus/dbus/v5 37bf87eef99d69c4f1d3528bd66e3a87dc201472 # v5.0.3
|
||||||
github.com/gorilla/mux c5c6c98bc25355028a63748a498942a6398ccd22 # v1.7.1
|
github.com/gorilla/mux c5c6c98bc25355028a63748a498942a6398ccd22 # v1.7.1
|
||||||
github.com/hashicorp/consul 9a9cc9341bb487651a0399e3fc5e1e8a42e62dd9 # v0.5.2
|
github.com/hashicorp/consul 9a9cc9341bb487651a0399e3fc5e1e8a42e62dd9 # v0.5.2
|
||||||
github.com/hashicorp/errwrap 8a6fb523712970c966eefc6b39ed2c5e74880354 # v1.0.0
|
github.com/hashicorp/errwrap 8a6fb523712970c966eefc6b39ed2c5e74880354 # v1.0.0
|
||||||
|
|
634
libnetwork/vendor/github.com/godbus/dbus/conn.go
generated
vendored
634
libnetwork/vendor/github.com/godbus/dbus/conn.go
generated
vendored
|
@ -1,634 +0,0 @@
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"errors"
|
|
||||||
"io"
|
|
||||||
"os"
|
|
||||||
"reflect"
|
|
||||||
"strings"
|
|
||||||
"sync"
|
|
||||||
)
|
|
||||||
|
|
||||||
const defaultSystemBusAddress = "unix:path=/var/run/dbus/system_bus_socket"
|
|
||||||
|
|
||||||
var (
|
|
||||||
systemBus *Conn
|
|
||||||
systemBusLck sync.Mutex
|
|
||||||
sessionBus *Conn
|
|
||||||
sessionBusLck sync.Mutex
|
|
||||||
sessionEnvLck sync.Mutex
|
|
||||||
)
|
|
||||||
|
|
||||||
// ErrClosed is the error returned by calls on a closed connection.
|
|
||||||
var ErrClosed = errors.New("dbus: connection closed by user")
|
|
||||||
|
|
||||||
// Conn represents a connection to a message bus (usually, the system or
|
|
||||||
// session bus).
|
|
||||||
//
|
|
||||||
// Connections are either shared or private. Shared connections
|
|
||||||
// are shared between calls to the functions that return them. As a result,
|
|
||||||
// the methods Close, Auth and Hello must not be called on them.
|
|
||||||
//
|
|
||||||
// Multiple goroutines may invoke methods on a connection simultaneously.
|
|
||||||
type Conn struct {
|
|
||||||
transport
|
|
||||||
|
|
||||||
busObj BusObject
|
|
||||||
unixFD bool
|
|
||||||
uuid string
|
|
||||||
|
|
||||||
names []string
|
|
||||||
namesLck sync.RWMutex
|
|
||||||
|
|
||||||
serialLck sync.Mutex
|
|
||||||
nextSerial uint32
|
|
||||||
serialUsed map[uint32]bool
|
|
||||||
|
|
||||||
calls map[uint32]*Call
|
|
||||||
callsLck sync.RWMutex
|
|
||||||
|
|
||||||
handlers map[ObjectPath]map[string]exportedObj
|
|
||||||
handlersLck sync.RWMutex
|
|
||||||
|
|
||||||
out chan *Message
|
|
||||||
closed bool
|
|
||||||
outLck sync.RWMutex
|
|
||||||
|
|
||||||
signals []chan<- *Signal
|
|
||||||
signalsLck sync.Mutex
|
|
||||||
|
|
||||||
eavesdropped chan<- *Message
|
|
||||||
eavesdroppedLck sync.Mutex
|
|
||||||
}
|
|
||||||
|
|
||||||
// SessionBus returns a shared connection to the session bus, connecting to it
|
|
||||||
// if not already done.
|
|
||||||
func SessionBus() (conn *Conn, err error) {
|
|
||||||
sessionBusLck.Lock()
|
|
||||||
defer sessionBusLck.Unlock()
|
|
||||||
if sessionBus != nil {
|
|
||||||
return sessionBus, nil
|
|
||||||
}
|
|
||||||
defer func() {
|
|
||||||
if conn != nil {
|
|
||||||
sessionBus = conn
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
conn, err = SessionBusPrivate()
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if err = conn.Auth(nil); err != nil {
|
|
||||||
conn.Close()
|
|
||||||
conn = nil
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if err = conn.Hello(); err != nil {
|
|
||||||
conn.Close()
|
|
||||||
conn = nil
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// SessionBusPrivate returns a new private connection to the session bus.
|
|
||||||
func SessionBusPrivate() (*Conn, error) {
|
|
||||||
sessionEnvLck.Lock()
|
|
||||||
defer sessionEnvLck.Unlock()
|
|
||||||
address := os.Getenv("DBUS_SESSION_BUS_ADDRESS")
|
|
||||||
if address != "" && address != "autolaunch:" {
|
|
||||||
return Dial(address)
|
|
||||||
}
|
|
||||||
|
|
||||||
return sessionBusPlatform()
|
|
||||||
}
|
|
||||||
|
|
||||||
// SystemBus returns a shared connection to the system bus, connecting to it if
|
|
||||||
// not already done.
|
|
||||||
func SystemBus() (conn *Conn, err error) {
|
|
||||||
systemBusLck.Lock()
|
|
||||||
defer systemBusLck.Unlock()
|
|
||||||
if systemBus != nil {
|
|
||||||
return systemBus, nil
|
|
||||||
}
|
|
||||||
defer func() {
|
|
||||||
if conn != nil {
|
|
||||||
systemBus = conn
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
conn, err = SystemBusPrivate()
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if err = conn.Auth(nil); err != nil {
|
|
||||||
conn.Close()
|
|
||||||
conn = nil
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if err = conn.Hello(); err != nil {
|
|
||||||
conn.Close()
|
|
||||||
conn = nil
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// SystemBusPrivate returns a new private connection to the system bus.
|
|
||||||
func SystemBusPrivate() (*Conn, error) {
|
|
||||||
address := os.Getenv("DBUS_SYSTEM_BUS_ADDRESS")
|
|
||||||
if address != "" {
|
|
||||||
return Dial(address)
|
|
||||||
}
|
|
||||||
return Dial(defaultSystemBusAddress)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Dial establishes a new private connection to the message bus specified by address.
|
|
||||||
func Dial(address string) (*Conn, error) {
|
|
||||||
tr, err := getTransport(address)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return newConn(tr)
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewConn creates a new private *Conn from an already established connection.
|
|
||||||
func NewConn(conn io.ReadWriteCloser) (*Conn, error) {
|
|
||||||
return newConn(genericTransport{conn})
|
|
||||||
}
|
|
||||||
|
|
||||||
// newConn creates a new *Conn from a transport.
|
|
||||||
func newConn(tr transport) (*Conn, error) {
|
|
||||||
conn := new(Conn)
|
|
||||||
conn.transport = tr
|
|
||||||
conn.calls = make(map[uint32]*Call)
|
|
||||||
conn.out = make(chan *Message, 10)
|
|
||||||
conn.handlers = make(map[ObjectPath]map[string]exportedObj)
|
|
||||||
conn.nextSerial = 1
|
|
||||||
conn.serialUsed = map[uint32]bool{0: true}
|
|
||||||
conn.busObj = conn.Object("org.freedesktop.DBus", "/org/freedesktop/DBus")
|
|
||||||
return conn, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// BusObject returns the object owned by the bus daemon which handles
|
|
||||||
// administrative requests.
|
|
||||||
func (conn *Conn) BusObject() BusObject {
|
|
||||||
return conn.busObj
|
|
||||||
}
|
|
||||||
|
|
||||||
// Close closes the connection. Any blocked operations will return with errors
|
|
||||||
// and the channels passed to Eavesdrop and Signal are closed. This method must
|
|
||||||
// not be called on shared connections.
|
|
||||||
func (conn *Conn) Close() error {
|
|
||||||
conn.outLck.Lock()
|
|
||||||
if conn.closed {
|
|
||||||
// inWorker calls Close on read error, the read error may
|
|
||||||
// be caused by another caller calling Close to shutdown the
|
|
||||||
// dbus connection, a double-close scenario we prevent here.
|
|
||||||
conn.outLck.Unlock()
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
close(conn.out)
|
|
||||||
conn.closed = true
|
|
||||||
conn.outLck.Unlock()
|
|
||||||
conn.signalsLck.Lock()
|
|
||||||
for _, ch := range conn.signals {
|
|
||||||
close(ch)
|
|
||||||
}
|
|
||||||
conn.signalsLck.Unlock()
|
|
||||||
conn.eavesdroppedLck.Lock()
|
|
||||||
if conn.eavesdropped != nil {
|
|
||||||
close(conn.eavesdropped)
|
|
||||||
}
|
|
||||||
conn.eavesdroppedLck.Unlock()
|
|
||||||
return conn.transport.Close()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Eavesdrop causes conn to send all incoming messages to the given channel
|
|
||||||
// without further processing. Method replies, errors and signals will not be
|
|
||||||
// sent to the appropiate channels and method calls will not be handled. If nil
|
|
||||||
// is passed, the normal behaviour is restored.
|
|
||||||
//
|
|
||||||
// The caller has to make sure that ch is sufficiently buffered;
|
|
||||||
// if a message arrives when a write to ch is not possible, the message is
|
|
||||||
// discarded.
|
|
||||||
func (conn *Conn) Eavesdrop(ch chan<- *Message) {
|
|
||||||
conn.eavesdroppedLck.Lock()
|
|
||||||
conn.eavesdropped = ch
|
|
||||||
conn.eavesdroppedLck.Unlock()
|
|
||||||
}
|
|
||||||
|
|
||||||
// getSerial returns an unused serial.
|
|
||||||
func (conn *Conn) getSerial() uint32 {
|
|
||||||
conn.serialLck.Lock()
|
|
||||||
defer conn.serialLck.Unlock()
|
|
||||||
n := conn.nextSerial
|
|
||||||
for conn.serialUsed[n] {
|
|
||||||
n++
|
|
||||||
}
|
|
||||||
conn.serialUsed[n] = true
|
|
||||||
conn.nextSerial = n + 1
|
|
||||||
return n
|
|
||||||
}
|
|
||||||
|
|
||||||
// Hello sends the initial org.freedesktop.DBus.Hello call. This method must be
|
|
||||||
// called after authentication, but before sending any other messages to the
|
|
||||||
// bus. Hello must not be called for shared connections.
|
|
||||||
func (conn *Conn) Hello() error {
|
|
||||||
var s string
|
|
||||||
err := conn.busObj.Call("org.freedesktop.DBus.Hello", 0).Store(&s)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
conn.namesLck.Lock()
|
|
||||||
conn.names = make([]string, 1)
|
|
||||||
conn.names[0] = s
|
|
||||||
conn.namesLck.Unlock()
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// inWorker runs in an own goroutine, reading incoming messages from the
|
|
||||||
// transport and dispatching them appropiately.
|
|
||||||
func (conn *Conn) inWorker() {
|
|
||||||
for {
|
|
||||||
msg, err := conn.ReadMessage()
|
|
||||||
if err == nil {
|
|
||||||
conn.eavesdroppedLck.Lock()
|
|
||||||
if conn.eavesdropped != nil {
|
|
||||||
select {
|
|
||||||
case conn.eavesdropped <- msg:
|
|
||||||
default:
|
|
||||||
}
|
|
||||||
conn.eavesdroppedLck.Unlock()
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
conn.eavesdroppedLck.Unlock()
|
|
||||||
dest, _ := msg.Headers[FieldDestination].value.(string)
|
|
||||||
found := false
|
|
||||||
if dest == "" {
|
|
||||||
found = true
|
|
||||||
} else {
|
|
||||||
conn.namesLck.RLock()
|
|
||||||
if len(conn.names) == 0 {
|
|
||||||
found = true
|
|
||||||
}
|
|
||||||
for _, v := range conn.names {
|
|
||||||
if dest == v {
|
|
||||||
found = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
conn.namesLck.RUnlock()
|
|
||||||
}
|
|
||||||
if !found {
|
|
||||||
// Eavesdropped a message, but no channel for it is registered.
|
|
||||||
// Ignore it.
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
switch msg.Type {
|
|
||||||
case TypeMethodReply, TypeError:
|
|
||||||
serial := msg.Headers[FieldReplySerial].value.(uint32)
|
|
||||||
conn.callsLck.Lock()
|
|
||||||
if c, ok := conn.calls[serial]; ok {
|
|
||||||
if msg.Type == TypeError {
|
|
||||||
name, _ := msg.Headers[FieldErrorName].value.(string)
|
|
||||||
c.Err = Error{name, msg.Body}
|
|
||||||
} else {
|
|
||||||
c.Body = msg.Body
|
|
||||||
}
|
|
||||||
c.Done <- c
|
|
||||||
conn.serialLck.Lock()
|
|
||||||
delete(conn.serialUsed, serial)
|
|
||||||
conn.serialLck.Unlock()
|
|
||||||
delete(conn.calls, serial)
|
|
||||||
}
|
|
||||||
conn.callsLck.Unlock()
|
|
||||||
case TypeSignal:
|
|
||||||
iface := msg.Headers[FieldInterface].value.(string)
|
|
||||||
member := msg.Headers[FieldMember].value.(string)
|
|
||||||
// as per http://dbus.freedesktop.org/doc/dbus-specification.html ,
|
|
||||||
// sender is optional for signals.
|
|
||||||
sender, _ := msg.Headers[FieldSender].value.(string)
|
|
||||||
if iface == "org.freedesktop.DBus" && sender == "org.freedesktop.DBus" {
|
|
||||||
if member == "NameLost" {
|
|
||||||
// If we lost the name on the bus, remove it from our
|
|
||||||
// tracking list.
|
|
||||||
name, ok := msg.Body[0].(string)
|
|
||||||
if !ok {
|
|
||||||
panic("Unable to read the lost name")
|
|
||||||
}
|
|
||||||
conn.namesLck.Lock()
|
|
||||||
for i, v := range conn.names {
|
|
||||||
if v == name {
|
|
||||||
conn.names = append(conn.names[:i],
|
|
||||||
conn.names[i+1:]...)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
conn.namesLck.Unlock()
|
|
||||||
} else if member == "NameAcquired" {
|
|
||||||
// If we acquired the name on the bus, add it to our
|
|
||||||
// tracking list.
|
|
||||||
name, ok := msg.Body[0].(string)
|
|
||||||
if !ok {
|
|
||||||
panic("Unable to read the acquired name")
|
|
||||||
}
|
|
||||||
conn.namesLck.Lock()
|
|
||||||
conn.names = append(conn.names, name)
|
|
||||||
conn.namesLck.Unlock()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
signal := &Signal{
|
|
||||||
Sender: sender,
|
|
||||||
Path: msg.Headers[FieldPath].value.(ObjectPath),
|
|
||||||
Name: iface + "." + member,
|
|
||||||
Body: msg.Body,
|
|
||||||
}
|
|
||||||
conn.signalsLck.Lock()
|
|
||||||
for _, ch := range conn.signals {
|
|
||||||
ch <- signal
|
|
||||||
}
|
|
||||||
conn.signalsLck.Unlock()
|
|
||||||
case TypeMethodCall:
|
|
||||||
go conn.handleCall(msg)
|
|
||||||
}
|
|
||||||
} else if _, ok := err.(InvalidMessageError); !ok {
|
|
||||||
// Some read error occured (usually EOF); we can't really do
|
|
||||||
// anything but to shut down all stuff and returns errors to all
|
|
||||||
// pending replies.
|
|
||||||
conn.Close()
|
|
||||||
conn.callsLck.RLock()
|
|
||||||
for _, v := range conn.calls {
|
|
||||||
v.Err = err
|
|
||||||
v.Done <- v
|
|
||||||
}
|
|
||||||
conn.callsLck.RUnlock()
|
|
||||||
return
|
|
||||||
}
|
|
||||||
// invalid messages are ignored
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Names returns the list of all names that are currently owned by this
|
|
||||||
// connection. The slice is always at least one element long, the first element
|
|
||||||
// being the unique name of the connection.
|
|
||||||
func (conn *Conn) Names() []string {
|
|
||||||
conn.namesLck.RLock()
|
|
||||||
// copy the slice so it can't be modified
|
|
||||||
s := make([]string, len(conn.names))
|
|
||||||
copy(s, conn.names)
|
|
||||||
conn.namesLck.RUnlock()
|
|
||||||
return s
|
|
||||||
}
|
|
||||||
|
|
||||||
// Object returns the object identified by the given destination name and path.
|
|
||||||
func (conn *Conn) Object(dest string, path ObjectPath) BusObject {
|
|
||||||
return &Object{conn, dest, path}
|
|
||||||
}
|
|
||||||
|
|
||||||
// outWorker runs in an own goroutine, encoding and sending messages that are
|
|
||||||
// sent to conn.out.
|
|
||||||
func (conn *Conn) outWorker() {
|
|
||||||
for msg := range conn.out {
|
|
||||||
err := conn.SendMessage(msg)
|
|
||||||
conn.callsLck.RLock()
|
|
||||||
if err != nil {
|
|
||||||
if c := conn.calls[msg.serial]; c != nil {
|
|
||||||
c.Err = err
|
|
||||||
c.Done <- c
|
|
||||||
}
|
|
||||||
conn.serialLck.Lock()
|
|
||||||
delete(conn.serialUsed, msg.serial)
|
|
||||||
conn.serialLck.Unlock()
|
|
||||||
} else if msg.Type != TypeMethodCall {
|
|
||||||
conn.serialLck.Lock()
|
|
||||||
delete(conn.serialUsed, msg.serial)
|
|
||||||
conn.serialLck.Unlock()
|
|
||||||
}
|
|
||||||
conn.callsLck.RUnlock()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Send sends the given message to the message bus. You usually don't need to
|
|
||||||
// use this; use the higher-level equivalents (Call / Go, Emit and Export)
|
|
||||||
// instead. If msg is a method call and NoReplyExpected is not set, a non-nil
|
|
||||||
// call is returned and the same value is sent to ch (which must be buffered)
|
|
||||||
// once the call is complete. Otherwise, ch is ignored and a Call structure is
|
|
||||||
// returned of which only the Err member is valid.
|
|
||||||
func (conn *Conn) Send(msg *Message, ch chan *Call) *Call {
|
|
||||||
var call *Call
|
|
||||||
|
|
||||||
msg.serial = conn.getSerial()
|
|
||||||
if msg.Type == TypeMethodCall && msg.Flags&FlagNoReplyExpected == 0 {
|
|
||||||
if ch == nil {
|
|
||||||
ch = make(chan *Call, 5)
|
|
||||||
} else if cap(ch) == 0 {
|
|
||||||
panic("dbus: unbuffered channel passed to (*Conn).Send")
|
|
||||||
}
|
|
||||||
call = new(Call)
|
|
||||||
call.Destination, _ = msg.Headers[FieldDestination].value.(string)
|
|
||||||
call.Path, _ = msg.Headers[FieldPath].value.(ObjectPath)
|
|
||||||
iface, _ := msg.Headers[FieldInterface].value.(string)
|
|
||||||
member, _ := msg.Headers[FieldMember].value.(string)
|
|
||||||
call.Method = iface + "." + member
|
|
||||||
call.Args = msg.Body
|
|
||||||
call.Done = ch
|
|
||||||
conn.callsLck.Lock()
|
|
||||||
conn.calls[msg.serial] = call
|
|
||||||
conn.callsLck.Unlock()
|
|
||||||
conn.outLck.RLock()
|
|
||||||
if conn.closed {
|
|
||||||
call.Err = ErrClosed
|
|
||||||
call.Done <- call
|
|
||||||
} else {
|
|
||||||
conn.out <- msg
|
|
||||||
}
|
|
||||||
conn.outLck.RUnlock()
|
|
||||||
} else {
|
|
||||||
conn.outLck.RLock()
|
|
||||||
if conn.closed {
|
|
||||||
call = &Call{Err: ErrClosed}
|
|
||||||
} else {
|
|
||||||
conn.out <- msg
|
|
||||||
call = &Call{Err: nil}
|
|
||||||
}
|
|
||||||
conn.outLck.RUnlock()
|
|
||||||
}
|
|
||||||
return call
|
|
||||||
}
|
|
||||||
|
|
||||||
// sendError creates an error message corresponding to the parameters and sends
|
|
||||||
// it to conn.out.
|
|
||||||
func (conn *Conn) sendError(e Error, dest string, serial uint32) {
|
|
||||||
msg := new(Message)
|
|
||||||
msg.Type = TypeError
|
|
||||||
msg.serial = conn.getSerial()
|
|
||||||
msg.Headers = make(map[HeaderField]Variant)
|
|
||||||
if dest != "" {
|
|
||||||
msg.Headers[FieldDestination] = MakeVariant(dest)
|
|
||||||
}
|
|
||||||
msg.Headers[FieldErrorName] = MakeVariant(e.Name)
|
|
||||||
msg.Headers[FieldReplySerial] = MakeVariant(serial)
|
|
||||||
msg.Body = e.Body
|
|
||||||
if len(e.Body) > 0 {
|
|
||||||
msg.Headers[FieldSignature] = MakeVariant(SignatureOf(e.Body...))
|
|
||||||
}
|
|
||||||
conn.outLck.RLock()
|
|
||||||
if !conn.closed {
|
|
||||||
conn.out <- msg
|
|
||||||
}
|
|
||||||
conn.outLck.RUnlock()
|
|
||||||
}
|
|
||||||
|
|
||||||
// sendReply creates a method reply message corresponding to the parameters and
|
|
||||||
// sends it to conn.out.
|
|
||||||
func (conn *Conn) sendReply(dest string, serial uint32, values ...interface{}) {
|
|
||||||
msg := new(Message)
|
|
||||||
msg.Type = TypeMethodReply
|
|
||||||
msg.serial = conn.getSerial()
|
|
||||||
msg.Headers = make(map[HeaderField]Variant)
|
|
||||||
if dest != "" {
|
|
||||||
msg.Headers[FieldDestination] = MakeVariant(dest)
|
|
||||||
}
|
|
||||||
msg.Headers[FieldReplySerial] = MakeVariant(serial)
|
|
||||||
msg.Body = values
|
|
||||||
if len(values) > 0 {
|
|
||||||
msg.Headers[FieldSignature] = MakeVariant(SignatureOf(values...))
|
|
||||||
}
|
|
||||||
conn.outLck.RLock()
|
|
||||||
if !conn.closed {
|
|
||||||
conn.out <- msg
|
|
||||||
}
|
|
||||||
conn.outLck.RUnlock()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Signal registers the given channel to be passed all received signal messages.
|
|
||||||
// The caller has to make sure that ch is sufficiently buffered; if a message
|
|
||||||
// arrives when a write to c is not possible, it is discarded.
|
|
||||||
//
|
|
||||||
// Multiple of these channels can be registered at the same time.
|
|
||||||
//
|
|
||||||
// These channels are "overwritten" by Eavesdrop; i.e., if there currently is a
|
|
||||||
// channel for eavesdropped messages, this channel receives all signals, and
|
|
||||||
// none of the channels passed to Signal will receive any signals.
|
|
||||||
func (conn *Conn) Signal(ch chan<- *Signal) {
|
|
||||||
conn.signalsLck.Lock()
|
|
||||||
conn.signals = append(conn.signals, ch)
|
|
||||||
conn.signalsLck.Unlock()
|
|
||||||
}
|
|
||||||
|
|
||||||
// RemoveSignal removes the given channel from the list of the registered channels.
|
|
||||||
func (conn *Conn) RemoveSignal(ch chan<- *Signal) {
|
|
||||||
conn.signalsLck.Lock()
|
|
||||||
for i := len(conn.signals) - 1; i >= 0; i-- {
|
|
||||||
if ch == conn.signals[i] {
|
|
||||||
copy(conn.signals[i:], conn.signals[i+1:])
|
|
||||||
conn.signals[len(conn.signals)-1] = nil
|
|
||||||
conn.signals = conn.signals[:len(conn.signals)-1]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
conn.signalsLck.Unlock()
|
|
||||||
}
|
|
||||||
|
|
||||||
// SupportsUnixFDs returns whether the underlying transport supports passing of
|
|
||||||
// unix file descriptors. If this is false, method calls containing unix file
|
|
||||||
// descriptors will return an error and emitted signals containing them will
|
|
||||||
// not be sent.
|
|
||||||
func (conn *Conn) SupportsUnixFDs() bool {
|
|
||||||
return conn.unixFD
|
|
||||||
}
|
|
||||||
|
|
||||||
// Error represents a D-Bus message of type Error.
|
|
||||||
type Error struct {
|
|
||||||
Name string
|
|
||||||
Body []interface{}
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewError(name string, body []interface{}) *Error {
|
|
||||||
return &Error{name, body}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e Error) Error() string {
|
|
||||||
if len(e.Body) >= 1 {
|
|
||||||
s, ok := e.Body[0].(string)
|
|
||||||
if ok {
|
|
||||||
return s
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return e.Name
|
|
||||||
}
|
|
||||||
|
|
||||||
// Signal represents a D-Bus message of type Signal. The name member is given in
|
|
||||||
// "interface.member" notation, e.g. org.freedesktop.D-Bus.NameLost.
|
|
||||||
type Signal struct {
|
|
||||||
Sender string
|
|
||||||
Path ObjectPath
|
|
||||||
Name string
|
|
||||||
Body []interface{}
|
|
||||||
}
|
|
||||||
|
|
||||||
// transport is a D-Bus transport.
|
|
||||||
type transport interface {
|
|
||||||
// Read and Write raw data (for example, for the authentication protocol).
|
|
||||||
io.ReadWriteCloser
|
|
||||||
|
|
||||||
// Send the initial null byte used for the EXTERNAL mechanism.
|
|
||||||
SendNullByte() error
|
|
||||||
|
|
||||||
// Returns whether this transport supports passing Unix FDs.
|
|
||||||
SupportsUnixFDs() bool
|
|
||||||
|
|
||||||
// Signal the transport that Unix FD passing is enabled for this connection.
|
|
||||||
EnableUnixFDs()
|
|
||||||
|
|
||||||
// Read / send a message, handling things like Unix FDs.
|
|
||||||
ReadMessage() (*Message, error)
|
|
||||||
SendMessage(*Message) error
|
|
||||||
}
|
|
||||||
|
|
||||||
var (
|
|
||||||
transports = make(map[string]func(string) (transport, error))
|
|
||||||
)
|
|
||||||
|
|
||||||
func getTransport(address string) (transport, error) {
|
|
||||||
var err error
|
|
||||||
var t transport
|
|
||||||
|
|
||||||
addresses := strings.Split(address, ";")
|
|
||||||
for _, v := range addresses {
|
|
||||||
i := strings.IndexRune(v, ':')
|
|
||||||
if i == -1 {
|
|
||||||
err = errors.New("dbus: invalid bus address (no transport)")
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
f := transports[v[:i]]
|
|
||||||
if f == nil {
|
|
||||||
err = errors.New("dbus: invalid bus address (invalid or unsupported transport)")
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
t, err = f(v[i+1:])
|
|
||||||
if err == nil {
|
|
||||||
return t, nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// dereferenceAll returns a slice that, assuming that vs is a slice of pointers
|
|
||||||
// of arbitrary types, containes the values that are obtained from dereferencing
|
|
||||||
// all elements in vs.
|
|
||||||
func dereferenceAll(vs []interface{}) []interface{} {
|
|
||||||
for i := range vs {
|
|
||||||
v := reflect.ValueOf(vs[i])
|
|
||||||
v = v.Elem()
|
|
||||||
vs[i] = v.Interface()
|
|
||||||
}
|
|
||||||
return vs
|
|
||||||
}
|
|
||||||
|
|
||||||
// getKey gets a key from a the list of keys. Returns "" on error / not found...
|
|
||||||
func getKey(s, key string) string {
|
|
||||||
for _, keyEqualsValue := range strings.Split(s, ",") {
|
|
||||||
keyValue := strings.SplitN(keyEqualsValue, "=", 2)
|
|
||||||
if len(keyValue) == 2 && keyValue[0] == key {
|
|
||||||
return keyValue[1]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
21
libnetwork/vendor/github.com/godbus/dbus/conn_darwin.go
generated
vendored
21
libnetwork/vendor/github.com/godbus/dbus/conn_darwin.go
generated
vendored
|
@ -1,21 +0,0 @@
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"errors"
|
|
||||||
"os/exec"
|
|
||||||
)
|
|
||||||
|
|
||||||
func sessionBusPlatform() (*Conn, error) {
|
|
||||||
cmd := exec.Command("launchctl", "getenv", "DBUS_LAUNCHD_SESSION_BUS_SOCKET")
|
|
||||||
b, err := cmd.CombinedOutput()
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(b) == 0 {
|
|
||||||
return nil, errors.New("dbus: couldn't determine address of session bus")
|
|
||||||
}
|
|
||||||
|
|
||||||
return Dial("unix:path=" + string(b[:len(b)-1]))
|
|
||||||
}
|
|
31
libnetwork/vendor/github.com/godbus/dbus/conn_other.go
generated
vendored
31
libnetwork/vendor/github.com/godbus/dbus/conn_other.go
generated
vendored
|
@ -1,31 +0,0 @@
|
||||||
// +build !darwin
|
|
||||||
|
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"errors"
|
|
||||||
"os"
|
|
||||||
"os/exec"
|
|
||||||
)
|
|
||||||
|
|
||||||
func sessionBusPlatform() (*Conn, error) {
|
|
||||||
cmd := exec.Command("dbus-launch")
|
|
||||||
b, err := cmd.CombinedOutput()
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
i := bytes.IndexByte(b, '=')
|
|
||||||
j := bytes.IndexByte(b, '\n')
|
|
||||||
|
|
||||||
if i == -1 || j == -1 {
|
|
||||||
return nil, errors.New("dbus: couldn't determine address of session bus")
|
|
||||||
}
|
|
||||||
|
|
||||||
env, addr := string(b[0:i]), string(b[i+1:j])
|
|
||||||
os.Setenv(env, addr)
|
|
||||||
|
|
||||||
return Dial(addr)
|
|
||||||
}
|
|
258
libnetwork/vendor/github.com/godbus/dbus/dbus.go
generated
vendored
258
libnetwork/vendor/github.com/godbus/dbus/dbus.go
generated
vendored
|
@ -1,258 +0,0 @@
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"errors"
|
|
||||||
"reflect"
|
|
||||||
"strings"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
byteType = reflect.TypeOf(byte(0))
|
|
||||||
boolType = reflect.TypeOf(false)
|
|
||||||
uint8Type = reflect.TypeOf(uint8(0))
|
|
||||||
int16Type = reflect.TypeOf(int16(0))
|
|
||||||
uint16Type = reflect.TypeOf(uint16(0))
|
|
||||||
int32Type = reflect.TypeOf(int32(0))
|
|
||||||
uint32Type = reflect.TypeOf(uint32(0))
|
|
||||||
int64Type = reflect.TypeOf(int64(0))
|
|
||||||
uint64Type = reflect.TypeOf(uint64(0))
|
|
||||||
float64Type = reflect.TypeOf(float64(0))
|
|
||||||
stringType = reflect.TypeOf("")
|
|
||||||
signatureType = reflect.TypeOf(Signature{""})
|
|
||||||
objectPathType = reflect.TypeOf(ObjectPath(""))
|
|
||||||
variantType = reflect.TypeOf(Variant{Signature{""}, nil})
|
|
||||||
interfacesType = reflect.TypeOf([]interface{}{})
|
|
||||||
unixFDType = reflect.TypeOf(UnixFD(0))
|
|
||||||
unixFDIndexType = reflect.TypeOf(UnixFDIndex(0))
|
|
||||||
)
|
|
||||||
|
|
||||||
// An InvalidTypeError signals that a value which cannot be represented in the
|
|
||||||
// D-Bus wire format was passed to a function.
|
|
||||||
type InvalidTypeError struct {
|
|
||||||
Type reflect.Type
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e InvalidTypeError) Error() string {
|
|
||||||
return "dbus: invalid type " + e.Type.String()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Store copies the values contained in src to dest, which must be a slice of
|
|
||||||
// pointers. It converts slices of interfaces from src to corresponding structs
|
|
||||||
// in dest. An error is returned if the lengths of src and dest or the types of
|
|
||||||
// their elements don't match.
|
|
||||||
func Store(src []interface{}, dest ...interface{}) error {
|
|
||||||
if len(src) != len(dest) {
|
|
||||||
return errors.New("dbus.Store: length mismatch")
|
|
||||||
}
|
|
||||||
|
|
||||||
for i := range src {
|
|
||||||
if err := store(src[i], dest[i]); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func store(src, dest interface{}) error {
|
|
||||||
if reflect.TypeOf(dest).Elem() == reflect.TypeOf(src) {
|
|
||||||
reflect.ValueOf(dest).Elem().Set(reflect.ValueOf(src))
|
|
||||||
return nil
|
|
||||||
} else if hasStruct(dest) {
|
|
||||||
rv := reflect.ValueOf(dest).Elem()
|
|
||||||
switch rv.Kind() {
|
|
||||||
case reflect.Struct:
|
|
||||||
vs, ok := src.([]interface{})
|
|
||||||
if !ok {
|
|
||||||
return errors.New("dbus.Store: type mismatch")
|
|
||||||
}
|
|
||||||
t := rv.Type()
|
|
||||||
ndest := make([]interface{}, 0, rv.NumField())
|
|
||||||
for i := 0; i < rv.NumField(); i++ {
|
|
||||||
field := t.Field(i)
|
|
||||||
if field.PkgPath == "" && field.Tag.Get("dbus") != "-" {
|
|
||||||
ndest = append(ndest, rv.Field(i).Addr().Interface())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if len(vs) != len(ndest) {
|
|
||||||
return errors.New("dbus.Store: type mismatch")
|
|
||||||
}
|
|
||||||
err := Store(vs, ndest...)
|
|
||||||
if err != nil {
|
|
||||||
return errors.New("dbus.Store: type mismatch")
|
|
||||||
}
|
|
||||||
case reflect.Slice:
|
|
||||||
sv := reflect.ValueOf(src)
|
|
||||||
if sv.Kind() != reflect.Slice {
|
|
||||||
return errors.New("dbus.Store: type mismatch")
|
|
||||||
}
|
|
||||||
rv.Set(reflect.MakeSlice(rv.Type(), sv.Len(), sv.Len()))
|
|
||||||
for i := 0; i < sv.Len(); i++ {
|
|
||||||
if err := store(sv.Index(i).Interface(), rv.Index(i).Addr().Interface()); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
case reflect.Map:
|
|
||||||
sv := reflect.ValueOf(src)
|
|
||||||
if sv.Kind() != reflect.Map {
|
|
||||||
return errors.New("dbus.Store: type mismatch")
|
|
||||||
}
|
|
||||||
keys := sv.MapKeys()
|
|
||||||
rv.Set(reflect.MakeMap(sv.Type()))
|
|
||||||
for _, key := range keys {
|
|
||||||
v := reflect.New(sv.Type().Elem())
|
|
||||||
if err := store(v, sv.MapIndex(key).Interface()); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
rv.SetMapIndex(key, v.Elem())
|
|
||||||
}
|
|
||||||
default:
|
|
||||||
return errors.New("dbus.Store: type mismatch")
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
} else {
|
|
||||||
return errors.New("dbus.Store: type mismatch")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func hasStruct(v interface{}) bool {
|
|
||||||
t := reflect.TypeOf(v)
|
|
||||||
for {
|
|
||||||
switch t.Kind() {
|
|
||||||
case reflect.Struct:
|
|
||||||
return true
|
|
||||||
case reflect.Slice, reflect.Ptr, reflect.Map:
|
|
||||||
t = t.Elem()
|
|
||||||
default:
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// An ObjectPath is an object path as defined by the D-Bus spec.
|
|
||||||
type ObjectPath string
|
|
||||||
|
|
||||||
// IsValid returns whether the object path is valid.
|
|
||||||
func (o ObjectPath) IsValid() bool {
|
|
||||||
s := string(o)
|
|
||||||
if len(s) == 0 {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
if s[0] != '/' {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
if s[len(s)-1] == '/' && len(s) != 1 {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
// probably not used, but technically possible
|
|
||||||
if s == "/" {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
split := strings.Split(s[1:], "/")
|
|
||||||
for _, v := range split {
|
|
||||||
if len(v) == 0 {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
for _, c := range v {
|
|
||||||
if !isMemberChar(c) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
// A UnixFD is a Unix file descriptor sent over the wire. See the package-level
|
|
||||||
// documentation for more information about Unix file descriptor passsing.
|
|
||||||
type UnixFD int32
|
|
||||||
|
|
||||||
// A UnixFDIndex is the representation of a Unix file descriptor in a message.
|
|
||||||
type UnixFDIndex uint32
|
|
||||||
|
|
||||||
// alignment returns the alignment of values of type t.
|
|
||||||
func alignment(t reflect.Type) int {
|
|
||||||
switch t {
|
|
||||||
case variantType:
|
|
||||||
return 1
|
|
||||||
case objectPathType:
|
|
||||||
return 4
|
|
||||||
case signatureType:
|
|
||||||
return 1
|
|
||||||
case interfacesType: // sometimes used for structs
|
|
||||||
return 8
|
|
||||||
}
|
|
||||||
switch t.Kind() {
|
|
||||||
case reflect.Uint8:
|
|
||||||
return 1
|
|
||||||
case reflect.Uint16, reflect.Int16:
|
|
||||||
return 2
|
|
||||||
case reflect.Uint32, reflect.Int32, reflect.String, reflect.Array, reflect.Slice, reflect.Map:
|
|
||||||
return 4
|
|
||||||
case reflect.Uint64, reflect.Int64, reflect.Float64, reflect.Struct:
|
|
||||||
return 8
|
|
||||||
case reflect.Ptr:
|
|
||||||
return alignment(t.Elem())
|
|
||||||
}
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
// isKeyType returns whether t is a valid type for a D-Bus dict.
|
|
||||||
func isKeyType(t reflect.Type) bool {
|
|
||||||
switch t.Kind() {
|
|
||||||
case reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64,
|
|
||||||
reflect.Int16, reflect.Int32, reflect.Int64, reflect.Float64,
|
|
||||||
reflect.String:
|
|
||||||
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
// isValidInterface returns whether s is a valid name for an interface.
|
|
||||||
func isValidInterface(s string) bool {
|
|
||||||
if len(s) == 0 || len(s) > 255 || s[0] == '.' {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
elem := strings.Split(s, ".")
|
|
||||||
if len(elem) < 2 {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
for _, v := range elem {
|
|
||||||
if len(v) == 0 {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
if v[0] >= '0' && v[0] <= '9' {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
for _, c := range v {
|
|
||||||
if !isMemberChar(c) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
// isValidMember returns whether s is a valid name for a member.
|
|
||||||
func isValidMember(s string) bool {
|
|
||||||
if len(s) == 0 || len(s) > 255 {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
i := strings.Index(s, ".")
|
|
||||||
if i != -1 {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
if s[0] >= '0' && s[0] <= '9' {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
for _, c := range s {
|
|
||||||
if !isMemberChar(c) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
func isMemberChar(c rune) bool {
|
|
||||||
return (c >= '0' && c <= '9') || (c >= 'A' && c <= 'Z') ||
|
|
||||||
(c >= 'a' && c <= 'z') || c == '_'
|
|
||||||
}
|
|
136
libnetwork/vendor/github.com/godbus/dbus/object.go
generated
vendored
136
libnetwork/vendor/github.com/godbus/dbus/object.go
generated
vendored
|
@ -1,136 +0,0 @@
|
||||||
package dbus
|
|
||||||
|
|
||||||
import (
|
|
||||||
"errors"
|
|
||||||
"strings"
|
|
||||||
)
|
|
||||||
|
|
||||||
// BusObject is the interface of a remote object on which methods can be
|
|
||||||
// invoked.
|
|
||||||
type BusObject interface {
|
|
||||||
Call(method string, flags Flags, args ...interface{}) *Call
|
|
||||||
Go(method string, flags Flags, ch chan *Call, args ...interface{}) *Call
|
|
||||||
GetProperty(p string) (Variant, error)
|
|
||||||
Destination() string
|
|
||||||
Path() ObjectPath
|
|
||||||
}
|
|
||||||
|
|
||||||
// Object represents a remote object on which methods can be invoked.
|
|
||||||
type Object struct {
|
|
||||||
conn *Conn
|
|
||||||
dest string
|
|
||||||
path ObjectPath
|
|
||||||
}
|
|
||||||
|
|
||||||
// Call calls a method with (*Object).Go and waits for its reply.
|
|
||||||
func (o *Object) Call(method string, flags Flags, args ...interface{}) *Call {
|
|
||||||
return <-o.Go(method, flags, make(chan *Call, 1), args...).Done
|
|
||||||
}
|
|
||||||
|
|
||||||
// AddMatchSignal subscribes BusObject to signals from specified interface and
|
|
||||||
// method (member).
|
|
||||||
func (o *Object) AddMatchSignal(iface, member string) *Call {
|
|
||||||
return o.Call(
|
|
||||||
"org.freedesktop.DBus.AddMatch",
|
|
||||||
0,
|
|
||||||
"type='signal',interface='"+iface+"',member='"+member+"'",
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Go calls a method with the given arguments asynchronously. It returns a
|
|
||||||
// Call structure representing this method call. The passed channel will
|
|
||||||
// return the same value once the call is done. If ch is nil, a new channel
|
|
||||||
// will be allocated. Otherwise, ch has to be buffered or Go will panic.
|
|
||||||
//
|
|
||||||
// If the flags include FlagNoReplyExpected, ch is ignored and a Call structure
|
|
||||||
// is returned of which only the Err member is valid.
|
|
||||||
//
|
|
||||||
// If the method parameter contains a dot ('.'), the part before the last dot
|
|
||||||
// specifies the interface on which the method is called.
|
|
||||||
func (o *Object) Go(method string, flags Flags, ch chan *Call, args ...interface{}) *Call {
|
|
||||||
iface := ""
|
|
||||||
i := strings.LastIndex(method, ".")
|
|
||||||
if i != -1 {
|
|
||||||
iface = method[:i]
|
|
||||||
}
|
|
||||||
method = method[i+1:]
|
|
||||||
msg := new(Message)
|
|
||||||
msg.Type = TypeMethodCall
|
|
||||||
msg.serial = o.conn.getSerial()
|
|
||||||
msg.Flags = flags & (FlagNoAutoStart | FlagNoReplyExpected)
|
|
||||||
msg.Headers = make(map[HeaderField]Variant)
|
|
||||||
msg.Headers[FieldPath] = MakeVariant(o.path)
|
|
||||||
msg.Headers[FieldDestination] = MakeVariant(o.dest)
|
|
||||||
msg.Headers[FieldMember] = MakeVariant(method)
|
|
||||||
if iface != "" {
|
|
||||||
msg.Headers[FieldInterface] = MakeVariant(iface)
|
|
||||||
}
|
|
||||||
msg.Body = args
|
|
||||||
if len(args) > 0 {
|
|
||||||
msg.Headers[FieldSignature] = MakeVariant(SignatureOf(args...))
|
|
||||||
}
|
|
||||||
if msg.Flags&FlagNoReplyExpected == 0 {
|
|
||||||
if ch == nil {
|
|
||||||
ch = make(chan *Call, 10)
|
|
||||||
} else if cap(ch) == 0 {
|
|
||||||
panic("dbus: unbuffered channel passed to (*Object).Go")
|
|
||||||
}
|
|
||||||
call := &Call{
|
|
||||||
Destination: o.dest,
|
|
||||||
Path: o.path,
|
|
||||||
Method: method,
|
|
||||||
Args: args,
|
|
||||||
Done: ch,
|
|
||||||
}
|
|
||||||
o.conn.callsLck.Lock()
|
|
||||||
o.conn.calls[msg.serial] = call
|
|
||||||
o.conn.callsLck.Unlock()
|
|
||||||
o.conn.outLck.RLock()
|
|
||||||
if o.conn.closed {
|
|
||||||
call.Err = ErrClosed
|
|
||||||
call.Done <- call
|
|
||||||
} else {
|
|
||||||
o.conn.out <- msg
|
|
||||||
}
|
|
||||||
o.conn.outLck.RUnlock()
|
|
||||||
return call
|
|
||||||
}
|
|
||||||
o.conn.outLck.RLock()
|
|
||||||
defer o.conn.outLck.RUnlock()
|
|
||||||
if o.conn.closed {
|
|
||||||
return &Call{Err: ErrClosed}
|
|
||||||
}
|
|
||||||
o.conn.out <- msg
|
|
||||||
return &Call{Err: nil}
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetProperty calls org.freedesktop.DBus.Properties.GetProperty on the given
|
|
||||||
// object. The property name must be given in interface.member notation.
|
|
||||||
func (o *Object) GetProperty(p string) (Variant, error) {
|
|
||||||
idx := strings.LastIndex(p, ".")
|
|
||||||
if idx == -1 || idx+1 == len(p) {
|
|
||||||
return Variant{}, errors.New("dbus: invalid property " + p)
|
|
||||||
}
|
|
||||||
|
|
||||||
iface := p[:idx]
|
|
||||||
prop := p[idx+1:]
|
|
||||||
|
|
||||||
result := Variant{}
|
|
||||||
err := o.Call("org.freedesktop.DBus.Properties.Get", 0, iface, prop).Store(&result)
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
return Variant{}, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return result, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Destination returns the destination that calls on o are sent to.
|
|
||||||
func (o *Object) Destination() string {
|
|
||||||
return o.dest
|
|
||||||
}
|
|
||||||
|
|
||||||
// Path returns the path that calls on o are sent to.
|
|
||||||
func (o *Object) Path() ObjectPath {
|
|
||||||
return o.path
|
|
||||||
}
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
[](https://travis-ci.org/godbus/dbus)
|
||||||
|
|
||||||
dbus
|
dbus
|
||||||
----
|
----
|
||||||
|
|
||||||
|
@ -12,7 +14,7 @@ D-Bus message bus system.
|
||||||
|
|
||||||
### Installation
|
### Installation
|
||||||
|
|
||||||
This packages requires Go 1.1. If you installed it and set up your GOPATH, just run:
|
This packages requires Go 1.7. If you installed it and set up your GOPATH, just run:
|
||||||
|
|
||||||
```
|
```
|
||||||
go get github.com/godbus/dbus
|
go get github.com/godbus/dbus
|
||||||
|
@ -29,6 +31,7 @@ gives a short overview over the basic usage.
|
||||||
|
|
||||||
#### Projects using godbus
|
#### Projects using godbus
|
||||||
- [notify](https://github.com/esiqveland/notify) provides desktop notifications over dbus into a library.
|
- [notify](https://github.com/esiqveland/notify) provides desktop notifications over dbus into a library.
|
||||||
|
- [go-bluetooth](https://github.com/muka/go-bluetooth) provides a bluetooth client over bluez dbus API.
|
||||||
|
|
||||||
Please note that the API is considered unstable for now and may change without
|
Please note that the API is considered unstable for now and may change without
|
||||||
further notice.
|
further notice.
|
|
@ -77,7 +77,7 @@ func (conn *Conn) Auth(methods []Auth) error {
|
||||||
for _, m := range methods {
|
for _, m := range methods {
|
||||||
if name, data, status := m.FirstData(); bytes.Equal(v, name) {
|
if name, data, status := m.FirstData(); bytes.Equal(v, name) {
|
||||||
var ok bool
|
var ok bool
|
||||||
err = authWriteLine(conn.transport, []byte("AUTH"), []byte(v), data)
|
err = authWriteLine(conn.transport, []byte("AUTH"), v, data)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -116,7 +116,6 @@ func (conn *Conn) Auth(methods []Auth) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
go conn.inWorker()
|
go conn.inWorker()
|
||||||
go conn.outWorker()
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -128,7 +127,7 @@ func (conn *Conn) Auth(methods []Auth) error {
|
||||||
// tryAuth tries to authenticate with m as the mechanism, using state as the
|
// tryAuth tries to authenticate with m as the mechanism, using state as the
|
||||||
// initial authState and in for reading input. It returns (nil, true) on
|
// initial authState and in for reading input. It returns (nil, true) on
|
||||||
// success, (nil, false) on a REJECTED and (someErr, false) if some other
|
// success, (nil, false) on a REJECTED and (someErr, false) if some other
|
||||||
// error occured.
|
// error occurred.
|
||||||
func (conn *Conn) tryAuth(m Auth, state authState, in *bufio.Reader) (error, bool) {
|
func (conn *Conn) tryAuth(m Auth, state authState, in *bufio.Reader) (error, bool) {
|
||||||
for {
|
for {
|
||||||
s, err := authReadLine(in)
|
s, err := authReadLine(in)
|
16
libnetwork/vendor/github.com/godbus/dbus/v5/auth_anonymous.go
generated
vendored
Normal file
16
libnetwork/vendor/github.com/godbus/dbus/v5/auth_anonymous.go
generated
vendored
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
package dbus
|
||||||
|
|
||||||
|
// AuthAnonymous returns an Auth that uses the ANONYMOUS mechanism.
|
||||||
|
func AuthAnonymous() Auth {
|
||||||
|
return &authAnonymous{}
|
||||||
|
}
|
||||||
|
|
||||||
|
type authAnonymous struct{}
|
||||||
|
|
||||||
|
func (a *authAnonymous) FirstData() (name, resp []byte, status AuthStatus) {
|
||||||
|
return []byte("ANONYMOUS"), nil, AuthOk
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *authAnonymous) HandleData(data []byte) (resp []byte, status AuthStatus) {
|
||||||
|
return nil, AuthError
|
||||||
|
}
|
|
@ -60,7 +60,7 @@ func (a authCookieSha1) HandleData(data []byte) ([]byte, AuthStatus) {
|
||||||
|
|
||||||
// getCookie searches for the cookie identified by id in context and returns
|
// getCookie searches for the cookie identified by id in context and returns
|
||||||
// the cookie content or nil. (Since HandleData can't return a specific error,
|
// the cookie content or nil. (Since HandleData can't return a specific error,
|
||||||
// but only whether an error occured, this function also doesn't bother to
|
// but only whether an error occurred, this function also doesn't bother to
|
||||||
// return an error.)
|
// return an error.)
|
||||||
func (a authCookieSha1) getCookie(context, id []byte) []byte {
|
func (a authCookieSha1) getCookie(context, id []byte) []byte {
|
||||||
file, err := os.Open(a.home + "/.dbus-keyrings/" + string(context))
|
file, err := os.Open(a.home + "/.dbus-keyrings/" + string(context))
|
|
@ -1,9 +1,12 @@
|
||||||
package dbus
|
package dbus
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var errSignature = errors.New("dbus: mismatched signature")
|
||||||
|
|
||||||
// Call represents a pending or completed method call.
|
// Call represents a pending or completed method call.
|
||||||
type Call struct {
|
type Call struct {
|
||||||
Destination string
|
Destination string
|
||||||
|
@ -20,9 +23,25 @@ type Call struct {
|
||||||
|
|
||||||
// Holds the response once the call is done.
|
// Holds the response once the call is done.
|
||||||
Body []interface{}
|
Body []interface{}
|
||||||
|
|
||||||
|
// tracks context and canceler
|
||||||
|
ctx context.Context
|
||||||
|
ctxCanceler context.CancelFunc
|
||||||
}
|
}
|
||||||
|
|
||||||
var errSignature = errors.New("dbus: mismatched signature")
|
func (c *Call) Context() context.Context {
|
||||||
|
if c.ctx == nil {
|
||||||
|
return context.Background()
|
||||||
|
}
|
||||||
|
|
||||||
|
return c.ctx
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Call) ContextCancel() {
|
||||||
|
if c.ctxCanceler != nil {
|
||||||
|
c.ctxCanceler()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Store stores the body of the reply into the provided pointers. It returns
|
// Store stores the body of the reply into the provided pointers. It returns
|
||||||
// an error if the signatures of the body and retvalues don't match, or if
|
// an error if the signatures of the body and retvalues don't match, or if
|
||||||
|
@ -34,3 +53,8 @@ func (c *Call) Store(retvalues ...interface{}) error {
|
||||||
|
|
||||||
return Store(c.Body, retvalues...)
|
return Store(c.Body, retvalues...)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (c *Call) done() {
|
||||||
|
c.Done <- c
|
||||||
|
c.ContextCancel()
|
||||||
|
}
|
912
libnetwork/vendor/github.com/godbus/dbus/v5/conn.go
generated
vendored
Normal file
912
libnetwork/vendor/github.com/godbus/dbus/v5/conn.go
generated
vendored
Normal file
|
@ -0,0 +1,912 @@
|
||||||
|
package dbus
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"io"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
systemBus *Conn
|
||||||
|
systemBusLck sync.Mutex
|
||||||
|
sessionBus *Conn
|
||||||
|
sessionBusLck sync.Mutex
|
||||||
|
)
|
||||||
|
|
||||||
|
// ErrClosed is the error returned by calls on a closed connection.
|
||||||
|
var ErrClosed = errors.New("dbus: connection closed by user")
|
||||||
|
|
||||||
|
// Conn represents a connection to a message bus (usually, the system or
|
||||||
|
// session bus).
|
||||||
|
//
|
||||||
|
// Connections are either shared or private. Shared connections
|
||||||
|
// are shared between calls to the functions that return them. As a result,
|
||||||
|
// the methods Close, Auth and Hello must not be called on them.
|
||||||
|
//
|
||||||
|
// Multiple goroutines may invoke methods on a connection simultaneously.
|
||||||
|
type Conn struct {
|
||||||
|
transport
|
||||||
|
|
||||||
|
ctx context.Context
|
||||||
|
cancelCtx context.CancelFunc
|
||||||
|
|
||||||
|
closeOnce sync.Once
|
||||||
|
closeErr error
|
||||||
|
|
||||||
|
busObj BusObject
|
||||||
|
unixFD bool
|
||||||
|
uuid string
|
||||||
|
|
||||||
|
handler Handler
|
||||||
|
signalHandler SignalHandler
|
||||||
|
serialGen SerialGenerator
|
||||||
|
inInt Interceptor
|
||||||
|
outInt Interceptor
|
||||||
|
|
||||||
|
names *nameTracker
|
||||||
|
calls *callTracker
|
||||||
|
outHandler *outputHandler
|
||||||
|
|
||||||
|
eavesdropped chan<- *Message
|
||||||
|
eavesdroppedLck sync.Mutex
|
||||||
|
}
|
||||||
|
|
||||||
|
// SessionBus returns a shared connection to the session bus, connecting to it
|
||||||
|
// if not already done.
|
||||||
|
func SessionBus() (conn *Conn, err error) {
|
||||||
|
sessionBusLck.Lock()
|
||||||
|
defer sessionBusLck.Unlock()
|
||||||
|
if sessionBus != nil {
|
||||||
|
return sessionBus, nil
|
||||||
|
}
|
||||||
|
defer func() {
|
||||||
|
if conn != nil {
|
||||||
|
sessionBus = conn
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
conn, err = SessionBusPrivate()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err = conn.Auth(nil); err != nil {
|
||||||
|
conn.Close()
|
||||||
|
conn = nil
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err = conn.Hello(); err != nil {
|
||||||
|
conn.Close()
|
||||||
|
conn = nil
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
func getSessionBusAddress() (string, error) {
|
||||||
|
if address := os.Getenv("DBUS_SESSION_BUS_ADDRESS"); address != "" && address != "autolaunch:" {
|
||||||
|
return address, nil
|
||||||
|
|
||||||
|
} else if address := tryDiscoverDbusSessionBusAddress(); address != "" {
|
||||||
|
os.Setenv("DBUS_SESSION_BUS_ADDRESS", address)
|
||||||
|
return address, nil
|
||||||
|
}
|
||||||
|
return getSessionBusPlatformAddress()
|
||||||
|
}
|
||||||
|
|
||||||
|
// SessionBusPrivate returns a new private connection to the session bus.
|
||||||
|
func SessionBusPrivate(opts ...ConnOption) (*Conn, error) {
|
||||||
|
address, err := getSessionBusAddress()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return Dial(address, opts...)
|
||||||
|
}
|
||||||
|
|
||||||
|
// SessionBusPrivate returns a new private connection to the session bus.
|
||||||
|
//
|
||||||
|
// Deprecated: use SessionBusPrivate with options instead.
|
||||||
|
func SessionBusPrivateHandler(handler Handler, signalHandler SignalHandler) (*Conn, error) {
|
||||||
|
return SessionBusPrivate(WithHandler(handler), WithSignalHandler(signalHandler))
|
||||||
|
}
|
||||||
|
|
||||||
|
// SystemBus returns a shared connection to the system bus, connecting to it if
|
||||||
|
// not already done.
|
||||||
|
func SystemBus() (conn *Conn, err error) {
|
||||||
|
systemBusLck.Lock()
|
||||||
|
defer systemBusLck.Unlock()
|
||||||
|
if systemBus != nil {
|
||||||
|
return systemBus, nil
|
||||||
|
}
|
||||||
|
defer func() {
|
||||||
|
if conn != nil {
|
||||||
|
systemBus = conn
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
conn, err = SystemBusPrivate()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err = conn.Auth(nil); err != nil {
|
||||||
|
conn.Close()
|
||||||
|
conn = nil
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err = conn.Hello(); err != nil {
|
||||||
|
conn.Close()
|
||||||
|
conn = nil
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// SystemBusPrivate returns a new private connection to the system bus.
|
||||||
|
// Note: this connection is not ready to use. One must perform Auth and Hello
|
||||||
|
// on the connection before it is useable.
|
||||||
|
func SystemBusPrivate(opts ...ConnOption) (*Conn, error) {
|
||||||
|
return Dial(getSystemBusPlatformAddress(), opts...)
|
||||||
|
}
|
||||||
|
|
||||||
|
// SystemBusPrivateHandler returns a new private connection to the system bus, using the provided handlers.
|
||||||
|
//
|
||||||
|
// Deprecated: use SystemBusPrivate with options instead.
|
||||||
|
func SystemBusPrivateHandler(handler Handler, signalHandler SignalHandler) (*Conn, error) {
|
||||||
|
return SystemBusPrivate(WithHandler(handler), WithSignalHandler(signalHandler))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Dial establishes a new private connection to the message bus specified by address.
|
||||||
|
func Dial(address string, opts ...ConnOption) (*Conn, error) {
|
||||||
|
tr, err := getTransport(address)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return newConn(tr, opts...)
|
||||||
|
}
|
||||||
|
|
||||||
|
// DialHandler establishes a new private connection to the message bus specified by address, using the supplied handlers.
|
||||||
|
//
|
||||||
|
// Deprecated: use Dial with options instead.
|
||||||
|
func DialHandler(address string, handler Handler, signalHandler SignalHandler) (*Conn, error) {
|
||||||
|
return Dial(address, WithSignalHandler(signalHandler))
|
||||||
|
}
|
||||||
|
|
||||||
|
// ConnOption is a connection option.
|
||||||
|
type ConnOption func(conn *Conn) error
|
||||||
|
|
||||||
|
// WithHandler overrides the default handler.
|
||||||
|
func WithHandler(handler Handler) ConnOption {
|
||||||
|
return func(conn *Conn) error {
|
||||||
|
conn.handler = handler
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// WithSignalHandler overrides the default signal handler.
|
||||||
|
func WithSignalHandler(handler SignalHandler) ConnOption {
|
||||||
|
return func(conn *Conn) error {
|
||||||
|
conn.signalHandler = handler
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// WithSerialGenerator overrides the default signals generator.
|
||||||
|
func WithSerialGenerator(gen SerialGenerator) ConnOption {
|
||||||
|
return func(conn *Conn) error {
|
||||||
|
conn.serialGen = gen
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Interceptor intercepts incoming and outgoing messages.
|
||||||
|
type Interceptor func(msg *Message)
|
||||||
|
|
||||||
|
// WithIncomingInterceptor sets the given interceptor for incoming messages.
|
||||||
|
func WithIncomingInterceptor(interceptor Interceptor) ConnOption {
|
||||||
|
return func(conn *Conn) error {
|
||||||
|
conn.inInt = interceptor
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// WithOutgoingInterceptor sets the given interceptor for outgoing messages.
|
||||||
|
func WithOutgoingInterceptor(interceptor Interceptor) ConnOption {
|
||||||
|
return func(conn *Conn) error {
|
||||||
|
conn.outInt = interceptor
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// WithContext overrides the default context for the connection.
|
||||||
|
func WithContext(ctx context.Context) ConnOption {
|
||||||
|
return func(conn *Conn) error {
|
||||||
|
conn.ctx = ctx
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewConn creates a new private *Conn from an already established connection.
|
||||||
|
func NewConn(conn io.ReadWriteCloser, opts ...ConnOption) (*Conn, error) {
|
||||||
|
return newConn(genericTransport{conn}, opts...)
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewConnHandler creates a new private *Conn from an already established connection, using the supplied handlers.
|
||||||
|
//
|
||||||
|
// Deprecated: use NewConn with options instead.
|
||||||
|
func NewConnHandler(conn io.ReadWriteCloser, handler Handler, signalHandler SignalHandler) (*Conn, error) {
|
||||||
|
return NewConn(genericTransport{conn}, WithHandler(handler), WithSignalHandler(signalHandler))
|
||||||
|
}
|
||||||
|
|
||||||
|
// newConn creates a new *Conn from a transport.
|
||||||
|
func newConn(tr transport, opts ...ConnOption) (*Conn, error) {
|
||||||
|
conn := new(Conn)
|
||||||
|
conn.transport = tr
|
||||||
|
for _, opt := range opts {
|
||||||
|
if err := opt(conn); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if conn.ctx == nil {
|
||||||
|
conn.ctx = context.Background()
|
||||||
|
}
|
||||||
|
conn.ctx, conn.cancelCtx = context.WithCancel(conn.ctx)
|
||||||
|
go func() {
|
||||||
|
<-conn.ctx.Done()
|
||||||
|
conn.Close()
|
||||||
|
}()
|
||||||
|
|
||||||
|
conn.calls = newCallTracker()
|
||||||
|
if conn.handler == nil {
|
||||||
|
conn.handler = NewDefaultHandler()
|
||||||
|
}
|
||||||
|
if conn.signalHandler == nil {
|
||||||
|
conn.signalHandler = NewDefaultSignalHandler()
|
||||||
|
}
|
||||||
|
if conn.serialGen == nil {
|
||||||
|
conn.serialGen = newSerialGenerator()
|
||||||
|
}
|
||||||
|
conn.outHandler = &outputHandler{conn: conn}
|
||||||
|
conn.names = newNameTracker()
|
||||||
|
conn.busObj = conn.Object("org.freedesktop.DBus", "/org/freedesktop/DBus")
|
||||||
|
return conn, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// BusObject returns the object owned by the bus daemon which handles
|
||||||
|
// administrative requests.
|
||||||
|
func (conn *Conn) BusObject() BusObject {
|
||||||
|
return conn.busObj
|
||||||
|
}
|
||||||
|
|
||||||
|
// Close closes the connection. Any blocked operations will return with errors
|
||||||
|
// and the channels passed to Eavesdrop and Signal are closed. This method must
|
||||||
|
// not be called on shared connections.
|
||||||
|
func (conn *Conn) Close() error {
|
||||||
|
conn.closeOnce.Do(func() {
|
||||||
|
conn.outHandler.close()
|
||||||
|
if term, ok := conn.signalHandler.(Terminator); ok {
|
||||||
|
term.Terminate()
|
||||||
|
}
|
||||||
|
|
||||||
|
if term, ok := conn.handler.(Terminator); ok {
|
||||||
|
term.Terminate()
|
||||||
|
}
|
||||||
|
|
||||||
|
conn.eavesdroppedLck.Lock()
|
||||||
|
if conn.eavesdropped != nil {
|
||||||
|
close(conn.eavesdropped)
|
||||||
|
}
|
||||||
|
conn.eavesdroppedLck.Unlock()
|
||||||
|
|
||||||
|
conn.cancelCtx()
|
||||||
|
|
||||||
|
conn.closeErr = conn.transport.Close()
|
||||||
|
})
|
||||||
|
return conn.closeErr
|
||||||
|
}
|
||||||
|
|
||||||
|
// Context returns the context associated with the connection. The
|
||||||
|
// context will be cancelled when the connection is closed.
|
||||||
|
func (conn *Conn) Context() context.Context {
|
||||||
|
return conn.ctx
|
||||||
|
}
|
||||||
|
|
||||||
|
// Eavesdrop causes conn to send all incoming messages to the given channel
|
||||||
|
// without further processing. Method replies, errors and signals will not be
|
||||||
|
// sent to the appropriate channels and method calls will not be handled. If nil
|
||||||
|
// is passed, the normal behaviour is restored.
|
||||||
|
//
|
||||||
|
// The caller has to make sure that ch is sufficiently buffered;
|
||||||
|
// if a message arrives when a write to ch is not possible, the message is
|
||||||
|
// discarded.
|
||||||
|
func (conn *Conn) Eavesdrop(ch chan<- *Message) {
|
||||||
|
conn.eavesdroppedLck.Lock()
|
||||||
|
conn.eavesdropped = ch
|
||||||
|
conn.eavesdroppedLck.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
// getSerial returns an unused serial.
|
||||||
|
func (conn *Conn) getSerial() uint32 {
|
||||||
|
return conn.serialGen.GetSerial()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Hello sends the initial org.freedesktop.DBus.Hello call. This method must be
|
||||||
|
// called after authentication, but before sending any other messages to the
|
||||||
|
// bus. Hello must not be called for shared connections.
|
||||||
|
func (conn *Conn) Hello() error {
|
||||||
|
var s string
|
||||||
|
err := conn.busObj.Call("org.freedesktop.DBus.Hello", 0).Store(&s)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
conn.names.acquireUniqueConnectionName(s)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// inWorker runs in an own goroutine, reading incoming messages from the
|
||||||
|
// transport and dispatching them appropiately.
|
||||||
|
func (conn *Conn) inWorker() {
|
||||||
|
for {
|
||||||
|
msg, err := conn.ReadMessage()
|
||||||
|
if err != nil {
|
||||||
|
if _, ok := err.(InvalidMessageError); !ok {
|
||||||
|
// Some read error occurred (usually EOF); we can't really do
|
||||||
|
// anything but to shut down all stuff and returns errors to all
|
||||||
|
// pending replies.
|
||||||
|
conn.Close()
|
||||||
|
conn.calls.finalizeAllWithError(err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// invalid messages are ignored
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
conn.eavesdroppedLck.Lock()
|
||||||
|
if conn.eavesdropped != nil {
|
||||||
|
select {
|
||||||
|
case conn.eavesdropped <- msg:
|
||||||
|
default:
|
||||||
|
}
|
||||||
|
conn.eavesdroppedLck.Unlock()
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
conn.eavesdroppedLck.Unlock()
|
||||||
|
dest, _ := msg.Headers[FieldDestination].value.(string)
|
||||||
|
found := dest == "" ||
|
||||||
|
!conn.names.uniqueNameIsKnown() ||
|
||||||
|
conn.names.isKnownName(dest)
|
||||||
|
if !found {
|
||||||
|
// Eavesdropped a message, but no channel for it is registered.
|
||||||
|
// Ignore it.
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
if conn.inInt != nil {
|
||||||
|
conn.inInt(msg)
|
||||||
|
}
|
||||||
|
switch msg.Type {
|
||||||
|
case TypeError:
|
||||||
|
conn.serialGen.RetireSerial(conn.calls.handleDBusError(msg))
|
||||||
|
case TypeMethodReply:
|
||||||
|
conn.serialGen.RetireSerial(conn.calls.handleReply(msg))
|
||||||
|
case TypeSignal:
|
||||||
|
conn.handleSignal(msg)
|
||||||
|
case TypeMethodCall:
|
||||||
|
go conn.handleCall(msg)
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (conn *Conn) handleSignal(msg *Message) {
|
||||||
|
iface := msg.Headers[FieldInterface].value.(string)
|
||||||
|
member := msg.Headers[FieldMember].value.(string)
|
||||||
|
// as per http://dbus.freedesktop.org/doc/dbus-specification.html ,
|
||||||
|
// sender is optional for signals.
|
||||||
|
sender, _ := msg.Headers[FieldSender].value.(string)
|
||||||
|
if iface == "org.freedesktop.DBus" && sender == "org.freedesktop.DBus" {
|
||||||
|
if member == "NameLost" {
|
||||||
|
// If we lost the name on the bus, remove it from our
|
||||||
|
// tracking list.
|
||||||
|
name, ok := msg.Body[0].(string)
|
||||||
|
if !ok {
|
||||||
|
panic("Unable to read the lost name")
|
||||||
|
}
|
||||||
|
conn.names.loseName(name)
|
||||||
|
} else if member == "NameAcquired" {
|
||||||
|
// If we acquired the name on the bus, add it to our
|
||||||
|
// tracking list.
|
||||||
|
name, ok := msg.Body[0].(string)
|
||||||
|
if !ok {
|
||||||
|
panic("Unable to read the acquired name")
|
||||||
|
}
|
||||||
|
conn.names.acquireName(name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
signal := &Signal{
|
||||||
|
Sender: sender,
|
||||||
|
Path: msg.Headers[FieldPath].value.(ObjectPath),
|
||||||
|
Name: iface + "." + member,
|
||||||
|
Body: msg.Body,
|
||||||
|
}
|
||||||
|
conn.signalHandler.DeliverSignal(iface, member, signal)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Names returns the list of all names that are currently owned by this
|
||||||
|
// connection. The slice is always at least one element long, the first element
|
||||||
|
// being the unique name of the connection.
|
||||||
|
func (conn *Conn) Names() []string {
|
||||||
|
return conn.names.listKnownNames()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Object returns the object identified by the given destination name and path.
|
||||||
|
func (conn *Conn) Object(dest string, path ObjectPath) BusObject {
|
||||||
|
return &Object{conn, dest, path}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (conn *Conn) sendMessageAndIfClosed(msg *Message, ifClosed func()) {
|
||||||
|
if conn.outInt != nil {
|
||||||
|
conn.outInt(msg)
|
||||||
|
}
|
||||||
|
err := conn.outHandler.sendAndIfClosed(msg, ifClosed)
|
||||||
|
conn.calls.handleSendError(msg, err)
|
||||||
|
if err != nil {
|
||||||
|
conn.serialGen.RetireSerial(msg.serial)
|
||||||
|
} else if msg.Type != TypeMethodCall {
|
||||||
|
conn.serialGen.RetireSerial(msg.serial)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Send sends the given message to the message bus. You usually don't need to
|
||||||
|
// use this; use the higher-level equivalents (Call / Go, Emit and Export)
|
||||||
|
// instead. If msg is a method call and NoReplyExpected is not set, a non-nil
|
||||||
|
// call is returned and the same value is sent to ch (which must be buffered)
|
||||||
|
// once the call is complete. Otherwise, ch is ignored and a Call structure is
|
||||||
|
// returned of which only the Err member is valid.
|
||||||
|
func (conn *Conn) Send(msg *Message, ch chan *Call) *Call {
|
||||||
|
return conn.send(context.Background(), msg, ch)
|
||||||
|
}
|
||||||
|
|
||||||
|
// SendWithContext acts like Send but takes a context
|
||||||
|
func (conn *Conn) SendWithContext(ctx context.Context, msg *Message, ch chan *Call) *Call {
|
||||||
|
return conn.send(ctx, msg, ch)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (conn *Conn) send(ctx context.Context, msg *Message, ch chan *Call) *Call {
|
||||||
|
if ctx == nil {
|
||||||
|
panic("nil context")
|
||||||
|
}
|
||||||
|
|
||||||
|
var call *Call
|
||||||
|
ctx, canceler := context.WithCancel(ctx)
|
||||||
|
msg.serial = conn.getSerial()
|
||||||
|
if msg.Type == TypeMethodCall && msg.Flags&FlagNoReplyExpected == 0 {
|
||||||
|
if ch == nil {
|
||||||
|
ch = make(chan *Call, 5)
|
||||||
|
} else if cap(ch) == 0 {
|
||||||
|
panic("dbus: unbuffered channel passed to (*Conn).Send")
|
||||||
|
}
|
||||||
|
call = new(Call)
|
||||||
|
call.Destination, _ = msg.Headers[FieldDestination].value.(string)
|
||||||
|
call.Path, _ = msg.Headers[FieldPath].value.(ObjectPath)
|
||||||
|
iface, _ := msg.Headers[FieldInterface].value.(string)
|
||||||
|
member, _ := msg.Headers[FieldMember].value.(string)
|
||||||
|
call.Method = iface + "." + member
|
||||||
|
call.Args = msg.Body
|
||||||
|
call.Done = ch
|
||||||
|
call.ctx = ctx
|
||||||
|
call.ctxCanceler = canceler
|
||||||
|
conn.calls.track(msg.serial, call)
|
||||||
|
go func() {
|
||||||
|
<-ctx.Done()
|
||||||
|
conn.calls.handleSendError(msg, ctx.Err())
|
||||||
|
}()
|
||||||
|
conn.sendMessageAndIfClosed(msg, func() {
|
||||||
|
conn.calls.handleSendError(msg, ErrClosed)
|
||||||
|
canceler()
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
canceler()
|
||||||
|
call = &Call{Err: nil}
|
||||||
|
conn.sendMessageAndIfClosed(msg, func() {
|
||||||
|
call = &Call{Err: ErrClosed}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return call
|
||||||
|
}
|
||||||
|
|
||||||
|
// sendError creates an error message corresponding to the parameters and sends
|
||||||
|
// it to conn.out.
|
||||||
|
func (conn *Conn) sendError(err error, dest string, serial uint32) {
|
||||||
|
var e *Error
|
||||||
|
switch em := err.(type) {
|
||||||
|
case Error:
|
||||||
|
e = &em
|
||||||
|
case *Error:
|
||||||
|
e = em
|
||||||
|
case DBusError:
|
||||||
|
name, body := em.DBusError()
|
||||||
|
e = NewError(name, body)
|
||||||
|
default:
|
||||||
|
e = MakeFailedError(err)
|
||||||
|
}
|
||||||
|
msg := new(Message)
|
||||||
|
msg.Type = TypeError
|
||||||
|
msg.serial = conn.getSerial()
|
||||||
|
msg.Headers = make(map[HeaderField]Variant)
|
||||||
|
if dest != "" {
|
||||||
|
msg.Headers[FieldDestination] = MakeVariant(dest)
|
||||||
|
}
|
||||||
|
msg.Headers[FieldErrorName] = MakeVariant(e.Name)
|
||||||
|
msg.Headers[FieldReplySerial] = MakeVariant(serial)
|
||||||
|
msg.Body = e.Body
|
||||||
|
if len(e.Body) > 0 {
|
||||||
|
msg.Headers[FieldSignature] = MakeVariant(SignatureOf(e.Body...))
|
||||||
|
}
|
||||||
|
conn.sendMessageAndIfClosed(msg, nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
// sendReply creates a method reply message corresponding to the parameters and
|
||||||
|
// sends it to conn.out.
|
||||||
|
func (conn *Conn) sendReply(dest string, serial uint32, values ...interface{}) {
|
||||||
|
msg := new(Message)
|
||||||
|
msg.Type = TypeMethodReply
|
||||||
|
msg.serial = conn.getSerial()
|
||||||
|
msg.Headers = make(map[HeaderField]Variant)
|
||||||
|
if dest != "" {
|
||||||
|
msg.Headers[FieldDestination] = MakeVariant(dest)
|
||||||
|
}
|
||||||
|
msg.Headers[FieldReplySerial] = MakeVariant(serial)
|
||||||
|
msg.Body = values
|
||||||
|
if len(values) > 0 {
|
||||||
|
msg.Headers[FieldSignature] = MakeVariant(SignatureOf(values...))
|
||||||
|
}
|
||||||
|
conn.sendMessageAndIfClosed(msg, nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
// AddMatchSignal registers the given match rule to receive broadcast
|
||||||
|
// signals based on their contents.
|
||||||
|
func (conn *Conn) AddMatchSignal(options ...MatchOption) error {
|
||||||
|
options = append([]MatchOption{withMatchType("signal")}, options...)
|
||||||
|
return conn.busObj.Call(
|
||||||
|
"org.freedesktop.DBus.AddMatch", 0,
|
||||||
|
formatMatchOptions(options),
|
||||||
|
).Store()
|
||||||
|
}
|
||||||
|
|
||||||
|
// RemoveMatchSignal removes the first rule that matches previously registered with AddMatchSignal.
|
||||||
|
func (conn *Conn) RemoveMatchSignal(options ...MatchOption) error {
|
||||||
|
options = append([]MatchOption{withMatchType("signal")}, options...)
|
||||||
|
return conn.busObj.Call(
|
||||||
|
"org.freedesktop.DBus.RemoveMatch", 0,
|
||||||
|
formatMatchOptions(options),
|
||||||
|
).Store()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Signal registers the given channel to be passed all received signal messages.
|
||||||
|
//
|
||||||
|
// Multiple of these channels can be registered at the same time.
|
||||||
|
//
|
||||||
|
// These channels are "overwritten" by Eavesdrop; i.e., if there currently is a
|
||||||
|
// channel for eavesdropped messages, this channel receives all signals, and
|
||||||
|
// none of the channels passed to Signal will receive any signals.
|
||||||
|
//
|
||||||
|
// Panics if the signal handler is not a `SignalRegistrar`.
|
||||||
|
func (conn *Conn) Signal(ch chan<- *Signal) {
|
||||||
|
handler, ok := conn.signalHandler.(SignalRegistrar)
|
||||||
|
if !ok {
|
||||||
|
panic("cannot use this method with a non SignalRegistrar handler")
|
||||||
|
}
|
||||||
|
handler.AddSignal(ch)
|
||||||
|
}
|
||||||
|
|
||||||
|
// RemoveSignal removes the given channel from the list of the registered channels.
|
||||||
|
//
|
||||||
|
// Panics if the signal handler is not a `SignalRegistrar`.
|
||||||
|
func (conn *Conn) RemoveSignal(ch chan<- *Signal) {
|
||||||
|
handler, ok := conn.signalHandler.(SignalRegistrar)
|
||||||
|
if !ok {
|
||||||
|
panic("cannot use this method with a non SignalRegistrar handler")
|
||||||
|
}
|
||||||
|
handler.RemoveSignal(ch)
|
||||||
|
}
|
||||||
|
|
||||||
|
// SupportsUnixFDs returns whether the underlying transport supports passing of
|
||||||
|
// unix file descriptors. If this is false, method calls containing unix file
|
||||||
|
// descriptors will return an error and emitted signals containing them will
|
||||||
|
// not be sent.
|
||||||
|
func (conn *Conn) SupportsUnixFDs() bool {
|
||||||
|
return conn.unixFD
|
||||||
|
}
|
||||||
|
|
||||||
|
// Error represents a D-Bus message of type Error.
|
||||||
|
type Error struct {
|
||||||
|
Name string
|
||||||
|
Body []interface{}
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewError(name string, body []interface{}) *Error {
|
||||||
|
return &Error{name, body}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (e Error) Error() string {
|
||||||
|
if len(e.Body) >= 1 {
|
||||||
|
s, ok := e.Body[0].(string)
|
||||||
|
if ok {
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return e.Name
|
||||||
|
}
|
||||||
|
|
||||||
|
// Signal represents a D-Bus message of type Signal. The name member is given in
|
||||||
|
// "interface.member" notation, e.g. org.freedesktop.D-Bus.NameLost.
|
||||||
|
type Signal struct {
|
||||||
|
Sender string
|
||||||
|
Path ObjectPath
|
||||||
|
Name string
|
||||||
|
Body []interface{}
|
||||||
|
}
|
||||||
|
|
||||||
|
// transport is a D-Bus transport.
|
||||||
|
type transport interface {
|
||||||
|
// Read and Write raw data (for example, for the authentication protocol).
|
||||||
|
io.ReadWriteCloser
|
||||||
|
|
||||||
|
// Send the initial null byte used for the EXTERNAL mechanism.
|
||||||
|
SendNullByte() error
|
||||||
|
|
||||||
|
// Returns whether this transport supports passing Unix FDs.
|
||||||
|
SupportsUnixFDs() bool
|
||||||
|
|
||||||
|
// Signal the transport that Unix FD passing is enabled for this connection.
|
||||||
|
EnableUnixFDs()
|
||||||
|
|
||||||
|
// Read / send a message, handling things like Unix FDs.
|
||||||
|
ReadMessage() (*Message, error)
|
||||||
|
SendMessage(*Message) error
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
transports = make(map[string]func(string) (transport, error))
|
||||||
|
)
|
||||||
|
|
||||||
|
func getTransport(address string) (transport, error) {
|
||||||
|
var err error
|
||||||
|
var t transport
|
||||||
|
|
||||||
|
addresses := strings.Split(address, ";")
|
||||||
|
for _, v := range addresses {
|
||||||
|
i := strings.IndexRune(v, ':')
|
||||||
|
if i == -1 {
|
||||||
|
err = errors.New("dbus: invalid bus address (no transport)")
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
f := transports[v[:i]]
|
||||||
|
if f == nil {
|
||||||
|
err = errors.New("dbus: invalid bus address (invalid or unsupported transport)")
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
t, err = f(v[i+1:])
|
||||||
|
if err == nil {
|
||||||
|
return t, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// getKey gets a key from a the list of keys. Returns "" on error / not found...
|
||||||
|
func getKey(s, key string) string {
|
||||||
|
for _, keyEqualsValue := range strings.Split(s, ",") {
|
||||||
|
keyValue := strings.SplitN(keyEqualsValue, "=", 2)
|
||||||
|
if len(keyValue) == 2 && keyValue[0] == key {
|
||||||
|
return keyValue[1]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
type outputHandler struct {
|
||||||
|
conn *Conn
|
||||||
|
sendLck sync.Mutex
|
||||||
|
closed struct {
|
||||||
|
isClosed bool
|
||||||
|
lck sync.RWMutex
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *outputHandler) sendAndIfClosed(msg *Message, ifClosed func()) error {
|
||||||
|
h.closed.lck.RLock()
|
||||||
|
defer h.closed.lck.RUnlock()
|
||||||
|
if h.closed.isClosed {
|
||||||
|
if ifClosed != nil {
|
||||||
|
ifClosed()
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
h.sendLck.Lock()
|
||||||
|
defer h.sendLck.Unlock()
|
||||||
|
return h.conn.SendMessage(msg)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *outputHandler) close() {
|
||||||
|
h.closed.lck.Lock()
|
||||||
|
defer h.closed.lck.Unlock()
|
||||||
|
h.closed.isClosed = true
|
||||||
|
}
|
||||||
|
|
||||||
|
type serialGenerator struct {
|
||||||
|
lck sync.Mutex
|
||||||
|
nextSerial uint32
|
||||||
|
serialUsed map[uint32]bool
|
||||||
|
}
|
||||||
|
|
||||||
|
func newSerialGenerator() *serialGenerator {
|
||||||
|
return &serialGenerator{
|
||||||
|
serialUsed: map[uint32]bool{0: true},
|
||||||
|
nextSerial: 1,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (gen *serialGenerator) GetSerial() uint32 {
|
||||||
|
gen.lck.Lock()
|
||||||
|
defer gen.lck.Unlock()
|
||||||
|
n := gen.nextSerial
|
||||||
|
for gen.serialUsed[n] {
|
||||||
|
n++
|
||||||
|
}
|
||||||
|
gen.serialUsed[n] = true
|
||||||
|
gen.nextSerial = n + 1
|
||||||
|
return n
|
||||||
|
}
|
||||||
|
|
||||||
|
func (gen *serialGenerator) RetireSerial(serial uint32) {
|
||||||
|
gen.lck.Lock()
|
||||||
|
defer gen.lck.Unlock()
|
||||||
|
delete(gen.serialUsed, serial)
|
||||||
|
}
|
||||||
|
|
||||||
|
type nameTracker struct {
|
||||||
|
lck sync.RWMutex
|
||||||
|
unique string
|
||||||
|
names map[string]struct{}
|
||||||
|
}
|
||||||
|
|
||||||
|
func newNameTracker() *nameTracker {
|
||||||
|
return &nameTracker{names: map[string]struct{}{}}
|
||||||
|
}
|
||||||
|
func (tracker *nameTracker) acquireUniqueConnectionName(name string) {
|
||||||
|
tracker.lck.Lock()
|
||||||
|
defer tracker.lck.Unlock()
|
||||||
|
tracker.unique = name
|
||||||
|
}
|
||||||
|
func (tracker *nameTracker) acquireName(name string) {
|
||||||
|
tracker.lck.Lock()
|
||||||
|
defer tracker.lck.Unlock()
|
||||||
|
tracker.names[name] = struct{}{}
|
||||||
|
}
|
||||||
|
func (tracker *nameTracker) loseName(name string) {
|
||||||
|
tracker.lck.Lock()
|
||||||
|
defer tracker.lck.Unlock()
|
||||||
|
delete(tracker.names, name)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (tracker *nameTracker) uniqueNameIsKnown() bool {
|
||||||
|
tracker.lck.RLock()
|
||||||
|
defer tracker.lck.RUnlock()
|
||||||
|
return tracker.unique != ""
|
||||||
|
}
|
||||||
|
func (tracker *nameTracker) isKnownName(name string) bool {
|
||||||
|
tracker.lck.RLock()
|
||||||
|
defer tracker.lck.RUnlock()
|
||||||
|
_, ok := tracker.names[name]
|
||||||
|
return ok || name == tracker.unique
|
||||||
|
}
|
||||||
|
func (tracker *nameTracker) listKnownNames() []string {
|
||||||
|
tracker.lck.RLock()
|
||||||
|
defer tracker.lck.RUnlock()
|
||||||
|
out := make([]string, 0, len(tracker.names)+1)
|
||||||
|
out = append(out, tracker.unique)
|
||||||
|
for k := range tracker.names {
|
||||||
|
out = append(out, k)
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
type callTracker struct {
|
||||||
|
calls map[uint32]*Call
|
||||||
|
lck sync.RWMutex
|
||||||
|
}
|
||||||
|
|
||||||
|
func newCallTracker() *callTracker {
|
||||||
|
return &callTracker{calls: map[uint32]*Call{}}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (tracker *callTracker) track(sn uint32, call *Call) {
|
||||||
|
tracker.lck.Lock()
|
||||||
|
tracker.calls[sn] = call
|
||||||
|
tracker.lck.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (tracker *callTracker) handleReply(msg *Message) uint32 {
|
||||||
|
serial := msg.Headers[FieldReplySerial].value.(uint32)
|
||||||
|
tracker.lck.RLock()
|
||||||
|
_, ok := tracker.calls[serial]
|
||||||
|
tracker.lck.RUnlock()
|
||||||
|
if ok {
|
||||||
|
tracker.finalizeWithBody(serial, msg.Body)
|
||||||
|
}
|
||||||
|
return serial
|
||||||
|
}
|
||||||
|
|
||||||
|
func (tracker *callTracker) handleDBusError(msg *Message) uint32 {
|
||||||
|
serial := msg.Headers[FieldReplySerial].value.(uint32)
|
||||||
|
tracker.lck.RLock()
|
||||||
|
_, ok := tracker.calls[serial]
|
||||||
|
tracker.lck.RUnlock()
|
||||||
|
if ok {
|
||||||
|
name, _ := msg.Headers[FieldErrorName].value.(string)
|
||||||
|
tracker.finalizeWithError(serial, Error{name, msg.Body})
|
||||||
|
}
|
||||||
|
return serial
|
||||||
|
}
|
||||||
|
|
||||||
|
func (tracker *callTracker) handleSendError(msg *Message, err error) {
|
||||||
|
if err == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
tracker.lck.RLock()
|
||||||
|
_, ok := tracker.calls[msg.serial]
|
||||||
|
tracker.lck.RUnlock()
|
||||||
|
if ok {
|
||||||
|
tracker.finalizeWithError(msg.serial, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// finalize was the only func that did not strobe Done
|
||||||
|
func (tracker *callTracker) finalize(sn uint32) {
|
||||||
|
tracker.lck.Lock()
|
||||||
|
defer tracker.lck.Unlock()
|
||||||
|
c, ok := tracker.calls[sn]
|
||||||
|
if ok {
|
||||||
|
delete(tracker.calls, sn)
|
||||||
|
c.ContextCancel()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (tracker *callTracker) finalizeWithBody(sn uint32, body []interface{}) {
|
||||||
|
tracker.lck.Lock()
|
||||||
|
c, ok := tracker.calls[sn]
|
||||||
|
if ok {
|
||||||
|
delete(tracker.calls, sn)
|
||||||
|
}
|
||||||
|
tracker.lck.Unlock()
|
||||||
|
if ok {
|
||||||
|
c.Body = body
|
||||||
|
c.done()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (tracker *callTracker) finalizeWithError(sn uint32, err error) {
|
||||||
|
tracker.lck.Lock()
|
||||||
|
c, ok := tracker.calls[sn]
|
||||||
|
if ok {
|
||||||
|
delete(tracker.calls, sn)
|
||||||
|
}
|
||||||
|
tracker.lck.Unlock()
|
||||||
|
if ok {
|
||||||
|
c.Err = err
|
||||||
|
c.done()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (tracker *callTracker) finalizeAllWithError(err error) {
|
||||||
|
tracker.lck.Lock()
|
||||||
|
closedCalls := make([]*Call, 0, len(tracker.calls))
|
||||||
|
for sn := range tracker.calls {
|
||||||
|
closedCalls = append(closedCalls, tracker.calls[sn])
|
||||||
|
}
|
||||||
|
tracker.calls = map[uint32]*Call{}
|
||||||
|
tracker.lck.Unlock()
|
||||||
|
for _, call := range closedCalls {
|
||||||
|
call.Err = err
|
||||||
|
call.done()
|
||||||
|
}
|
||||||
|
}
|
37
libnetwork/vendor/github.com/godbus/dbus/v5/conn_darwin.go
generated
vendored
Normal file
37
libnetwork/vendor/github.com/godbus/dbus/v5/conn_darwin.go
generated
vendored
Normal file
|
@ -0,0 +1,37 @@
|
||||||
|
package dbus
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"os/exec"
|
||||||
|
)
|
||||||
|
|
||||||
|
const defaultSystemBusAddress = "unix:path=/opt/local/var/run/dbus/system_bus_socket"
|
||||||
|
|
||||||
|
func getSessionBusPlatformAddress() (string, error) {
|
||||||
|
cmd := exec.Command("launchctl", "getenv", "DBUS_LAUNCHD_SESSION_BUS_SOCKET")
|
||||||
|
b, err := cmd.CombinedOutput()
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(b) == 0 {
|
||||||
|
return "", errors.New("dbus: couldn't determine address of session bus")
|
||||||
|
}
|
||||||
|
|
||||||
|
return "unix:path=" + string(b[:len(b)-1]), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func getSystemBusPlatformAddress() string {
|
||||||
|
address := os.Getenv("DBUS_LAUNCHD_SESSION_BUS_SOCKET")
|
||||||
|
if address != "" {
|
||||||
|
return fmt.Sprintf("unix:path=%s", address)
|
||||||
|
}
|
||||||
|
return defaultSystemBusAddress
|
||||||
|
}
|
||||||
|
|
||||||
|
func tryDiscoverDbusSessionBusAddress() string {
|
||||||
|
return ""
|
||||||
|
}
|
93
libnetwork/vendor/github.com/godbus/dbus/v5/conn_other.go
generated
vendored
Normal file
93
libnetwork/vendor/github.com/godbus/dbus/v5/conn_other.go
generated
vendored
Normal file
|
@ -0,0 +1,93 @@
|
||||||
|
// +build !darwin
|
||||||
|
|
||||||
|
package dbus
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"io/ioutil"
|
||||||
|
"os"
|
||||||
|
"os/exec"
|
||||||
|
"os/user"
|
||||||
|
"path"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
var execCommand = exec.Command
|
||||||
|
|
||||||
|
func getSessionBusPlatformAddress() (string, error) {
|
||||||
|
cmd := execCommand("dbus-launch")
|
||||||
|
b, err := cmd.CombinedOutput()
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
i := bytes.IndexByte(b, '=')
|
||||||
|
j := bytes.IndexByte(b, '\n')
|
||||||
|
|
||||||
|
if i == -1 || j == -1 || i > j {
|
||||||
|
return "", errors.New("dbus: couldn't determine address of session bus")
|
||||||
|
}
|
||||||
|
|
||||||
|
env, addr := string(b[0:i]), string(b[i+1:j])
|
||||||
|
os.Setenv(env, addr)
|
||||||
|
|
||||||
|
return addr, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// tryDiscoverDbusSessionBusAddress tries to discover an existing dbus session
|
||||||
|
// and return the value of its DBUS_SESSION_BUS_ADDRESS.
|
||||||
|
// It tries different techniques employed by different operating systems,
|
||||||
|
// returning the first valid address it finds, or an empty string.
|
||||||
|
//
|
||||||
|
// * /run/user/<uid>/bus if this exists, it *is* the bus socket. present on
|
||||||
|
// Ubuntu 18.04
|
||||||
|
// * /run/user/<uid>/dbus-session: if this exists, it can be parsed for the bus
|
||||||
|
// address. present on Ubuntu 16.04
|
||||||
|
//
|
||||||
|
// See https://dbus.freedesktop.org/doc/dbus-launch.1.html
|
||||||
|
func tryDiscoverDbusSessionBusAddress() string {
|
||||||
|
if runtimeDirectory, err := getRuntimeDirectory(); err == nil {
|
||||||
|
|
||||||
|
if runUserBusFile := path.Join(runtimeDirectory, "bus"); fileExists(runUserBusFile) {
|
||||||
|
// if /run/user/<uid>/bus exists, that file itself
|
||||||
|
// *is* the unix socket, so return its path
|
||||||
|
return fmt.Sprintf("unix:path=%s", runUserBusFile)
|
||||||
|
}
|
||||||
|
if runUserSessionDbusFile := path.Join(runtimeDirectory, "dbus-session"); fileExists(runUserSessionDbusFile) {
|
||||||
|
// if /run/user/<uid>/dbus-session exists, it's a
|
||||||
|
// text file // containing the address of the socket, e.g.:
|
||||||
|
// DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-E1c73yNqrG
|
||||||
|
|
||||||
|
if f, err := ioutil.ReadFile(runUserSessionDbusFile); err == nil {
|
||||||
|
fileContent := string(f)
|
||||||
|
|
||||||
|
prefix := "DBUS_SESSION_BUS_ADDRESS="
|
||||||
|
|
||||||
|
if strings.HasPrefix(fileContent, prefix) {
|
||||||
|
address := strings.TrimRight(strings.TrimPrefix(fileContent, prefix), "\n\r")
|
||||||
|
return address
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
func getRuntimeDirectory() (string, error) {
|
||||||
|
if currentUser, err := user.Current(); err != nil {
|
||||||
|
return "", err
|
||||||
|
} else {
|
||||||
|
return fmt.Sprintf("/run/user/%s", currentUser.Uid), nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func fileExists(filename string) bool {
|
||||||
|
if _, err := os.Stat(filename); !os.IsNotExist(err) {
|
||||||
|
return true
|
||||||
|
} else {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
17
libnetwork/vendor/github.com/godbus/dbus/v5/conn_unix.go
generated
vendored
Normal file
17
libnetwork/vendor/github.com/godbus/dbus/v5/conn_unix.go
generated
vendored
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
//+build !windows,!solaris,!darwin
|
||||||
|
|
||||||
|
package dbus
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
)
|
||||||
|
|
||||||
|
const defaultSystemBusAddress = "unix:path=/var/run/dbus/system_bus_socket"
|
||||||
|
|
||||||
|
func getSystemBusPlatformAddress() string {
|
||||||
|
address := os.Getenv("DBUS_SYSTEM_BUS_ADDRESS")
|
||||||
|
if address != "" {
|
||||||
|
return address
|
||||||
|
}
|
||||||
|
return defaultSystemBusAddress
|
||||||
|
}
|
15
libnetwork/vendor/github.com/godbus/dbus/v5/conn_windows.go
generated
vendored
Normal file
15
libnetwork/vendor/github.com/godbus/dbus/v5/conn_windows.go
generated
vendored
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
//+build windows
|
||||||
|
|
||||||
|
package dbus
|
||||||
|
|
||||||
|
import "os"
|
||||||
|
|
||||||
|
const defaultSystemBusAddress = "tcp:host=127.0.0.1,port=12434"
|
||||||
|
|
||||||
|
func getSystemBusPlatformAddress() string {
|
||||||
|
address := os.Getenv("DBUS_SYSTEM_BUS_ADDRESS")
|
||||||
|
if address != "" {
|
||||||
|
return address
|
||||||
|
}
|
||||||
|
return defaultSystemBusAddress
|
||||||
|
}
|
428
libnetwork/vendor/github.com/godbus/dbus/v5/dbus.go
generated
vendored
Normal file
428
libnetwork/vendor/github.com/godbus/dbus/v5/dbus.go
generated
vendored
Normal file
|
@ -0,0 +1,428 @@
|
||||||
|
package dbus
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"reflect"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
byteType = reflect.TypeOf(byte(0))
|
||||||
|
boolType = reflect.TypeOf(false)
|
||||||
|
uint8Type = reflect.TypeOf(uint8(0))
|
||||||
|
int16Type = reflect.TypeOf(int16(0))
|
||||||
|
uint16Type = reflect.TypeOf(uint16(0))
|
||||||
|
intType = reflect.TypeOf(int(0))
|
||||||
|
uintType = reflect.TypeOf(uint(0))
|
||||||
|
int32Type = reflect.TypeOf(int32(0))
|
||||||
|
uint32Type = reflect.TypeOf(uint32(0))
|
||||||
|
int64Type = reflect.TypeOf(int64(0))
|
||||||
|
uint64Type = reflect.TypeOf(uint64(0))
|
||||||
|
float64Type = reflect.TypeOf(float64(0))
|
||||||
|
stringType = reflect.TypeOf("")
|
||||||
|
signatureType = reflect.TypeOf(Signature{""})
|
||||||
|
objectPathType = reflect.TypeOf(ObjectPath(""))
|
||||||
|
variantType = reflect.TypeOf(Variant{Signature{""}, nil})
|
||||||
|
interfacesType = reflect.TypeOf([]interface{}{})
|
||||||
|
interfaceType = reflect.TypeOf((*interface{})(nil)).Elem()
|
||||||
|
unixFDType = reflect.TypeOf(UnixFD(0))
|
||||||
|
unixFDIndexType = reflect.TypeOf(UnixFDIndex(0))
|
||||||
|
)
|
||||||
|
|
||||||
|
// An InvalidTypeError signals that a value which cannot be represented in the
|
||||||
|
// D-Bus wire format was passed to a function.
|
||||||
|
type InvalidTypeError struct {
|
||||||
|
Type reflect.Type
|
||||||
|
}
|
||||||
|
|
||||||
|
func (e InvalidTypeError) Error() string {
|
||||||
|
return "dbus: invalid type " + e.Type.String()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Store copies the values contained in src to dest, which must be a slice of
|
||||||
|
// pointers. It converts slices of interfaces from src to corresponding structs
|
||||||
|
// in dest. An error is returned if the lengths of src and dest or the types of
|
||||||
|
// their elements don't match.
|
||||||
|
func Store(src []interface{}, dest ...interface{}) error {
|
||||||
|
if len(src) != len(dest) {
|
||||||
|
return errors.New("dbus.Store: length mismatch")
|
||||||
|
}
|
||||||
|
|
||||||
|
for i := range src {
|
||||||
|
if err := storeInterfaces(src[i], dest[i]); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func storeInterfaces(src, dest interface{}) error {
|
||||||
|
return store(reflect.ValueOf(dest), reflect.ValueOf(src))
|
||||||
|
}
|
||||||
|
|
||||||
|
func store(dest, src reflect.Value) error {
|
||||||
|
if dest.Kind() == reflect.Ptr {
|
||||||
|
return store(dest.Elem(), src)
|
||||||
|
}
|
||||||
|
switch src.Kind() {
|
||||||
|
case reflect.Slice:
|
||||||
|
return storeSlice(dest, src)
|
||||||
|
case reflect.Map:
|
||||||
|
return storeMap(dest, src)
|
||||||
|
default:
|
||||||
|
return storeBase(dest, src)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func storeBase(dest, src reflect.Value) error {
|
||||||
|
return setDest(dest, src)
|
||||||
|
}
|
||||||
|
|
||||||
|
func setDest(dest, src reflect.Value) error {
|
||||||
|
if !isVariant(src.Type()) && isVariant(dest.Type()) {
|
||||||
|
//special conversion for dbus.Variant
|
||||||
|
dest.Set(reflect.ValueOf(MakeVariant(src.Interface())))
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if isVariant(src.Type()) && !isVariant(dest.Type()) {
|
||||||
|
src = getVariantValue(src)
|
||||||
|
return store(dest, src)
|
||||||
|
}
|
||||||
|
if !src.Type().ConvertibleTo(dest.Type()) {
|
||||||
|
return fmt.Errorf(
|
||||||
|
"dbus.Store: type mismatch: cannot convert %s to %s",
|
||||||
|
src.Type(), dest.Type())
|
||||||
|
}
|
||||||
|
dest.Set(src.Convert(dest.Type()))
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func kindsAreCompatible(dest, src reflect.Type) bool {
|
||||||
|
switch {
|
||||||
|
case isVariant(dest):
|
||||||
|
return true
|
||||||
|
case dest.Kind() == reflect.Interface:
|
||||||
|
return true
|
||||||
|
default:
|
||||||
|
return dest.Kind() == src.Kind()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func isConvertibleTo(dest, src reflect.Type) bool {
|
||||||
|
switch {
|
||||||
|
case isVariant(dest):
|
||||||
|
return true
|
||||||
|
case dest.Kind() == reflect.Interface:
|
||||||
|
return true
|
||||||
|
case dest.Kind() == reflect.Slice:
|
||||||
|
return src.Kind() == reflect.Slice &&
|
||||||
|
isConvertibleTo(dest.Elem(), src.Elem())
|
||||||
|
case dest.Kind() == reflect.Struct:
|
||||||
|
return src == interfacesType
|
||||||
|
default:
|
||||||
|
return src.ConvertibleTo(dest)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func storeMap(dest, src reflect.Value) error {
|
||||||
|
switch {
|
||||||
|
case !kindsAreCompatible(dest.Type(), src.Type()):
|
||||||
|
return fmt.Errorf(
|
||||||
|
"dbus.Store: type mismatch: "+
|
||||||
|
"map: cannot store a value of %s into %s",
|
||||||
|
src.Type(), dest.Type())
|
||||||
|
case isVariant(dest.Type()):
|
||||||
|
return storeMapIntoVariant(dest, src)
|
||||||
|
case dest.Kind() == reflect.Interface:
|
||||||
|
return storeMapIntoInterface(dest, src)
|
||||||
|
case isConvertibleTo(dest.Type().Key(), src.Type().Key()) &&
|
||||||
|
isConvertibleTo(dest.Type().Elem(), src.Type().Elem()):
|
||||||
|
return storeMapIntoMap(dest, src)
|
||||||
|
default:
|
||||||
|
return fmt.Errorf(
|
||||||
|
"dbus.Store: type mismatch: "+
|
||||||
|
"map: cannot convert a value of %s into %s",
|
||||||
|
src.Type(), dest.Type())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func storeMapIntoVariant(dest, src reflect.Value) error {
|
||||||
|
dv := reflect.MakeMap(src.Type())
|
||||||
|
err := store(dv, src)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return storeBase(dest, dv)
|
||||||
|
}
|
||||||
|
|
||||||
|
func storeMapIntoInterface(dest, src reflect.Value) error {
|
||||||
|
var dv reflect.Value
|
||||||
|
if isVariant(src.Type().Elem()) {
|
||||||
|
//Convert variants to interface{} recursively when converting
|
||||||
|
//to interface{}
|
||||||
|
dv = reflect.MakeMap(
|
||||||
|
reflect.MapOf(src.Type().Key(), interfaceType))
|
||||||
|
} else {
|
||||||
|
dv = reflect.MakeMap(src.Type())
|
||||||
|
}
|
||||||
|
err := store(dv, src)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return storeBase(dest, dv)
|
||||||
|
}
|
||||||
|
|
||||||
|
func storeMapIntoMap(dest, src reflect.Value) error {
|
||||||
|
if dest.IsNil() {
|
||||||
|
dest.Set(reflect.MakeMap(dest.Type()))
|
||||||
|
}
|
||||||
|
keys := src.MapKeys()
|
||||||
|
for _, key := range keys {
|
||||||
|
dkey := key.Convert(dest.Type().Key())
|
||||||
|
dval := reflect.New(dest.Type().Elem()).Elem()
|
||||||
|
err := store(dval, getVariantValue(src.MapIndex(key)))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
dest.SetMapIndex(dkey, dval)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func storeSlice(dest, src reflect.Value) error {
|
||||||
|
switch {
|
||||||
|
case src.Type() == interfacesType && dest.Kind() == reflect.Struct:
|
||||||
|
//The decoder always decodes structs as slices of interface{}
|
||||||
|
return storeStruct(dest, src)
|
||||||
|
case !kindsAreCompatible(dest.Type(), src.Type()):
|
||||||
|
return fmt.Errorf(
|
||||||
|
"dbus.Store: type mismatch: "+
|
||||||
|
"slice: cannot store a value of %s into %s",
|
||||||
|
src.Type(), dest.Type())
|
||||||
|
case isVariant(dest.Type()):
|
||||||
|
return storeSliceIntoVariant(dest, src)
|
||||||
|
case dest.Kind() == reflect.Interface:
|
||||||
|
return storeSliceIntoInterface(dest, src)
|
||||||
|
case isConvertibleTo(dest.Type().Elem(), src.Type().Elem()):
|
||||||
|
return storeSliceIntoSlice(dest, src)
|
||||||
|
default:
|
||||||
|
return fmt.Errorf(
|
||||||
|
"dbus.Store: type mismatch: "+
|
||||||
|
"slice: cannot convert a value of %s into %s",
|
||||||
|
src.Type(), dest.Type())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func storeStruct(dest, src reflect.Value) error {
|
||||||
|
if isVariant(dest.Type()) {
|
||||||
|
return storeBase(dest, src)
|
||||||
|
}
|
||||||
|
dval := make([]interface{}, 0, dest.NumField())
|
||||||
|
dtype := dest.Type()
|
||||||
|
for i := 0; i < dest.NumField(); i++ {
|
||||||
|
field := dest.Field(i)
|
||||||
|
ftype := dtype.Field(i)
|
||||||
|
if ftype.PkgPath != "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if ftype.Tag.Get("dbus") == "-" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
dval = append(dval, field.Addr().Interface())
|
||||||
|
}
|
||||||
|
if src.Len() != len(dval) {
|
||||||
|
return fmt.Errorf(
|
||||||
|
"dbus.Store: type mismatch: "+
|
||||||
|
"destination struct does not have "+
|
||||||
|
"enough fields need: %d have: %d",
|
||||||
|
src.Len(), len(dval))
|
||||||
|
}
|
||||||
|
return Store(src.Interface().([]interface{}), dval...)
|
||||||
|
}
|
||||||
|
|
||||||
|
func storeSliceIntoVariant(dest, src reflect.Value) error {
|
||||||
|
dv := reflect.MakeSlice(src.Type(), src.Len(), src.Cap())
|
||||||
|
err := store(dv, src)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return storeBase(dest, dv)
|
||||||
|
}
|
||||||
|
|
||||||
|
func storeSliceIntoInterface(dest, src reflect.Value) error {
|
||||||
|
var dv reflect.Value
|
||||||
|
if isVariant(src.Type().Elem()) {
|
||||||
|
//Convert variants to interface{} recursively when converting
|
||||||
|
//to interface{}
|
||||||
|
dv = reflect.MakeSlice(reflect.SliceOf(interfaceType),
|
||||||
|
src.Len(), src.Cap())
|
||||||
|
} else {
|
||||||
|
dv = reflect.MakeSlice(src.Type(), src.Len(), src.Cap())
|
||||||
|
}
|
||||||
|
err := store(dv, src)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return storeBase(dest, dv)
|
||||||
|
}
|
||||||
|
|
||||||
|
func storeSliceIntoSlice(dest, src reflect.Value) error {
|
||||||
|
if dest.IsNil() || dest.Len() < src.Len() {
|
||||||
|
dest.Set(reflect.MakeSlice(dest.Type(), src.Len(), src.Cap()))
|
||||||
|
}
|
||||||
|
if dest.Len() != src.Len() {
|
||||||
|
return fmt.Errorf(
|
||||||
|
"dbus.Store: type mismatch: "+
|
||||||
|
"slices are different lengths "+
|
||||||
|
"need: %d have: %d",
|
||||||
|
src.Len(), dest.Len())
|
||||||
|
}
|
||||||
|
for i := 0; i < src.Len(); i++ {
|
||||||
|
err := store(dest.Index(i), getVariantValue(src.Index(i)))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func getVariantValue(in reflect.Value) reflect.Value {
|
||||||
|
if isVariant(in.Type()) {
|
||||||
|
return reflect.ValueOf(in.Interface().(Variant).Value())
|
||||||
|
}
|
||||||
|
return in
|
||||||
|
}
|
||||||
|
|
||||||
|
func isVariant(t reflect.Type) bool {
|
||||||
|
return t == variantType
|
||||||
|
}
|
||||||
|
|
||||||
|
// An ObjectPath is an object path as defined by the D-Bus spec.
|
||||||
|
type ObjectPath string
|
||||||
|
|
||||||
|
// IsValid returns whether the object path is valid.
|
||||||
|
func (o ObjectPath) IsValid() bool {
|
||||||
|
s := string(o)
|
||||||
|
if len(s) == 0 {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if s[0] != '/' {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if s[len(s)-1] == '/' && len(s) != 1 {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
// probably not used, but technically possible
|
||||||
|
if s == "/" {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
split := strings.Split(s[1:], "/")
|
||||||
|
for _, v := range split {
|
||||||
|
if len(v) == 0 {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
for _, c := range v {
|
||||||
|
if !isMemberChar(c) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
// A UnixFD is a Unix file descriptor sent over the wire. See the package-level
|
||||||
|
// documentation for more information about Unix file descriptor passsing.
|
||||||
|
type UnixFD int32
|
||||||
|
|
||||||
|
// A UnixFDIndex is the representation of a Unix file descriptor in a message.
|
||||||
|
type UnixFDIndex uint32
|
||||||
|
|
||||||
|
// alignment returns the alignment of values of type t.
|
||||||
|
func alignment(t reflect.Type) int {
|
||||||
|
switch t {
|
||||||
|
case variantType:
|
||||||
|
return 1
|
||||||
|
case objectPathType:
|
||||||
|
return 4
|
||||||
|
case signatureType:
|
||||||
|
return 1
|
||||||
|
case interfacesType:
|
||||||
|
return 4
|
||||||
|
}
|
||||||
|
switch t.Kind() {
|
||||||
|
case reflect.Uint8:
|
||||||
|
return 1
|
||||||
|
case reflect.Uint16, reflect.Int16:
|
||||||
|
return 2
|
||||||
|
case reflect.Uint, reflect.Int, reflect.Uint32, reflect.Int32, reflect.String, reflect.Array, reflect.Slice, reflect.Map:
|
||||||
|
return 4
|
||||||
|
case reflect.Uint64, reflect.Int64, reflect.Float64, reflect.Struct:
|
||||||
|
return 8
|
||||||
|
case reflect.Ptr:
|
||||||
|
return alignment(t.Elem())
|
||||||
|
}
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
// isKeyType returns whether t is a valid type for a D-Bus dict.
|
||||||
|
func isKeyType(t reflect.Type) bool {
|
||||||
|
switch t.Kind() {
|
||||||
|
case reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64,
|
||||||
|
reflect.Int16, reflect.Int32, reflect.Int64, reflect.Float64,
|
||||||
|
reflect.String, reflect.Uint, reflect.Int:
|
||||||
|
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// isValidInterface returns whether s is a valid name for an interface.
|
||||||
|
func isValidInterface(s string) bool {
|
||||||
|
if len(s) == 0 || len(s) > 255 || s[0] == '.' {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
elem := strings.Split(s, ".")
|
||||||
|
if len(elem) < 2 {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
for _, v := range elem {
|
||||||
|
if len(v) == 0 {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if v[0] >= '0' && v[0] <= '9' {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
for _, c := range v {
|
||||||
|
if !isMemberChar(c) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
// isValidMember returns whether s is a valid name for a member.
|
||||||
|
func isValidMember(s string) bool {
|
||||||
|
if len(s) == 0 || len(s) > 255 {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
i := strings.Index(s, ".")
|
||||||
|
if i != -1 {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if s[0] >= '0' && s[0] <= '9' {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
for _, c := range s {
|
||||||
|
if !isMemberChar(c) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
func isMemberChar(c rune) bool {
|
||||||
|
return (c >= '0' && c <= '9') || (c >= 'A' && c <= 'Z') ||
|
||||||
|
(c >= 'a' && c <= 'z') || c == '_'
|
||||||
|
}
|
|
@ -188,10 +188,23 @@ func (dec *decoder) decode(s string, depth int) interface{} {
|
||||||
if depth >= 64 {
|
if depth >= 64 {
|
||||||
panic(FormatError("input exceeds container depth limit"))
|
panic(FormatError("input exceeds container depth limit"))
|
||||||
}
|
}
|
||||||
|
sig := s[1:]
|
||||||
length := dec.decode("u", depth).(uint32)
|
length := dec.decode("u", depth).(uint32)
|
||||||
v := reflect.MakeSlice(reflect.SliceOf(typeFor(s[1:])), 0, int(length))
|
// capacity can be determined only for fixed-size element types
|
||||||
|
var capacity int
|
||||||
|
if s := sigByteSize(sig); s != 0 {
|
||||||
|
capacity = int(length) / s
|
||||||
|
}
|
||||||
|
v := reflect.MakeSlice(reflect.SliceOf(typeFor(sig)), 0, capacity)
|
||||||
// Even for empty arrays, the correct padding must be included
|
// Even for empty arrays, the correct padding must be included
|
||||||
dec.align(alignment(typeFor(s[1:])))
|
align := alignment(typeFor(s[1:]))
|
||||||
|
if len(s) > 1 && s[1] == '(' {
|
||||||
|
//Special case for arrays of structs
|
||||||
|
//structs decode as a slice of interface{} values
|
||||||
|
//but the dbus alignment does not match this
|
||||||
|
align = 8
|
||||||
|
}
|
||||||
|
dec.align(align)
|
||||||
spos := dec.pos
|
spos := dec.pos
|
||||||
for dec.pos < spos+int(length) {
|
for dec.pos < spos+int(length) {
|
||||||
ev := dec.decode(s[1:], depth+1)
|
ev := dec.decode(s[1:], depth+1)
|
||||||
|
@ -220,6 +233,51 @@ func (dec *decoder) decode(s string, depth int) interface{} {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// sigByteSize tries to calculates size of the given signature in bytes.
|
||||||
|
//
|
||||||
|
// It returns zero when it can't, for example when it contains non-fixed size
|
||||||
|
// types such as strings, maps and arrays that require reading of the transmitted
|
||||||
|
// data, for that we would need to implement the unread method for Decoder first.
|
||||||
|
func sigByteSize(sig string) int {
|
||||||
|
var total int
|
||||||
|
for offset := 0; offset < len(sig); {
|
||||||
|
switch sig[offset] {
|
||||||
|
case 'y':
|
||||||
|
total += 1
|
||||||
|
offset += 1
|
||||||
|
case 'n', 'q':
|
||||||
|
total += 2
|
||||||
|
offset += 1
|
||||||
|
case 'b', 'i', 'u', 'h':
|
||||||
|
total += 4
|
||||||
|
offset += 1
|
||||||
|
case 'x', 't', 'd':
|
||||||
|
total += 8
|
||||||
|
offset += 1
|
||||||
|
case '(':
|
||||||
|
i := 1
|
||||||
|
depth := 1
|
||||||
|
for i < len(sig[offset:]) && depth != 0 {
|
||||||
|
if sig[offset+i] == '(' {
|
||||||
|
depth++
|
||||||
|
} else if sig[offset+i] == ')' {
|
||||||
|
depth--
|
||||||
|
}
|
||||||
|
i++
|
||||||
|
}
|
||||||
|
s := sigByteSize(sig[offset+1 : offset+i-1])
|
||||||
|
if s == 0 {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
total += s
|
||||||
|
offset += i
|
||||||
|
default:
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return total
|
||||||
|
}
|
||||||
|
|
||||||
// A FormatError is an error in the wire format.
|
// A FormatError is an error in the wire format.
|
||||||
type FormatError string
|
type FormatError string
|
||||||
|
|
328
libnetwork/vendor/github.com/godbus/dbus/v5/default_handler.go
generated
vendored
Normal file
328
libnetwork/vendor/github.com/godbus/dbus/v5/default_handler.go
generated
vendored
Normal file
|
@ -0,0 +1,328 @@
|
||||||
|
package dbus
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"reflect"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
)
|
||||||
|
|
||||||
|
func newIntrospectIntf(h *defaultHandler) *exportedIntf {
|
||||||
|
methods := make(map[string]Method)
|
||||||
|
methods["Introspect"] = exportedMethod{
|
||||||
|
reflect.ValueOf(func(msg Message) (string, *Error) {
|
||||||
|
path := msg.Headers[FieldPath].value.(ObjectPath)
|
||||||
|
return h.introspectPath(path), nil
|
||||||
|
}),
|
||||||
|
}
|
||||||
|
return newExportedIntf(methods, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
//NewDefaultHandler returns an instance of the default
|
||||||
|
//call handler. This is useful if you want to implement only
|
||||||
|
//one of the two handlers but not both.
|
||||||
|
//
|
||||||
|
// Deprecated: this is the default value, don't use it, it will be unexported.
|
||||||
|
func NewDefaultHandler() *defaultHandler {
|
||||||
|
h := &defaultHandler{
|
||||||
|
objects: make(map[ObjectPath]*exportedObj),
|
||||||
|
defaultIntf: make(map[string]*exportedIntf),
|
||||||
|
}
|
||||||
|
h.defaultIntf["org.freedesktop.DBus.Introspectable"] = newIntrospectIntf(h)
|
||||||
|
return h
|
||||||
|
}
|
||||||
|
|
||||||
|
type defaultHandler struct {
|
||||||
|
sync.RWMutex
|
||||||
|
objects map[ObjectPath]*exportedObj
|
||||||
|
defaultIntf map[string]*exportedIntf
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *defaultHandler) PathExists(path ObjectPath) bool {
|
||||||
|
_, ok := h.objects[path]
|
||||||
|
return ok
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *defaultHandler) introspectPath(path ObjectPath) string {
|
||||||
|
subpath := make(map[string]struct{})
|
||||||
|
var xml bytes.Buffer
|
||||||
|
xml.WriteString("<node>")
|
||||||
|
for obj := range h.objects {
|
||||||
|
p := string(path)
|
||||||
|
if p != "/" {
|
||||||
|
p += "/"
|
||||||
|
}
|
||||||
|
if strings.HasPrefix(string(obj), p) {
|
||||||
|
node_name := strings.Split(string(obj[len(p):]), "/")[0]
|
||||||
|
subpath[node_name] = struct{}{}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for s := range subpath {
|
||||||
|
xml.WriteString("\n\t<node name=\"" + s + "\"/>")
|
||||||
|
}
|
||||||
|
xml.WriteString("\n</node>")
|
||||||
|
return xml.String()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *defaultHandler) LookupObject(path ObjectPath) (ServerObject, bool) {
|
||||||
|
h.RLock()
|
||||||
|
defer h.RUnlock()
|
||||||
|
object, ok := h.objects[path]
|
||||||
|
if ok {
|
||||||
|
return object, ok
|
||||||
|
}
|
||||||
|
|
||||||
|
// If an object wasn't found for this exact path,
|
||||||
|
// look for a matching subtree registration
|
||||||
|
subtreeObject := newExportedObject()
|
||||||
|
path = path[:strings.LastIndex(string(path), "/")]
|
||||||
|
for len(path) > 0 {
|
||||||
|
object, ok = h.objects[path]
|
||||||
|
if ok {
|
||||||
|
for name, iface := range object.interfaces {
|
||||||
|
// Only include this handler if it registered for the subtree
|
||||||
|
if iface.isFallbackInterface() {
|
||||||
|
subtreeObject.interfaces[name] = iface
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
|
path = path[:strings.LastIndex(string(path), "/")]
|
||||||
|
}
|
||||||
|
|
||||||
|
for name, intf := range h.defaultIntf {
|
||||||
|
if _, exists := subtreeObject.interfaces[name]; exists {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
subtreeObject.interfaces[name] = intf
|
||||||
|
}
|
||||||
|
|
||||||
|
return subtreeObject, true
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *defaultHandler) AddObject(path ObjectPath, object *exportedObj) {
|
||||||
|
h.Lock()
|
||||||
|
h.objects[path] = object
|
||||||
|
h.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *defaultHandler) DeleteObject(path ObjectPath) {
|
||||||
|
h.Lock()
|
||||||
|
delete(h.objects, path)
|
||||||
|
h.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
type exportedMethod struct {
|
||||||
|
reflect.Value
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m exportedMethod) Call(args ...interface{}) ([]interface{}, error) {
|
||||||
|
t := m.Type()
|
||||||
|
|
||||||
|
params := make([]reflect.Value, len(args))
|
||||||
|
for i := 0; i < len(args); i++ {
|
||||||
|
params[i] = reflect.ValueOf(args[i]).Elem()
|
||||||
|
}
|
||||||
|
|
||||||
|
ret := m.Value.Call(params)
|
||||||
|
|
||||||
|
err := ret[t.NumOut()-1].Interface().(*Error)
|
||||||
|
ret = ret[:t.NumOut()-1]
|
||||||
|
out := make([]interface{}, len(ret))
|
||||||
|
for i, val := range ret {
|
||||||
|
out[i] = val.Interface()
|
||||||
|
}
|
||||||
|
if err == nil {
|
||||||
|
//concrete type to interface nil is a special case
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
return out, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m exportedMethod) NumArguments() int {
|
||||||
|
return m.Value.Type().NumIn()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m exportedMethod) ArgumentValue(i int) interface{} {
|
||||||
|
return reflect.Zero(m.Type().In(i)).Interface()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m exportedMethod) NumReturns() int {
|
||||||
|
return m.Value.Type().NumOut()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m exportedMethod) ReturnValue(i int) interface{} {
|
||||||
|
return reflect.Zero(m.Type().Out(i)).Interface()
|
||||||
|
}
|
||||||
|
|
||||||
|
func newExportedObject() *exportedObj {
|
||||||
|
return &exportedObj{
|
||||||
|
interfaces: make(map[string]*exportedIntf),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type exportedObj struct {
|
||||||
|
mu sync.RWMutex
|
||||||
|
interfaces map[string]*exportedIntf
|
||||||
|
}
|
||||||
|
|
||||||
|
func (obj *exportedObj) LookupInterface(name string) (Interface, bool) {
|
||||||
|
if name == "" {
|
||||||
|
return obj, true
|
||||||
|
}
|
||||||
|
obj.mu.RLock()
|
||||||
|
defer obj.mu.RUnlock()
|
||||||
|
intf, exists := obj.interfaces[name]
|
||||||
|
return intf, exists
|
||||||
|
}
|
||||||
|
|
||||||
|
func (obj *exportedObj) AddInterface(name string, iface *exportedIntf) {
|
||||||
|
obj.mu.Lock()
|
||||||
|
defer obj.mu.Unlock()
|
||||||
|
obj.interfaces[name] = iface
|
||||||
|
}
|
||||||
|
|
||||||
|
func (obj *exportedObj) DeleteInterface(name string) {
|
||||||
|
obj.mu.Lock()
|
||||||
|
defer obj.mu.Unlock()
|
||||||
|
delete(obj.interfaces, name)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (obj *exportedObj) LookupMethod(name string) (Method, bool) {
|
||||||
|
obj.mu.RLock()
|
||||||
|
defer obj.mu.RUnlock()
|
||||||
|
for _, intf := range obj.interfaces {
|
||||||
|
method, exists := intf.LookupMethod(name)
|
||||||
|
if exists {
|
||||||
|
return method, exists
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil, false
|
||||||
|
}
|
||||||
|
|
||||||
|
func (obj *exportedObj) isFallbackInterface() bool {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
func newExportedIntf(methods map[string]Method, includeSubtree bool) *exportedIntf {
|
||||||
|
return &exportedIntf{
|
||||||
|
methods: methods,
|
||||||
|
includeSubtree: includeSubtree,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type exportedIntf struct {
|
||||||
|
methods map[string]Method
|
||||||
|
|
||||||
|
// Whether or not this export is for the entire subtree
|
||||||
|
includeSubtree bool
|
||||||
|
}
|
||||||
|
|
||||||
|
func (obj *exportedIntf) LookupMethod(name string) (Method, bool) {
|
||||||
|
out, exists := obj.methods[name]
|
||||||
|
return out, exists
|
||||||
|
}
|
||||||
|
|
||||||
|
func (obj *exportedIntf) isFallbackInterface() bool {
|
||||||
|
return obj.includeSubtree
|
||||||
|
}
|
||||||
|
|
||||||
|
//NewDefaultSignalHandler returns an instance of the default
|
||||||
|
//signal handler. This is useful if you want to implement only
|
||||||
|
//one of the two handlers but not both.
|
||||||
|
//
|
||||||
|
// Deprecated: this is the default value, don't use it, it will be unexported.
|
||||||
|
func NewDefaultSignalHandler() *defaultSignalHandler {
|
||||||
|
return &defaultSignalHandler{}
|
||||||
|
}
|
||||||
|
|
||||||
|
type defaultSignalHandler struct {
|
||||||
|
mu sync.RWMutex
|
||||||
|
closed bool
|
||||||
|
signals []*signalChannelData
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sh *defaultSignalHandler) DeliverSignal(intf, name string, signal *Signal) {
|
||||||
|
sh.mu.RLock()
|
||||||
|
defer sh.mu.RUnlock()
|
||||||
|
if sh.closed {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
for _, scd := range sh.signals {
|
||||||
|
scd.deliver(signal)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sh *defaultSignalHandler) Terminate() {
|
||||||
|
sh.mu.Lock()
|
||||||
|
defer sh.mu.Unlock()
|
||||||
|
if sh.closed {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, scd := range sh.signals {
|
||||||
|
scd.close()
|
||||||
|
close(scd.ch)
|
||||||
|
}
|
||||||
|
sh.closed = true
|
||||||
|
sh.signals = nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sh *defaultSignalHandler) AddSignal(ch chan<- *Signal) {
|
||||||
|
sh.mu.Lock()
|
||||||
|
defer sh.mu.Unlock()
|
||||||
|
if sh.closed {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
sh.signals = append(sh.signals, &signalChannelData{
|
||||||
|
ch: ch,
|
||||||
|
done: make(chan struct{}),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (sh *defaultSignalHandler) RemoveSignal(ch chan<- *Signal) {
|
||||||
|
sh.mu.Lock()
|
||||||
|
defer sh.mu.Unlock()
|
||||||
|
if sh.closed {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
for i := len(sh.signals) - 1; i >= 0; i-- {
|
||||||
|
if ch == sh.signals[i].ch {
|
||||||
|
sh.signals[i].close()
|
||||||
|
copy(sh.signals[i:], sh.signals[i+1:])
|
||||||
|
sh.signals[len(sh.signals)-1] = nil
|
||||||
|
sh.signals = sh.signals[:len(sh.signals)-1]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type signalChannelData struct {
|
||||||
|
wg sync.WaitGroup
|
||||||
|
ch chan<- *Signal
|
||||||
|
done chan struct{}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (scd *signalChannelData) deliver(signal *Signal) {
|
||||||
|
select {
|
||||||
|
case scd.ch <- signal:
|
||||||
|
case <-scd.done:
|
||||||
|
return
|
||||||
|
default:
|
||||||
|
scd.wg.Add(1)
|
||||||
|
go scd.deferredDeliver(signal)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (scd *signalChannelData) deferredDeliver(signal *Signal) {
|
||||||
|
select {
|
||||||
|
case scd.ch <- signal:
|
||||||
|
case <-scd.done:
|
||||||
|
}
|
||||||
|
scd.wg.Done()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (scd *signalChannelData) close() {
|
||||||
|
close(scd.done)
|
||||||
|
scd.wg.Wait() // wait until all spawned goroutines return
|
||||||
|
}
|
|
@ -19,6 +19,8 @@ respective D-Bus equivalents:
|
||||||
bool | BOOLEAN
|
bool | BOOLEAN
|
||||||
int16 | INT16
|
int16 | INT16
|
||||||
uint16 | UINT16
|
uint16 | UINT16
|
||||||
|
int | INT32
|
||||||
|
uint | UINT32
|
||||||
int32 | INT32
|
int32 | INT32
|
||||||
uint32 | UINT32
|
uint32 | UINT32
|
||||||
int64 | INT64
|
int64 | INT64
|
||||||
|
@ -28,6 +30,7 @@ respective D-Bus equivalents:
|
||||||
ObjectPath | OBJECT_PATH
|
ObjectPath | OBJECT_PATH
|
||||||
Signature | SIGNATURE
|
Signature | SIGNATURE
|
||||||
Variant | VARIANT
|
Variant | VARIANT
|
||||||
|
interface{} | VARIANT
|
||||||
UnixFDIndex | UNIX_FD
|
UnixFDIndex | UNIX_FD
|
||||||
|
|
||||||
Slices and arrays encode as ARRAYs of their element type.
|
Slices and arrays encode as ARRAYs of their element type.
|
||||||
|
@ -41,6 +44,9 @@ be skipped.
|
||||||
|
|
||||||
Pointers encode as the value they're pointed to.
|
Pointers encode as the value they're pointed to.
|
||||||
|
|
||||||
|
Types convertible to one of the base types above will be mapped as the
|
||||||
|
base type.
|
||||||
|
|
||||||
Trying to encode any other type or a slice, map or struct containing an
|
Trying to encode any other type or a slice, map or struct containing an
|
||||||
unsupported type will result in an InvalidTypeError.
|
unsupported type will result in an InvalidTypeError.
|
||||||
|
|
||||||
|
@ -55,7 +61,7 @@ Handling Unix file descriptors deserves special mention. To use them, you should
|
||||||
first check that they are supported on a connection by calling SupportsUnixFDs.
|
first check that they are supported on a connection by calling SupportsUnixFDs.
|
||||||
If it returns true, all method of Connection will translate messages containing
|
If it returns true, all method of Connection will translate messages containing
|
||||||
UnixFD's to messages that are accompanied by the given file descriptors with the
|
UnixFD's to messages that are accompanied by the given file descriptors with the
|
||||||
UnixFD values being substituted by the correct indices. Similarily, the indices
|
UnixFD values being substituted by the correct indices. Similarly, the indices
|
||||||
of incoming messages are automatically resolved. It shouldn't be necessary to use
|
of incoming messages are automatically resolved. It shouldn't be necessary to use
|
||||||
UnixFDIndex.
|
UnixFDIndex.
|
||||||
|
|
|
@ -60,7 +60,7 @@ func (enc *encoder) binwrite(v interface{}) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Encode encodes the given values to the underyling reader. All written values
|
// Encode encodes the given values to the underlying reader. All written values
|
||||||
// are aligned properly as required by the D-Bus spec.
|
// are aligned properly as required by the D-Bus spec.
|
||||||
func (enc *encoder) Encode(vs ...interface{}) (err error) {
|
func (enc *encoder) Encode(vs ...interface{}) (err error) {
|
||||||
defer func() {
|
defer func() {
|
||||||
|
@ -96,10 +96,10 @@ func (enc *encoder) encode(v reflect.Value, depth int) {
|
||||||
case reflect.Uint16:
|
case reflect.Uint16:
|
||||||
enc.binwrite(uint16(v.Uint()))
|
enc.binwrite(uint16(v.Uint()))
|
||||||
enc.pos += 2
|
enc.pos += 2
|
||||||
case reflect.Int32:
|
case reflect.Int, reflect.Int32:
|
||||||
enc.binwrite(int32(v.Int()))
|
enc.binwrite(int32(v.Int()))
|
||||||
enc.pos += 4
|
enc.pos += 4
|
||||||
case reflect.Uint32:
|
case reflect.Uint, reflect.Uint32:
|
||||||
enc.binwrite(uint32(v.Uint()))
|
enc.binwrite(uint32(v.Uint()))
|
||||||
enc.pos += 4
|
enc.pos += 4
|
||||||
case reflect.Int64:
|
case reflect.Int64:
|
||||||
|
@ -202,6 +202,8 @@ func (enc *encoder) encode(v reflect.Value, depth int) {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
enc.pos += length
|
enc.pos += length
|
||||||
|
case reflect.Interface:
|
||||||
|
enc.encode(reflect.ValueOf(MakeVariant(v.Interface())), depth)
|
||||||
default:
|
default:
|
||||||
panic(InvalidTypeError{v.Type()})
|
panic(InvalidTypeError{v.Type()})
|
||||||
}
|
}
|
|
@ -1,7 +1,6 @@
|
||||||
package dbus
|
package dbus
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"reflect"
|
"reflect"
|
||||||
|
@ -9,32 +8,29 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
errmsgInvalidArg = Error{
|
ErrMsgInvalidArg = Error{
|
||||||
"org.freedesktop.DBus.Error.InvalidArgs",
|
"org.freedesktop.DBus.Error.InvalidArgs",
|
||||||
[]interface{}{"Invalid type / number of args"},
|
[]interface{}{"Invalid type / number of args"},
|
||||||
}
|
}
|
||||||
errmsgNoObject = Error{
|
ErrMsgNoObject = Error{
|
||||||
"org.freedesktop.DBus.Error.NoSuchObject",
|
"org.freedesktop.DBus.Error.NoSuchObject",
|
||||||
[]interface{}{"No such object"},
|
[]interface{}{"No such object"},
|
||||||
}
|
}
|
||||||
errmsgUnknownMethod = Error{
|
ErrMsgUnknownMethod = Error{
|
||||||
"org.freedesktop.DBus.Error.UnknownMethod",
|
"org.freedesktop.DBus.Error.UnknownMethod",
|
||||||
[]interface{}{"Unknown / invalid method"},
|
[]interface{}{"Unknown / invalid method"},
|
||||||
}
|
}
|
||||||
|
ErrMsgUnknownInterface = Error{
|
||||||
|
"org.freedesktop.DBus.Error.UnknownInterface",
|
||||||
|
[]interface{}{"Object does not implement the interface"},
|
||||||
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
// exportedObj represents an exported object. It stores a precomputed
|
func MakeFailedError(err error) *Error {
|
||||||
// method table that represents the methods exported on the bus.
|
return &Error{
|
||||||
type exportedObj struct {
|
"org.freedesktop.DBus.Error.Failed",
|
||||||
methods map[string]reflect.Value
|
[]interface{}{err.Error()},
|
||||||
|
}
|
||||||
// Whether or not this export is for the entire subtree
|
|
||||||
includeSubtree bool
|
|
||||||
}
|
|
||||||
|
|
||||||
func (obj exportedObj) Method(name string) (reflect.Value, bool) {
|
|
||||||
out, exists := obj.methods[name]
|
|
||||||
return out, exists
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Sender is a type which can be used in exported methods to receive the message
|
// Sender is a type which can be used in exported methods to receive the message
|
||||||
|
@ -63,7 +59,7 @@ func getMethods(in interface{}, mapping map[string]string) map[string]reflect.Va
|
||||||
// only track valid methods must return *Error as last arg
|
// only track valid methods must return *Error as last arg
|
||||||
// and must be exported
|
// and must be exported
|
||||||
if t.NumOut() == 0 ||
|
if t.NumOut() == 0 ||
|
||||||
t.Out(t.NumOut()-1) != reflect.TypeOf(&errmsgInvalidArg) ||
|
t.Out(t.NumOut()-1) != reflect.TypeOf(&ErrMsgInvalidArg) ||
|
||||||
methtype.PkgPath != "" {
|
methtype.PkgPath != "" {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
@ -73,119 +69,12 @@ func getMethods(in interface{}, mapping map[string]string) map[string]reflect.Va
|
||||||
return methods
|
return methods
|
||||||
}
|
}
|
||||||
|
|
||||||
// searchHandlers will look through all registered handlers looking for one
|
func standardMethodArgumentDecode(m Method, sender string, msg *Message, body []interface{}) ([]interface{}, error) {
|
||||||
// to handle the given path. If a verbatim one isn't found, it will check for
|
pointers := make([]interface{}, m.NumArguments())
|
||||||
// a subtree registration for the path as well.
|
decode := make([]interface{}, 0, len(body))
|
||||||
func (conn *Conn) searchHandlers(path ObjectPath) (map[string]exportedObj, bool) {
|
|
||||||
conn.handlersLck.RLock()
|
|
||||||
defer conn.handlersLck.RUnlock()
|
|
||||||
|
|
||||||
handlers, ok := conn.handlers[path]
|
for i := 0; i < m.NumArguments(); i++ {
|
||||||
if ok {
|
tp := reflect.TypeOf(m.ArgumentValue(i))
|
||||||
return handlers, ok
|
|
||||||
}
|
|
||||||
|
|
||||||
// If handlers weren't found for this exact path, look for a matching subtree
|
|
||||||
// registration
|
|
||||||
handlers = make(map[string]exportedObj)
|
|
||||||
path = path[:strings.LastIndex(string(path), "/")]
|
|
||||||
for len(path) > 0 {
|
|
||||||
var subtreeHandlers map[string]exportedObj
|
|
||||||
subtreeHandlers, ok = conn.handlers[path]
|
|
||||||
if ok {
|
|
||||||
for iface, handler := range subtreeHandlers {
|
|
||||||
// Only include this handler if it registered for the subtree
|
|
||||||
if handler.includeSubtree {
|
|
||||||
handlers[iface] = handler
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
break
|
|
||||||
}
|
|
||||||
|
|
||||||
path = path[:strings.LastIndex(string(path), "/")]
|
|
||||||
}
|
|
||||||
|
|
||||||
return handlers, ok
|
|
||||||
}
|
|
||||||
|
|
||||||
// handleCall handles the given method call (i.e. looks if it's one of the
|
|
||||||
// pre-implemented ones and searches for a corresponding handler if not).
|
|
||||||
func (conn *Conn) handleCall(msg *Message) {
|
|
||||||
name := msg.Headers[FieldMember].value.(string)
|
|
||||||
path := msg.Headers[FieldPath].value.(ObjectPath)
|
|
||||||
ifaceName, hasIface := msg.Headers[FieldInterface].value.(string)
|
|
||||||
sender, hasSender := msg.Headers[FieldSender].value.(string)
|
|
||||||
serial := msg.serial
|
|
||||||
if ifaceName == "org.freedesktop.DBus.Peer" {
|
|
||||||
switch name {
|
|
||||||
case "Ping":
|
|
||||||
conn.sendReply(sender, serial)
|
|
||||||
case "GetMachineId":
|
|
||||||
conn.sendReply(sender, serial, conn.uuid)
|
|
||||||
default:
|
|
||||||
conn.sendError(errmsgUnknownMethod, sender, serial)
|
|
||||||
}
|
|
||||||
return
|
|
||||||
} else if ifaceName == "org.freedesktop.DBus.Introspectable" && name == "Introspect" {
|
|
||||||
if _, ok := conn.handlers[path]; !ok {
|
|
||||||
subpath := make(map[string]struct{})
|
|
||||||
var xml bytes.Buffer
|
|
||||||
xml.WriteString("<node>")
|
|
||||||
for h, _ := range conn.handlers {
|
|
||||||
p := string(path)
|
|
||||||
if p != "/" {
|
|
||||||
p += "/"
|
|
||||||
}
|
|
||||||
if strings.HasPrefix(string(h), p) {
|
|
||||||
node_name := strings.Split(string(h[len(p):]), "/")[0]
|
|
||||||
subpath[node_name] = struct{}{}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for s, _ := range subpath {
|
|
||||||
xml.WriteString("\n\t<node name=\"" + s + "\"/>")
|
|
||||||
}
|
|
||||||
xml.WriteString("\n</node>")
|
|
||||||
conn.sendReply(sender, serial, xml.String())
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if len(name) == 0 {
|
|
||||||
conn.sendError(errmsgUnknownMethod, sender, serial)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Find the exported handler (if any) for this path
|
|
||||||
handlers, ok := conn.searchHandlers(path)
|
|
||||||
if !ok {
|
|
||||||
conn.sendError(errmsgNoObject, sender, serial)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
var m reflect.Value
|
|
||||||
var exists bool
|
|
||||||
if hasIface {
|
|
||||||
iface := handlers[ifaceName]
|
|
||||||
m, exists = iface.Method(name)
|
|
||||||
} else {
|
|
||||||
for _, v := range handlers {
|
|
||||||
m, exists = v.Method(name)
|
|
||||||
if exists {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if !exists {
|
|
||||||
conn.sendError(errmsgUnknownMethod, sender, serial)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
t := m.Type()
|
|
||||||
vs := msg.Body
|
|
||||||
pointers := make([]interface{}, t.NumIn())
|
|
||||||
decode := make([]interface{}, 0, len(vs))
|
|
||||||
for i := 0; i < t.NumIn(); i++ {
|
|
||||||
tp := t.In(i)
|
|
||||||
val := reflect.New(tp)
|
val := reflect.New(tp)
|
||||||
pointers[i] = val.Interface()
|
pointers[i] = val.Interface()
|
||||||
if tp == reflect.TypeOf((*Sender)(nil)).Elem() {
|
if tp == reflect.TypeOf((*Sender)(nil)).Elem() {
|
||||||
|
@ -197,26 +86,73 @@ func (conn *Conn) handleCall(msg *Message) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(decode) != len(vs) {
|
if len(decode) != len(body) {
|
||||||
conn.sendError(errmsgInvalidArg, sender, serial)
|
return nil, ErrMsgInvalidArg
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := Store(body, decode...); err != nil {
|
||||||
|
return nil, ErrMsgInvalidArg
|
||||||
|
}
|
||||||
|
|
||||||
|
return pointers, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (conn *Conn) decodeArguments(m Method, sender string, msg *Message) ([]interface{}, error) {
|
||||||
|
if decoder, ok := m.(ArgumentDecoder); ok {
|
||||||
|
return decoder.DecodeArguments(conn, sender, msg, msg.Body)
|
||||||
|
}
|
||||||
|
return standardMethodArgumentDecode(m, sender, msg, msg.Body)
|
||||||
|
}
|
||||||
|
|
||||||
|
// handleCall handles the given method call (i.e. looks if it's one of the
|
||||||
|
// pre-implemented ones and searches for a corresponding handler if not).
|
||||||
|
func (conn *Conn) handleCall(msg *Message) {
|
||||||
|
name := msg.Headers[FieldMember].value.(string)
|
||||||
|
path := msg.Headers[FieldPath].value.(ObjectPath)
|
||||||
|
ifaceName, _ := msg.Headers[FieldInterface].value.(string)
|
||||||
|
sender, hasSender := msg.Headers[FieldSender].value.(string)
|
||||||
|
serial := msg.serial
|
||||||
|
if ifaceName == "org.freedesktop.DBus.Peer" {
|
||||||
|
switch name {
|
||||||
|
case "Ping":
|
||||||
|
conn.sendReply(sender, serial)
|
||||||
|
case "GetMachineId":
|
||||||
|
conn.sendReply(sender, serial, conn.uuid)
|
||||||
|
default:
|
||||||
|
conn.sendError(ErrMsgUnknownMethod, sender, serial)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if len(name) == 0 {
|
||||||
|
conn.sendError(ErrMsgUnknownMethod, sender, serial)
|
||||||
|
}
|
||||||
|
|
||||||
|
object, ok := conn.handler.LookupObject(path)
|
||||||
|
if !ok {
|
||||||
|
conn.sendError(ErrMsgNoObject, sender, serial)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := Store(vs, decode...); err != nil {
|
iface, exists := object.LookupInterface(ifaceName)
|
||||||
conn.sendError(errmsgInvalidArg, sender, serial)
|
if !exists {
|
||||||
|
conn.sendError(ErrMsgUnknownInterface, sender, serial)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Extract parameters
|
m, exists := iface.LookupMethod(name)
|
||||||
params := make([]reflect.Value, len(pointers))
|
if !exists {
|
||||||
for i := 0; i < len(pointers); i++ {
|
conn.sendError(ErrMsgUnknownMethod, sender, serial)
|
||||||
params[i] = reflect.ValueOf(pointers[i]).Elem()
|
return
|
||||||
|
}
|
||||||
|
args, err := conn.decodeArguments(m, sender, msg)
|
||||||
|
if err != nil {
|
||||||
|
conn.sendError(err, sender, serial)
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Call method
|
ret, err := m.Call(args...)
|
||||||
ret := m.Call(params)
|
if err != nil {
|
||||||
if em := ret[t.NumOut()-1].Interface().(*Error); em != nil {
|
conn.sendError(err, sender, serial)
|
||||||
conn.sendError(*em, sender, serial)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -229,18 +165,13 @@ func (conn *Conn) handleCall(msg *Message) {
|
||||||
reply.Headers[FieldDestination] = msg.Headers[FieldSender]
|
reply.Headers[FieldDestination] = msg.Headers[FieldSender]
|
||||||
}
|
}
|
||||||
reply.Headers[FieldReplySerial] = MakeVariant(msg.serial)
|
reply.Headers[FieldReplySerial] = MakeVariant(msg.serial)
|
||||||
reply.Body = make([]interface{}, len(ret)-1)
|
reply.Body = make([]interface{}, len(ret))
|
||||||
for i := 0; i < len(ret)-1; i++ {
|
for i := 0; i < len(ret); i++ {
|
||||||
reply.Body[i] = ret[i].Interface()
|
reply.Body[i] = ret[i]
|
||||||
}
|
}
|
||||||
if len(ret) != 1 {
|
reply.Headers[FieldSignature] = MakeVariant(SignatureOf(reply.Body...))
|
||||||
reply.Headers[FieldSignature] = MakeVariant(SignatureOf(reply.Body...))
|
|
||||||
}
|
conn.sendMessageAndIfClosed(reply, nil)
|
||||||
conn.outLck.RLock()
|
|
||||||
if !conn.closed {
|
|
||||||
conn.out <- reply
|
|
||||||
}
|
|
||||||
conn.outLck.RUnlock()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -273,12 +204,14 @@ func (conn *Conn) Emit(path ObjectPath, name string, values ...interface{}) erro
|
||||||
if len(values) > 0 {
|
if len(values) > 0 {
|
||||||
msg.Headers[FieldSignature] = MakeVariant(SignatureOf(values...))
|
msg.Headers[FieldSignature] = MakeVariant(SignatureOf(values...))
|
||||||
}
|
}
|
||||||
conn.outLck.RLock()
|
|
||||||
defer conn.outLck.RUnlock()
|
var closed bool
|
||||||
if conn.closed {
|
conn.sendMessageAndIfClosed(msg, func() {
|
||||||
|
closed = true
|
||||||
|
})
|
||||||
|
if closed {
|
||||||
return ErrClosed
|
return ErrClosed
|
||||||
}
|
}
|
||||||
conn.out <- msg
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -375,7 +308,7 @@ func (conn *Conn) exportMethodTable(methods map[string]interface{}, path ObjectP
|
||||||
t := rval.Type()
|
t := rval.Type()
|
||||||
// only track valid methods must return *Error as last arg
|
// only track valid methods must return *Error as last arg
|
||||||
if t.NumOut() == 0 ||
|
if t.NumOut() == 0 ||
|
||||||
t.Out(t.NumOut()-1) != reflect.TypeOf(&errmsgInvalidArg) {
|
t.Out(t.NumOut()-1) != reflect.TypeOf(&ErrMsgInvalidArg) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
out[name] = rval
|
out[name] = rval
|
||||||
|
@ -383,38 +316,49 @@ func (conn *Conn) exportMethodTable(methods map[string]interface{}, path ObjectP
|
||||||
return conn.export(out, path, iface, includeSubtree)
|
return conn.export(out, path, iface, includeSubtree)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (conn *Conn) unexport(h *defaultHandler, path ObjectPath, iface string) error {
|
||||||
|
if h.PathExists(path) {
|
||||||
|
obj := h.objects[path]
|
||||||
|
obj.DeleteInterface(iface)
|
||||||
|
if len(obj.interfaces) == 0 {
|
||||||
|
h.DeleteObject(path)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// exportWithMap is the worker function for all exports/registrations.
|
// exportWithMap is the worker function for all exports/registrations.
|
||||||
func (conn *Conn) export(methods map[string]reflect.Value, path ObjectPath, iface string, includeSubtree bool) error {
|
func (conn *Conn) export(methods map[string]reflect.Value, path ObjectPath, iface string, includeSubtree bool) error {
|
||||||
|
h, ok := conn.handler.(*defaultHandler)
|
||||||
|
if !ok {
|
||||||
|
return fmt.Errorf(
|
||||||
|
`dbus: export only allowed on the default hander handler have %T"`,
|
||||||
|
conn.handler)
|
||||||
|
}
|
||||||
|
|
||||||
if !path.IsValid() {
|
if !path.IsValid() {
|
||||||
return fmt.Errorf(`dbus: Invalid path name: "%s"`, path)
|
return fmt.Errorf(`dbus: Invalid path name: "%s"`, path)
|
||||||
}
|
}
|
||||||
|
|
||||||
conn.handlersLck.Lock()
|
|
||||||
defer conn.handlersLck.Unlock()
|
|
||||||
|
|
||||||
// Remove a previous export if the interface is nil
|
// Remove a previous export if the interface is nil
|
||||||
if methods == nil {
|
if methods == nil {
|
||||||
if _, ok := conn.handlers[path]; ok {
|
return conn.unexport(h, path, iface)
|
||||||
delete(conn.handlers[path], iface)
|
|
||||||
if len(conn.handlers[path]) == 0 {
|
|
||||||
delete(conn.handlers, path)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// If this is the first handler for this path, make a new map to hold all
|
// If this is the first handler for this path, make a new map to hold all
|
||||||
// handlers for this path.
|
// handlers for this path.
|
||||||
if _, ok := conn.handlers[path]; !ok {
|
if !h.PathExists(path) {
|
||||||
conn.handlers[path] = make(map[string]exportedObj)
|
h.AddObject(path, newExportedObject())
|
||||||
|
}
|
||||||
|
|
||||||
|
exportedMethods := make(map[string]Method)
|
||||||
|
for name, method := range methods {
|
||||||
|
exportedMethods[name] = exportedMethod{method}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Finally, save this handler
|
// Finally, save this handler
|
||||||
conn.handlers[path][iface] = exportedObj{
|
obj := h.objects[path]
|
||||||
methods: methods,
|
obj.AddInterface(iface, newExportedIntf(exportedMethods, includeSubtree))
|
||||||
includeSubtree: includeSubtree,
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
3
libnetwork/vendor/github.com/godbus/dbus/v5/go.mod
generated
vendored
Normal file
3
libnetwork/vendor/github.com/godbus/dbus/v5/go.mod
generated
vendored
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
module github.com/godbus/dbus/v5
|
||||||
|
|
||||||
|
go 1.12
|
62
libnetwork/vendor/github.com/godbus/dbus/v5/match.go
generated
vendored
Normal file
62
libnetwork/vendor/github.com/godbus/dbus/v5/match.go
generated
vendored
Normal file
|
@ -0,0 +1,62 @@
|
||||||
|
package dbus
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
// MatchOption specifies option for dbus routing match rule. Options can be constructed with WithMatch* helpers.
|
||||||
|
// For full list of available options consult
|
||||||
|
// https://dbus.freedesktop.org/doc/dbus-specification.html#message-bus-routing-match-rules
|
||||||
|
type MatchOption struct {
|
||||||
|
key string
|
||||||
|
value string
|
||||||
|
}
|
||||||
|
|
||||||
|
func formatMatchOptions(options []MatchOption) string {
|
||||||
|
items := make([]string, 0, len(options))
|
||||||
|
for _, option := range options {
|
||||||
|
items = append(items, option.key+"='"+option.value+"'")
|
||||||
|
}
|
||||||
|
return strings.Join(items, ",")
|
||||||
|
}
|
||||||
|
|
||||||
|
// WithMatchOption creates match option with given key and value
|
||||||
|
func WithMatchOption(key, value string) MatchOption {
|
||||||
|
return MatchOption{key, value}
|
||||||
|
}
|
||||||
|
|
||||||
|
// doesn't make sense to export this option because clients can only
|
||||||
|
// subscribe to messages with signal type.
|
||||||
|
func withMatchType(typ string) MatchOption {
|
||||||
|
return WithMatchOption("type", typ)
|
||||||
|
}
|
||||||
|
|
||||||
|
// WithMatchSender sets sender match option.
|
||||||
|
func WithMatchSender(sender string) MatchOption {
|
||||||
|
return WithMatchOption("sender", sender)
|
||||||
|
}
|
||||||
|
|
||||||
|
// WithMatchSender sets interface match option.
|
||||||
|
func WithMatchInterface(iface string) MatchOption {
|
||||||
|
return WithMatchOption("interface", iface)
|
||||||
|
}
|
||||||
|
|
||||||
|
// WithMatchMember sets member match option.
|
||||||
|
func WithMatchMember(member string) MatchOption {
|
||||||
|
return WithMatchOption("member", member)
|
||||||
|
}
|
||||||
|
|
||||||
|
// WithMatchObjectPath creates match option that filters events based on given path
|
||||||
|
func WithMatchObjectPath(path ObjectPath) MatchOption {
|
||||||
|
return WithMatchOption("path", string(path))
|
||||||
|
}
|
||||||
|
|
||||||
|
// WithMatchPathNamespace sets path_namespace match option.
|
||||||
|
func WithMatchPathNamespace(namespace ObjectPath) MatchOption {
|
||||||
|
return WithMatchOption("path_namespace", string(namespace))
|
||||||
|
}
|
||||||
|
|
||||||
|
// WithMatchDestination sets destination match option.
|
||||||
|
func WithMatchDestination(destination string) MatchOption {
|
||||||
|
return WithMatchOption("destination", destination)
|
||||||
|
}
|
211
libnetwork/vendor/github.com/godbus/dbus/v5/object.go
generated
vendored
Normal file
211
libnetwork/vendor/github.com/godbus/dbus/v5/object.go
generated
vendored
Normal file
|
@ -0,0 +1,211 @@
|
||||||
|
package dbus
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
// BusObject is the interface of a remote object on which methods can be
|
||||||
|
// invoked.
|
||||||
|
type BusObject interface {
|
||||||
|
Call(method string, flags Flags, args ...interface{}) *Call
|
||||||
|
CallWithContext(ctx context.Context, method string, flags Flags, args ...interface{}) *Call
|
||||||
|
Go(method string, flags Flags, ch chan *Call, args ...interface{}) *Call
|
||||||
|
GoWithContext(ctx context.Context, method string, flags Flags, ch chan *Call, args ...interface{}) *Call
|
||||||
|
AddMatchSignal(iface, member string, options ...MatchOption) *Call
|
||||||
|
RemoveMatchSignal(iface, member string, options ...MatchOption) *Call
|
||||||
|
GetProperty(p string) (Variant, error)
|
||||||
|
SetProperty(p string, v interface{}) error
|
||||||
|
Destination() string
|
||||||
|
Path() ObjectPath
|
||||||
|
}
|
||||||
|
|
||||||
|
// Object represents a remote object on which methods can be invoked.
|
||||||
|
type Object struct {
|
||||||
|
conn *Conn
|
||||||
|
dest string
|
||||||
|
path ObjectPath
|
||||||
|
}
|
||||||
|
|
||||||
|
// Call calls a method with (*Object).Go and waits for its reply.
|
||||||
|
func (o *Object) Call(method string, flags Flags, args ...interface{}) *Call {
|
||||||
|
return <-o.createCall(context.Background(), method, flags, make(chan *Call, 1), args...).Done
|
||||||
|
}
|
||||||
|
|
||||||
|
// CallWithContext acts like Call but takes a context
|
||||||
|
func (o *Object) CallWithContext(ctx context.Context, method string, flags Flags, args ...interface{}) *Call {
|
||||||
|
return <-o.createCall(ctx, method, flags, make(chan *Call, 1), args...).Done
|
||||||
|
}
|
||||||
|
|
||||||
|
// AddMatchSignal subscribes BusObject to signals from specified interface,
|
||||||
|
// method (member). Additional filter rules can be added via WithMatch* option constructors.
|
||||||
|
// Note: To filter events by object path you have to specify this path via an option.
|
||||||
|
//
|
||||||
|
// Deprecated: use (*Conn) AddMatchSignal instead.
|
||||||
|
func (o *Object) AddMatchSignal(iface, member string, options ...MatchOption) *Call {
|
||||||
|
base := []MatchOption{
|
||||||
|
withMatchType("signal"),
|
||||||
|
WithMatchInterface(iface),
|
||||||
|
WithMatchMember(member),
|
||||||
|
}
|
||||||
|
|
||||||
|
options = append(base, options...)
|
||||||
|
return o.conn.BusObject().Call(
|
||||||
|
"org.freedesktop.DBus.AddMatch",
|
||||||
|
0,
|
||||||
|
formatMatchOptions(options),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// RemoveMatchSignal unsubscribes BusObject from signals from specified interface,
|
||||||
|
// method (member). Additional filter rules can be added via WithMatch* option constructors
|
||||||
|
//
|
||||||
|
// Deprecated: use (*Conn) RemoveMatchSignal instead.
|
||||||
|
func (o *Object) RemoveMatchSignal(iface, member string, options ...MatchOption) *Call {
|
||||||
|
base := []MatchOption{
|
||||||
|
withMatchType("signal"),
|
||||||
|
WithMatchInterface(iface),
|
||||||
|
WithMatchMember(member),
|
||||||
|
}
|
||||||
|
|
||||||
|
options = append(base, options...)
|
||||||
|
return o.conn.BusObject().Call(
|
||||||
|
"org.freedesktop.DBus.RemoveMatch",
|
||||||
|
0,
|
||||||
|
formatMatchOptions(options),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Go calls a method with the given arguments asynchronously. It returns a
|
||||||
|
// Call structure representing this method call. The passed channel will
|
||||||
|
// return the same value once the call is done. If ch is nil, a new channel
|
||||||
|
// will be allocated. Otherwise, ch has to be buffered or Go will panic.
|
||||||
|
//
|
||||||
|
// If the flags include FlagNoReplyExpected, ch is ignored and a Call structure
|
||||||
|
// is returned with any error in Err and a closed channel in Done containing
|
||||||
|
// the returned Call as it's one entry.
|
||||||
|
//
|
||||||
|
// If the method parameter contains a dot ('.'), the part before the last dot
|
||||||
|
// specifies the interface on which the method is called.
|
||||||
|
func (o *Object) Go(method string, flags Flags, ch chan *Call, args ...interface{}) *Call {
|
||||||
|
return o.createCall(context.Background(), method, flags, ch, args...)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GoWithContext acts like Go but takes a context
|
||||||
|
func (o *Object) GoWithContext(ctx context.Context, method string, flags Flags, ch chan *Call, args ...interface{}) *Call {
|
||||||
|
return o.createCall(ctx, method, flags, ch, args...)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (o *Object) createCall(ctx context.Context, method string, flags Flags, ch chan *Call, args ...interface{}) *Call {
|
||||||
|
if ctx == nil {
|
||||||
|
panic("nil context")
|
||||||
|
}
|
||||||
|
iface := ""
|
||||||
|
i := strings.LastIndex(method, ".")
|
||||||
|
if i != -1 {
|
||||||
|
iface = method[:i]
|
||||||
|
}
|
||||||
|
method = method[i+1:]
|
||||||
|
msg := new(Message)
|
||||||
|
msg.Type = TypeMethodCall
|
||||||
|
msg.serial = o.conn.getSerial()
|
||||||
|
msg.Flags = flags & (FlagNoAutoStart | FlagNoReplyExpected)
|
||||||
|
msg.Headers = make(map[HeaderField]Variant)
|
||||||
|
msg.Headers[FieldPath] = MakeVariant(o.path)
|
||||||
|
msg.Headers[FieldDestination] = MakeVariant(o.dest)
|
||||||
|
msg.Headers[FieldMember] = MakeVariant(method)
|
||||||
|
if iface != "" {
|
||||||
|
msg.Headers[FieldInterface] = MakeVariant(iface)
|
||||||
|
}
|
||||||
|
msg.Body = args
|
||||||
|
if len(args) > 0 {
|
||||||
|
msg.Headers[FieldSignature] = MakeVariant(SignatureOf(args...))
|
||||||
|
}
|
||||||
|
if msg.Flags&FlagNoReplyExpected == 0 {
|
||||||
|
if ch == nil {
|
||||||
|
ch = make(chan *Call, 1)
|
||||||
|
} else if cap(ch) == 0 {
|
||||||
|
panic("dbus: unbuffered channel passed to (*Object).Go")
|
||||||
|
}
|
||||||
|
ctx, cancel := context.WithCancel(ctx)
|
||||||
|
call := &Call{
|
||||||
|
Destination: o.dest,
|
||||||
|
Path: o.path,
|
||||||
|
Method: method,
|
||||||
|
Args: args,
|
||||||
|
Done: ch,
|
||||||
|
ctxCanceler: cancel,
|
||||||
|
ctx: ctx,
|
||||||
|
}
|
||||||
|
o.conn.calls.track(msg.serial, call)
|
||||||
|
o.conn.sendMessageAndIfClosed(msg, func() {
|
||||||
|
o.conn.calls.handleSendError(msg, ErrClosed)
|
||||||
|
cancel()
|
||||||
|
})
|
||||||
|
go func() {
|
||||||
|
<-ctx.Done()
|
||||||
|
o.conn.calls.handleSendError(msg, ctx.Err())
|
||||||
|
}()
|
||||||
|
|
||||||
|
return call
|
||||||
|
}
|
||||||
|
done := make(chan *Call, 1)
|
||||||
|
call := &Call{
|
||||||
|
Err: nil,
|
||||||
|
Done: done,
|
||||||
|
}
|
||||||
|
defer func() {
|
||||||
|
call.Done <- call
|
||||||
|
close(done)
|
||||||
|
}()
|
||||||
|
o.conn.sendMessageAndIfClosed(msg, func() {
|
||||||
|
call.Err = ErrClosed
|
||||||
|
})
|
||||||
|
return call
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetProperty calls org.freedesktop.DBus.Properties.Get on the given
|
||||||
|
// object. The property name must be given in interface.member notation.
|
||||||
|
func (o *Object) GetProperty(p string) (Variant, error) {
|
||||||
|
idx := strings.LastIndex(p, ".")
|
||||||
|
if idx == -1 || idx+1 == len(p) {
|
||||||
|
return Variant{}, errors.New("dbus: invalid property " + p)
|
||||||
|
}
|
||||||
|
|
||||||
|
iface := p[:idx]
|
||||||
|
prop := p[idx+1:]
|
||||||
|
|
||||||
|
result := Variant{}
|
||||||
|
err := o.Call("org.freedesktop.DBus.Properties.Get", 0, iface, prop).Store(&result)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
return Variant{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetProperty calls org.freedesktop.DBus.Properties.Set on the given
|
||||||
|
// object. The property name must be given in interface.member notation.
|
||||||
|
func (o *Object) SetProperty(p string, v interface{}) error {
|
||||||
|
idx := strings.LastIndex(p, ".")
|
||||||
|
if idx == -1 || idx+1 == len(p) {
|
||||||
|
return errors.New("dbus: invalid property " + p)
|
||||||
|
}
|
||||||
|
|
||||||
|
iface := p[:idx]
|
||||||
|
prop := p[idx+1:]
|
||||||
|
|
||||||
|
return o.Call("org.freedesktop.DBus.Properties.Set", 0, iface, prop, v).Err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Destination returns the destination that calls on (o *Object) are sent to.
|
||||||
|
func (o *Object) Destination() string {
|
||||||
|
return o.dest
|
||||||
|
}
|
||||||
|
|
||||||
|
// Path returns the path that calls on (o *Object") are sent to.
|
||||||
|
func (o *Object) Path() ObjectPath {
|
||||||
|
return o.path
|
||||||
|
}
|
107
libnetwork/vendor/github.com/godbus/dbus/v5/server_interfaces.go
generated
vendored
Normal file
107
libnetwork/vendor/github.com/godbus/dbus/v5/server_interfaces.go
generated
vendored
Normal file
|
@ -0,0 +1,107 @@
|
||||||
|
package dbus
|
||||||
|
|
||||||
|
// Terminator allows a handler to implement a shutdown mechanism that
|
||||||
|
// is called when the connection terminates.
|
||||||
|
type Terminator interface {
|
||||||
|
Terminate()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handler is the representation of a D-Bus Application.
|
||||||
|
//
|
||||||
|
// The Handler must have a way to lookup objects given
|
||||||
|
// an ObjectPath. The returned object must implement the
|
||||||
|
// ServerObject interface.
|
||||||
|
type Handler interface {
|
||||||
|
LookupObject(path ObjectPath) (ServerObject, bool)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ServerObject is the representation of an D-Bus Object.
|
||||||
|
//
|
||||||
|
// Objects are registered at a path for a given Handler.
|
||||||
|
// The Objects implement D-Bus interfaces. The semantics
|
||||||
|
// of Interface lookup is up to the implementation of
|
||||||
|
// the ServerObject. The ServerObject implementation may
|
||||||
|
// choose to implement empty string as a valid interface
|
||||||
|
// represeting all methods or not per the D-Bus specification.
|
||||||
|
type ServerObject interface {
|
||||||
|
LookupInterface(name string) (Interface, bool)
|
||||||
|
}
|
||||||
|
|
||||||
|
// An Interface is the representation of a D-Bus Interface.
|
||||||
|
//
|
||||||
|
// Interfaces are a grouping of methods implemented by the Objects.
|
||||||
|
// Interfaces are responsible for routing method calls.
|
||||||
|
type Interface interface {
|
||||||
|
LookupMethod(name string) (Method, bool)
|
||||||
|
}
|
||||||
|
|
||||||
|
// A Method represents the exposed methods on D-Bus.
|
||||||
|
type Method interface {
|
||||||
|
// Call requires that all arguments are decoded before being passed to it.
|
||||||
|
Call(args ...interface{}) ([]interface{}, error)
|
||||||
|
NumArguments() int
|
||||||
|
NumReturns() int
|
||||||
|
// ArgumentValue returns a representative value for the argument at position
|
||||||
|
// it should be of the proper type. reflect.Zero would be a good mechanism
|
||||||
|
// to use for this Value.
|
||||||
|
ArgumentValue(position int) interface{}
|
||||||
|
// ReturnValue returns a representative value for the return at position
|
||||||
|
// it should be of the proper type. reflect.Zero would be a good mechanism
|
||||||
|
// to use for this Value.
|
||||||
|
ReturnValue(position int) interface{}
|
||||||
|
}
|
||||||
|
|
||||||
|
// An Argument Decoder can decode arguments using the non-standard mechanism
|
||||||
|
//
|
||||||
|
// If a method implements this interface then the non-standard
|
||||||
|
// decoder will be used.
|
||||||
|
//
|
||||||
|
// Method arguments must be decoded from the message.
|
||||||
|
// The mechanism for doing this will vary based on the
|
||||||
|
// implementation of the method. A normal approach is provided
|
||||||
|
// as part of this library, but may be replaced with
|
||||||
|
// any other decoding scheme.
|
||||||
|
type ArgumentDecoder interface {
|
||||||
|
// To decode the arguments of a method the sender and message are
|
||||||
|
// provided incase the semantics of the implementer provides access
|
||||||
|
// to these as part of the method invocation.
|
||||||
|
DecodeArguments(conn *Conn, sender string, msg *Message, args []interface{}) ([]interface{}, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
// A SignalHandler is responsible for delivering a signal.
|
||||||
|
//
|
||||||
|
// Signal delivery may be changed from the default channel
|
||||||
|
// based approach by Handlers implementing the SignalHandler
|
||||||
|
// interface.
|
||||||
|
type SignalHandler interface {
|
||||||
|
DeliverSignal(iface, name string, signal *Signal)
|
||||||
|
}
|
||||||
|
|
||||||
|
// SignalRegistrar manages signal delivery channels.
|
||||||
|
//
|
||||||
|
// This is an optional set of methods for `SignalHandler`.
|
||||||
|
type SignalRegistrar interface {
|
||||||
|
AddSignal(ch chan<- *Signal)
|
||||||
|
RemoveSignal(ch chan<- *Signal)
|
||||||
|
}
|
||||||
|
|
||||||
|
// A DBusError is used to convert a generic object to a D-Bus error.
|
||||||
|
//
|
||||||
|
// Any custom error mechanism may implement this interface to provide
|
||||||
|
// a custom encoding of the error on D-Bus. By default if a normal
|
||||||
|
// error is returned, it will be encoded as the generic
|
||||||
|
// "org.freedesktop.DBus.Error.Failed" error. By implementing this
|
||||||
|
// interface as well a custom encoding may be provided.
|
||||||
|
type DBusError interface {
|
||||||
|
DBusError() (string, []interface{})
|
||||||
|
}
|
||||||
|
|
||||||
|
// SerialGenerator is responsible for serials generation.
|
||||||
|
//
|
||||||
|
// Different approaches for the serial generation can be used,
|
||||||
|
// maintaining a map guarded with a mutex (the standard way) or
|
||||||
|
// simply increment an atomic counter.
|
||||||
|
type SerialGenerator interface {
|
||||||
|
GetSerial() uint32
|
||||||
|
RetireSerial(serial uint32)
|
||||||
|
}
|
|
@ -57,12 +57,12 @@ func getSignature(t reflect.Type) string {
|
||||||
return "n"
|
return "n"
|
||||||
case reflect.Uint16:
|
case reflect.Uint16:
|
||||||
return "q"
|
return "q"
|
||||||
case reflect.Int32:
|
case reflect.Int, reflect.Int32:
|
||||||
if t == unixFDType {
|
if t == unixFDType {
|
||||||
return "h"
|
return "h"
|
||||||
}
|
}
|
||||||
return "i"
|
return "i"
|
||||||
case reflect.Uint32:
|
case reflect.Uint, reflect.Uint32:
|
||||||
if t == unixFDIndexType {
|
if t == unixFDIndexType {
|
||||||
return "h"
|
return "h"
|
||||||
}
|
}
|
||||||
|
@ -101,6 +101,8 @@ func getSignature(t reflect.Type) string {
|
||||||
panic(InvalidTypeError{t})
|
panic(InvalidTypeError{t})
|
||||||
}
|
}
|
||||||
return "a{" + getSignature(t.Key()) + getSignature(t.Elem()) + "}"
|
return "a{" + getSignature(t.Key()) + getSignature(t.Elem()) + "}"
|
||||||
|
case reflect.Interface:
|
||||||
|
return "v"
|
||||||
}
|
}
|
||||||
panic(InvalidTypeError{t})
|
panic(InvalidTypeError{t})
|
||||||
}
|
}
|
||||||
|
@ -162,7 +164,7 @@ func (e SignatureError) Error() string {
|
||||||
return fmt.Sprintf("dbus: invalid signature: %q (%s)", e.Sig, e.Reason)
|
return fmt.Sprintf("dbus: invalid signature: %q (%s)", e.Sig, e.Reason)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Try to read a single type from this string. If it was successfull, err is nil
|
// Try to read a single type from this string. If it was successful, err is nil
|
||||||
// and rem is the remaining unparsed part. Otherwise, err is a non-nil
|
// and rem is the remaining unparsed part. Otherwise, err is a non-nil
|
||||||
// SignatureError and rem is "". depth is the current recursion depth which may
|
// SignatureError and rem is "". depth is the current recursion depth which may
|
||||||
// not be greater than 64 and should be given as 0 on the first call.
|
// not be greater than 64 and should be given as 0 on the first call.
|
|
@ -4,8 +4,23 @@ import (
|
||||||
"encoding/binary"
|
"encoding/binary"
|
||||||
"errors"
|
"errors"
|
||||||
"io"
|
"io"
|
||||||
|
"unsafe"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var nativeEndian binary.ByteOrder
|
||||||
|
|
||||||
|
func detectEndianness() binary.ByteOrder {
|
||||||
|
var x uint32 = 0x01020304
|
||||||
|
if *(*byte)(unsafe.Pointer(&x)) == 0x01 {
|
||||||
|
return binary.BigEndian
|
||||||
|
}
|
||||||
|
return binary.LittleEndian
|
||||||
|
}
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
nativeEndian = detectEndianness()
|
||||||
|
}
|
||||||
|
|
||||||
type genericTransport struct {
|
type genericTransport struct {
|
||||||
io.ReadWriteCloser
|
io.ReadWriteCloser
|
||||||
}
|
}
|
||||||
|
@ -31,5 +46,5 @@ func (t genericTransport) SendMessage(msg *Message) error {
|
||||||
return errors.New("dbus: unix fd passing not enabled")
|
return errors.New("dbus: unix fd passing not enabled")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return msg.EncodeTo(t, binary.LittleEndian)
|
return msg.EncodeTo(t, nativeEndian)
|
||||||
}
|
}
|
39
libnetwork/vendor/github.com/godbus/dbus/v5/transport_nonce_tcp.go
generated
vendored
Normal file
39
libnetwork/vendor/github.com/godbus/dbus/v5/transport_nonce_tcp.go
generated
vendored
Normal file
|
@ -0,0 +1,39 @@
|
||||||
|
//+build !windows
|
||||||
|
|
||||||
|
package dbus
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"io/ioutil"
|
||||||
|
"net"
|
||||||
|
)
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
transports["nonce-tcp"] = newNonceTcpTransport
|
||||||
|
}
|
||||||
|
|
||||||
|
func newNonceTcpTransport(keys string) (transport, error) {
|
||||||
|
host := getKey(keys, "host")
|
||||||
|
port := getKey(keys, "port")
|
||||||
|
noncefile := getKey(keys, "noncefile")
|
||||||
|
if host == "" || port == "" || noncefile == "" {
|
||||||
|
return nil, errors.New("dbus: unsupported address (must set host, port and noncefile)")
|
||||||
|
}
|
||||||
|
protocol, err := tcpFamily(keys)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
socket, err := net.Dial(protocol, net.JoinHostPort(host, port))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
b, err := ioutil.ReadFile(noncefile)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
_, err = socket.Write(b)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return NewConn(socket)
|
||||||
|
}
|
|
@ -1,5 +1,3 @@
|
||||||
//+build !windows
|
|
||||||
|
|
||||||
package dbus
|
package dbus
|
||||||
|
|
||||||
import (
|
import (
|
|
@ -31,6 +31,7 @@ func (o *oobReader) Read(b []byte) (n int, err error) {
|
||||||
|
|
||||||
type unixTransport struct {
|
type unixTransport struct {
|
||||||
*net.UnixConn
|
*net.UnixConn
|
||||||
|
rdr *oobReader
|
||||||
hasUnixFDs bool
|
hasUnixFDs bool
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -79,10 +80,15 @@ func (t *unixTransport) ReadMessage() (*Message, error) {
|
||||||
// To be sure that all bytes of out-of-band data are read, we use a special
|
// To be sure that all bytes of out-of-band data are read, we use a special
|
||||||
// reader that uses ReadUnix on the underlying connection instead of Read
|
// reader that uses ReadUnix on the underlying connection instead of Read
|
||||||
// and gathers the out-of-band data in a buffer.
|
// and gathers the out-of-band data in a buffer.
|
||||||
rd := &oobReader{conn: t.UnixConn}
|
if t.rdr == nil {
|
||||||
|
t.rdr = &oobReader{conn: t.UnixConn}
|
||||||
|
} else {
|
||||||
|
t.rdr.oob = nil
|
||||||
|
}
|
||||||
|
|
||||||
// read the first 16 bytes (the part of the header that has a constant size),
|
// read the first 16 bytes (the part of the header that has a constant size),
|
||||||
// from which we can figure out the length of the rest of the message
|
// from which we can figure out the length of the rest of the message
|
||||||
if _, err := io.ReadFull(rd, csheader[:]); err != nil {
|
if _, err := io.ReadFull(t.rdr, csheader[:]); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
switch csheader[0] {
|
switch csheader[0] {
|
||||||
|
@ -104,7 +110,7 @@ func (t *unixTransport) ReadMessage() (*Message, error) {
|
||||||
// decode headers and look for unix fds
|
// decode headers and look for unix fds
|
||||||
headerdata := make([]byte, hlen+4)
|
headerdata := make([]byte, hlen+4)
|
||||||
copy(headerdata, csheader[12:])
|
copy(headerdata, csheader[12:])
|
||||||
if _, err := io.ReadFull(t, headerdata[4:]); err != nil {
|
if _, err := io.ReadFull(t.rdr, headerdata[4:]); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
dec := newDecoder(bytes.NewBuffer(headerdata), order)
|
dec := newDecoder(bytes.NewBuffer(headerdata), order)
|
||||||
|
@ -122,7 +128,7 @@ func (t *unixTransport) ReadMessage() (*Message, error) {
|
||||||
all := make([]byte, 16+hlen+blen)
|
all := make([]byte, 16+hlen+blen)
|
||||||
copy(all, csheader[:])
|
copy(all, csheader[:])
|
||||||
copy(all[16:], headerdata[4:])
|
copy(all[16:], headerdata[4:])
|
||||||
if _, err := io.ReadFull(rd, all[16+hlen:]); err != nil {
|
if _, err := io.ReadFull(t.rdr, all[16+hlen:]); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if unixfds != 0 {
|
if unixfds != 0 {
|
||||||
|
@ -130,7 +136,7 @@ func (t *unixTransport) ReadMessage() (*Message, error) {
|
||||||
return nil, errors.New("dbus: got unix fds on unsupported transport")
|
return nil, errors.New("dbus: got unix fds on unsupported transport")
|
||||||
}
|
}
|
||||||
// read the fds from the OOB data
|
// read the fds from the OOB data
|
||||||
scms, err := syscall.ParseSocketControlMessage(rd.oob)
|
scms, err := syscall.ParseSocketControlMessage(t.rdr.oob)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -148,11 +154,23 @@ func (t *unixTransport) ReadMessage() (*Message, error) {
|
||||||
// substitute the values in the message body (which are indices for the
|
// substitute the values in the message body (which are indices for the
|
||||||
// array receiver via OOB) with the actual values
|
// array receiver via OOB) with the actual values
|
||||||
for i, v := range msg.Body {
|
for i, v := range msg.Body {
|
||||||
if j, ok := v.(UnixFDIndex); ok {
|
switch v.(type) {
|
||||||
|
case UnixFDIndex:
|
||||||
|
j := v.(UnixFDIndex)
|
||||||
if uint32(j) >= unixfds {
|
if uint32(j) >= unixfds {
|
||||||
return nil, InvalidMessageError("invalid index for unix fd")
|
return nil, InvalidMessageError("invalid index for unix fd")
|
||||||
}
|
}
|
||||||
msg.Body[i] = UnixFD(fds[j])
|
msg.Body[i] = UnixFD(fds[j])
|
||||||
|
case []UnixFDIndex:
|
||||||
|
idxArray := v.([]UnixFDIndex)
|
||||||
|
fdArray := make([]UnixFD, len(idxArray))
|
||||||
|
for k, j := range idxArray {
|
||||||
|
if uint32(j) >= unixfds {
|
||||||
|
return nil, InvalidMessageError("invalid index for unix fd")
|
||||||
|
}
|
||||||
|
fdArray[k] = UnixFD(fds[j])
|
||||||
|
}
|
||||||
|
msg.Body[i] = fdArray
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return msg, nil
|
return msg, nil
|
||||||
|
@ -175,7 +193,7 @@ func (t *unixTransport) SendMessage(msg *Message) error {
|
||||||
msg.Headers[FieldUnixFDs] = MakeVariant(uint32(len(fds)))
|
msg.Headers[FieldUnixFDs] = MakeVariant(uint32(len(fds)))
|
||||||
oob := syscall.UnixRights(fds...)
|
oob := syscall.UnixRights(fds...)
|
||||||
buf := new(bytes.Buffer)
|
buf := new(bytes.Buffer)
|
||||||
msg.EncodeTo(buf, binary.LittleEndian)
|
msg.EncodeTo(buf, nativeEndian)
|
||||||
n, oobn, err := t.UnixConn.WriteMsgUnix(buf.Bytes(), oob, nil)
|
n, oobn, err := t.UnixConn.WriteMsgUnix(buf.Bytes(), oob, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
@ -184,8 +202,8 @@ func (t *unixTransport) SendMessage(msg *Message) error {
|
||||||
return io.ErrShortWrite
|
return io.ErrShortWrite
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if err := msg.EncodeTo(t, binary.LittleEndian); err != nil {
|
if err := msg.EncodeTo(t, nativeEndian); err != nil {
|
||||||
return nil
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
91
libnetwork/vendor/github.com/godbus/dbus/v5/transport_unixcred_freebsd.go
generated
vendored
Normal file
91
libnetwork/vendor/github.com/godbus/dbus/v5/transport_unixcred_freebsd.go
generated
vendored
Normal file
|
@ -0,0 +1,91 @@
|
||||||
|
// The UnixCredentials system call is currently only implemented on Linux
|
||||||
|
// http://golang.org/src/pkg/syscall/sockcmsg_linux.go
|
||||||
|
// https://golang.org/s/go1.4-syscall
|
||||||
|
// http://code.google.com/p/go/source/browse/unix/sockcmsg_linux.go?repo=sys
|
||||||
|
|
||||||
|
// Local implementation of the UnixCredentials system call for FreeBSD
|
||||||
|
|
||||||
|
package dbus
|
||||||
|
|
||||||
|
/*
|
||||||
|
const int sizeofPtr = sizeof(void*);
|
||||||
|
#define _WANT_UCRED
|
||||||
|
#include <sys/ucred.h>
|
||||||
|
*/
|
||||||
|
import "C"
|
||||||
|
|
||||||
|
import (
|
||||||
|
"io"
|
||||||
|
"os"
|
||||||
|
"syscall"
|
||||||
|
"unsafe"
|
||||||
|
)
|
||||||
|
|
||||||
|
// http://golang.org/src/pkg/syscall/ztypes_linux_amd64.go
|
||||||
|
// https://golang.org/src/syscall/ztypes_freebsd_amd64.go
|
||||||
|
type Ucred struct {
|
||||||
|
Pid int32
|
||||||
|
Uid uint32
|
||||||
|
Gid uint32
|
||||||
|
}
|
||||||
|
|
||||||
|
// http://golang.org/src/pkg/syscall/types_linux.go
|
||||||
|
// https://golang.org/src/syscall/types_freebsd.go
|
||||||
|
// https://github.com/freebsd/freebsd/blob/master/sys/sys/ucred.h
|
||||||
|
const (
|
||||||
|
SizeofUcred = C.sizeof_struct_ucred
|
||||||
|
)
|
||||||
|
|
||||||
|
// http://golang.org/src/pkg/syscall/sockcmsg_unix.go
|
||||||
|
func cmsgAlignOf(salen int) int {
|
||||||
|
salign := C.sizeofPtr
|
||||||
|
|
||||||
|
return (salen + salign - 1) & ^(salign - 1)
|
||||||
|
}
|
||||||
|
|
||||||
|
// http://golang.org/src/pkg/syscall/sockcmsg_unix.go
|
||||||
|
func cmsgData(h *syscall.Cmsghdr) unsafe.Pointer {
|
||||||
|
return unsafe.Pointer(uintptr(unsafe.Pointer(h)) + uintptr(cmsgAlignOf(syscall.SizeofCmsghdr)))
|
||||||
|
}
|
||||||
|
|
||||||
|
// http://golang.org/src/pkg/syscall/sockcmsg_linux.go
|
||||||
|
// UnixCredentials encodes credentials into a socket control message
|
||||||
|
// for sending to another process. This can be used for
|
||||||
|
// authentication.
|
||||||
|
func UnixCredentials(ucred *Ucred) []byte {
|
||||||
|
b := make([]byte, syscall.CmsgSpace(SizeofUcred))
|
||||||
|
h := (*syscall.Cmsghdr)(unsafe.Pointer(&b[0]))
|
||||||
|
h.Level = syscall.SOL_SOCKET
|
||||||
|
h.Type = syscall.SCM_CREDS
|
||||||
|
h.SetLen(syscall.CmsgLen(SizeofUcred))
|
||||||
|
*((*Ucred)(cmsgData(h))) = *ucred
|
||||||
|
return b
|
||||||
|
}
|
||||||
|
|
||||||
|
// http://golang.org/src/pkg/syscall/sockcmsg_linux.go
|
||||||
|
// ParseUnixCredentials decodes a socket control message that contains
|
||||||
|
// credentials in a Ucred structure. To receive such a message, the
|
||||||
|
// SO_PASSCRED option must be enabled on the socket.
|
||||||
|
func ParseUnixCredentials(m *syscall.SocketControlMessage) (*Ucred, error) {
|
||||||
|
if m.Header.Level != syscall.SOL_SOCKET {
|
||||||
|
return nil, syscall.EINVAL
|
||||||
|
}
|
||||||
|
if m.Header.Type != syscall.SCM_CREDS {
|
||||||
|
return nil, syscall.EINVAL
|
||||||
|
}
|
||||||
|
ucred := *(*Ucred)(unsafe.Pointer(&m.Data[0]))
|
||||||
|
return &ucred, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *unixTransport) SendNullByte() error {
|
||||||
|
ucred := &Ucred{Pid: int32(os.Getpid()), Uid: uint32(os.Getuid()), Gid: uint32(os.Getgid())}
|
||||||
|
b := UnixCredentials(ucred)
|
||||||
|
_, oobn, err := t.UnixConn.WriteMsgUnix([]byte{0}, b, nil)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if oobn != len(b) {
|
||||||
|
return io.ErrShortWrite
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
14
libnetwork/vendor/github.com/godbus/dbus/v5/transport_unixcred_openbsd.go
generated
vendored
Normal file
14
libnetwork/vendor/github.com/godbus/dbus/v5/transport_unixcred_openbsd.go
generated
vendored
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
package dbus
|
||||||
|
|
||||||
|
import "io"
|
||||||
|
|
||||||
|
func (t *unixTransport) SendNullByte() error {
|
||||||
|
n, _, err := t.UnixConn.WriteMsgUnix([]byte{0}, nil, nil)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if n != 1 {
|
||||||
|
return io.ErrShortWrite
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
|
@ -17,11 +17,16 @@ type Variant struct {
|
||||||
// MakeVariant converts the given value to a Variant. It panics if v cannot be
|
// MakeVariant converts the given value to a Variant. It panics if v cannot be
|
||||||
// represented as a D-Bus type.
|
// represented as a D-Bus type.
|
||||||
func MakeVariant(v interface{}) Variant {
|
func MakeVariant(v interface{}) Variant {
|
||||||
return Variant{SignatureOf(v), v}
|
return MakeVariantWithSignature(v, SignatureOf(v))
|
||||||
|
}
|
||||||
|
|
||||||
|
// MakeVariantWithSignature converts the given value to a Variant.
|
||||||
|
func MakeVariantWithSignature(v interface{}, s Signature) Variant {
|
||||||
|
return Variant{s, v}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ParseVariant parses the given string as a variant as described at
|
// ParseVariant parses the given string as a variant as described at
|
||||||
// https://developer.gnome.org/glib/unstable/gvariant-text.html. If sig is not
|
// https://developer.gnome.org/glib/stable/gvariant-text.html. If sig is not
|
||||||
// empty, it is taken to be the expected signature for the variant.
|
// empty, it is taken to be the expected signature for the variant.
|
||||||
func ParseVariant(s string, sig Signature) (Variant, error) {
|
func ParseVariant(s string, sig Signature) (Variant, error) {
|
||||||
tokens := varLex(s)
|
tokens := varLex(s)
|
||||||
|
@ -124,7 +129,7 @@ func (v Variant) Signature() Signature {
|
||||||
}
|
}
|
||||||
|
|
||||||
// String returns the string representation of the underlying value of v as
|
// String returns the string representation of the underlying value of v as
|
||||||
// described at https://developer.gnome.org/glib/unstable/gvariant-text.html.
|
// described at https://developer.gnome.org/glib/stable/gvariant-text.html.
|
||||||
func (v Variant) String() string {
|
func (v Variant) String() string {
|
||||||
s, unamb := v.format()
|
s, unamb := v.format()
|
||||||
if !unamb {
|
if !unamb {
|
|
@ -51,7 +51,7 @@ func varLex(s string) []varToken {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (l *varLexer) accept(valid string) bool {
|
func (l *varLexer) accept(valid string) bool {
|
||||||
if strings.IndexRune(valid, l.next()) >= 0 {
|
if strings.ContainsRune(valid, l.next()) {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
l.backup()
|
l.backup()
|
||||||
|
@ -214,17 +214,17 @@ func varLexNumber(l *varLexer) lexState {
|
||||||
digits = "01234567"
|
digits = "01234567"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for strings.IndexRune(digits, l.next()) >= 0 {
|
for strings.ContainsRune(digits, l.next()) {
|
||||||
}
|
}
|
||||||
l.backup()
|
l.backup()
|
||||||
if l.accept(".") {
|
if l.accept(".") {
|
||||||
for strings.IndexRune(digits, l.next()) >= 0 {
|
for strings.ContainsRune(digits, l.next()) {
|
||||||
}
|
}
|
||||||
l.backup()
|
l.backup()
|
||||||
}
|
}
|
||||||
if l.accept("eE") {
|
if l.accept("eE") {
|
||||||
l.accept("+-")
|
l.accept("+-")
|
||||||
for strings.IndexRune("0123456789", l.next()) >= 0 {
|
for strings.ContainsRune("0123456789", l.next()) {
|
||||||
}
|
}
|
||||||
l.backup()
|
l.backup()
|
||||||
}
|
}
|
Loading…
Add table
Reference in a new issue