unistack-org/go-libvirt-plain
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extract sendPacket and getResponse methods from request()

Browse Source
This commit is contained in:
Yuriy Taraday 2018-02-04 17:33:55 +04:00
parent 0978bc3291
commit f314e95419
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
rpc.go
View File

@ -298,6 +298,20 @@ func (l *Libvirt) request(proc uint32, program uint32, payload []byte) (response
l.register(serial, c) l.register(serial, c)
err := l.sendPacket(serial, proc, program, payload, Call, StatusOK)
if err != nil {
return response{}, err
}
resp, err := l.getResponse(c)
if err != nil {
return resp, err
}
return resp, nil
}
func (l *Libvirt) sendPacket(serial uint32, proc uint32, program uint32, payload []byte, typ uint32, status uint32) error {
size := constants.PacketLengthSize + constants.HeaderSize size := constants.PacketLengthSize + constants.HeaderSize
if payload != nil { if payload != nil {
size += len(payload) size += len(payload)
@ -309,9 +323,9 @@ func (l *Libvirt) request(proc uint32, program uint32, payload []byte) (response
Program: program, Program: program,
Version: constants.ProtocolVersion, Version: constants.ProtocolVersion,
Procedure: proc, Procedure: proc,
Type: Call, Type: typ,
Serial: serial, Serial: serial,
Status: StatusOK, Status: status,
}, },
} }
@ -320,21 +334,25 @@ func (l *Libvirt) request(proc uint32, program uint32, payload []byte) (response
defer l.mu.Unlock() defer l.mu.Unlock()
err := binary.Write(l.w, binary.BigEndian, p) err := binary.Write(l.w, binary.BigEndian, p)
if err != nil { if err != nil {
return response{}, err return err
} }
// write payload // write payload
if payload != nil { if payload != nil {
err = binary.Write(l.w, binary.BigEndian, payload) err = binary.Write(l.w, binary.BigEndian, payload)
if err != nil { if err != nil {
return response{}, err return err
} }
} }
if err := l.w.Flush(); err != nil { if err := l.w.Flush(); err != nil {
return response{}, err return err
} }
return nil
}
func (l *Libvirt) getResponse(c chan response) (response, error) {
resp := <-c resp := <-c
if resp.Status != StatusOK { if resp.Status != StatusOK {
return resp, decodeError(resp.Payload) return resp, decodeError(resp.Payload)