diff options
| author | kevin.xu <cming.xu@gmail.com> | 2020-04-27 21:51:31 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 21:51:31 +0800 |
| commit | e896ca54db67524afc20b644d43c72185e72dc0e (patch) | |
| tree | 2a16f3a62a5cafd098f1f028c621f1b655589d69 /pkg/p9/transport_flipcall.go | |
| parent | 1f19624fa127d7d59cabe29593cc80b7fe6c81f8 (diff) | |
| parent | 3c67754663f424f2ebbc0ff2a4c80e30618d5355 (diff) | |
Merge pull request #1 from google/master
catch up
Diffstat (limited to 'pkg/p9/transport_flipcall.go')
| -rw-r--r-- | pkg/p9/transport_flipcall.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/p9/transport_flipcall.go b/pkg/p9/transport_flipcall.go index 233f825e3..38038abdf 100644 --- a/pkg/p9/transport_flipcall.go +++ b/pkg/p9/transport_flipcall.go @@ -151,7 +151,7 @@ func (ch *channel) send(m message) (uint32, error) { } else { ch.buf.Write8(0) // No incoming FD. } - m.Encode(&ch.buf) + m.encode(&ch.buf) ssz := uint32(len(ch.buf.data)) // Updated below. // Is there a payload? @@ -205,7 +205,7 @@ func (ch *channel) recv(r message, rsz uint32) (message, error) { ch.buf.data = ch.buf.data[:fs] } - r.Decode(&ch.buf) + r.decode(&ch.buf) if ch.buf.isOverrun() { // Nothing valid was available. log.Debugf("recv [got %d bytes, needed more]", rsz) @@ -236,7 +236,7 @@ func (ch *channel) recv(r message, rsz uint32) (message, error) { // Convert errors appropriately; see above. if rlerr, ok := r.(*Rlerror); ok { - return nil, syscall.Errno(rlerr.Error) + return r, syscall.Errno(rlerr.Error) } return r, nil |