[fidl][go] 32 to 64 bits Ordinals: Prep
Mechanical regen with
fx exec third_party/go/regen-fidl
Along with an improved error message which displays all ordinals we
match against on error (not just the first one).
See corresponding CL
https://fuchsia-review.googlesource.com/c/fuchsia/+/324366
Bug: 7848
Test: no behavior change
Change-Id: Ifd358a0782650207604301533b15449d7ca943b6
diff --git a/src/syscall/zx/fidl/bindingstest/impl.go b/src/syscall/zx/fidl/bindingstest/impl.go
index 80b6740..16511cb 100644
--- a/src/syscall/zx/fidl/bindingstest/impl.go
+++ b/src/syscall/zx/fidl/bindingstest/impl.go
@@ -1043,7 +1043,7 @@
In: in,
}
resp_ := &test1EchoResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(Test1EchoOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(Test1EchoOrdinal, req_, resp_, Test1EchoOrdinal, Test1EchoGenOrdinal)
return resp_.Out, err
}
@@ -1056,7 +1056,7 @@
func (p *Test1Interface) EmptyResponse() error {
var req_ _bindings.Message
var resp_ _bindings.Message
- err := ((*_bindings.ChannelProxy)(p)).Call(Test1EmptyResponseOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(Test1EmptyResponseOrdinal, req_, resp_, Test1EmptyResponseOrdinal, Test1EmptyResponseGenOrdinal)
return err
}
diff --git a/src/syscall/zx/fidl/errors.go b/src/syscall/zx/fidl/errors.go
index 2f8040a..183b27f 100644
--- a/src/syscall/zx/fidl/errors.go
+++ b/src/syscall/zx/fidl/errors.go
@@ -169,6 +169,15 @@
if s, ok := value.(stringer); ok {
return s.String()
}
+ if numbers, ok := value.([]uint64); ok {
+ s := "["
+ for _, num := range numbers {
+ s += strconv.FormatUint(num, 10)
+ s += " "
+ }
+ s += "]"
+ return s
+ }
t := reflect.TypeOf(value)
switch t.Kind() {
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
diff --git a/src/syscall/zx/fidl/interface.go b/src/syscall/zx/fidl/interface.go
index 239293e..34f9e47 100644
--- a/src/syscall/zx/fidl/interface.go
+++ b/src/syscall/zx/fidl/interface.go
@@ -110,11 +110,13 @@
}
// TODO(FIDL-524): Remove temporary handling of two ordinals.
expectedOrdinal := header.Ordinal == ordinal
+ expectedOrdinals := []uint64{ordinal}
for _, ordinal := range gen_ordinal {
expectedOrdinal = expectedOrdinal || header.Ordinal == ordinal
+ expectedOrdinals = append(expectedOrdinals, ordinal)
}
if !expectedOrdinal {
- return newExpectError(ErrUnexpectedOrdinal, ordinal, header.Ordinal)
+ return newExpectError(ErrUnexpectedOrdinal, expectedOrdinals, header.Ordinal)
}
return nil
}
diff --git a/src/syscall/zx/io/impl.go b/src/syscall/zx/io/impl.go
index f7c8fbc..bd04550 100644
--- a/src/syscall/zx/io/impl.go
+++ b/src/syscall/zx/io/impl.go
@@ -672,7 +672,7 @@
func (p *NodeInterface) Close() (int32, error) {
var req_ _bindings.Message
resp_ := &nodeCloseResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(NodeCloseOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(NodeCloseOrdinal, req_, resp_, NodeCloseOrdinal, NodeCloseGenOrdinal)
return resp_.S, err
}
@@ -683,7 +683,7 @@
func (p *NodeInterface) Describe() (NodeInfo, error) {
var req_ _bindings.Message
resp_ := &nodeDescribeResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(NodeDescribeOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(NodeDescribeOrdinal, req_, resp_, NodeDescribeOrdinal, NodeDescribeGenOrdinal)
return resp_.Info, err
}
@@ -704,7 +704,7 @@
func (p *NodeInterface) Sync() (int32, error) {
var req_ _bindings.Message
resp_ := &nodeSyncResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(NodeSyncOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(NodeSyncOrdinal, req_, resp_, NodeSyncOrdinal, NodeSyncGenOrdinal)
return resp_.S, err
}
@@ -714,7 +714,7 @@
func (p *NodeInterface) GetAttr() (int32, NodeAttributes, error) {
var req_ _bindings.Message
resp_ := &nodeGetAttrResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(NodeGetAttrOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(NodeGetAttrOrdinal, req_, resp_, NodeGetAttrOrdinal, NodeGetAttrGenOrdinal)
return resp_.S, resp_.Attributes, err
}
@@ -728,7 +728,7 @@
Attributes: attributes,
}
resp_ := &nodeSetAttrResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(NodeSetAttrOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(NodeSetAttrOrdinal, req_, resp_, NodeSetAttrOrdinal, NodeSetAttrGenOrdinal)
return resp_.S, err
}
@@ -741,7 +741,7 @@
In: in,
}
resp_ := &nodeIoctlResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(NodeIoctlOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(NodeIoctlOrdinal, req_, resp_, NodeIoctlOrdinal, NodeIoctlGenOrdinal)
return resp_.S, resp_.Handles, resp_.Out, err
}
@@ -1285,7 +1285,7 @@
func (p *FileInterface) Close() (int32, error) {
var req_ _bindings.Message
resp_ := &fileCloseResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(FileCloseOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(FileCloseOrdinal, req_, resp_, FileCloseOrdinal, FileCloseGenOrdinal)
return resp_.S, err
}
@@ -1296,7 +1296,7 @@
func (p *FileInterface) Describe() (NodeInfo, error) {
var req_ _bindings.Message
resp_ := &fileDescribeResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(FileDescribeOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(FileDescribeOrdinal, req_, resp_, FileDescribeOrdinal, FileDescribeGenOrdinal)
return resp_.Info, err
}
@@ -1317,7 +1317,7 @@
func (p *FileInterface) Sync() (int32, error) {
var req_ _bindings.Message
resp_ := &fileSyncResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(FileSyncOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(FileSyncOrdinal, req_, resp_, FileSyncOrdinal, FileSyncGenOrdinal)
return resp_.S, err
}
@@ -1327,7 +1327,7 @@
func (p *FileInterface) GetAttr() (int32, NodeAttributes, error) {
var req_ _bindings.Message
resp_ := &fileGetAttrResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(FileGetAttrOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(FileGetAttrOrdinal, req_, resp_, FileGetAttrOrdinal, FileGetAttrGenOrdinal)
return resp_.S, resp_.Attributes, err
}
@@ -1341,7 +1341,7 @@
Attributes: attributes,
}
resp_ := &fileSetAttrResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(FileSetAttrOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(FileSetAttrOrdinal, req_, resp_, FileSetAttrOrdinal, FileSetAttrGenOrdinal)
return resp_.S, err
}
@@ -1354,7 +1354,7 @@
In: in,
}
resp_ := &fileIoctlResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(FileIoctlOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(FileIoctlOrdinal, req_, resp_, FileIoctlOrdinal, FileIoctlGenOrdinal)
return resp_.S, resp_.Handles, resp_.Out, err
}
@@ -1367,7 +1367,7 @@
Count: count,
}
resp_ := &fileReadResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(FileReadOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(FileReadOrdinal, req_, resp_, FileReadOrdinal, FileReadGenOrdinal)
return resp_.S, resp_.Data, err
}
@@ -1381,7 +1381,7 @@
Offset: offset,
}
resp_ := &fileReadAtResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(FileReadAtOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(FileReadAtOrdinal, req_, resp_, FileReadAtOrdinal, FileReadAtGenOrdinal)
return resp_.S, resp_.Data, err
}
@@ -1394,7 +1394,7 @@
Data: data,
}
resp_ := &fileWriteResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(FileWriteOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(FileWriteOrdinal, req_, resp_, FileWriteOrdinal, FileWriteGenOrdinal)
return resp_.S, resp_.Actual, err
}
@@ -1408,7 +1408,7 @@
Offset: offset,
}
resp_ := &fileWriteAtResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(FileWriteAtOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(FileWriteAtOrdinal, req_, resp_, FileWriteAtOrdinal, FileWriteAtGenOrdinal)
return resp_.S, resp_.Actual, err
}
@@ -1422,7 +1422,7 @@
Start: start,
}
resp_ := &fileSeekResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(FileSeekOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(FileSeekOrdinal, req_, resp_, FileSeekOrdinal, FileSeekGenOrdinal)
return resp_.S, resp_.Offset, err
}
@@ -1434,7 +1434,7 @@
Length: length,
}
resp_ := &fileTruncateResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(FileTruncateOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(FileTruncateOrdinal, req_, resp_, FileTruncateOrdinal, FileTruncateGenOrdinal)
return resp_.S, err
}
@@ -1444,7 +1444,7 @@
func (p *FileInterface) GetFlags() (int32, uint32, error) {
var req_ _bindings.Message
resp_ := &fileGetFlagsResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(FileGetFlagsOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(FileGetFlagsOrdinal, req_, resp_, FileGetFlagsOrdinal, FileGetFlagsGenOrdinal)
return resp_.S, resp_.Flags, err
}
@@ -1458,7 +1458,7 @@
Flags: flags,
}
resp_ := &fileSetFlagsResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(FileSetFlagsOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(FileSetFlagsOrdinal, req_, resp_, FileSetFlagsOrdinal, FileSetFlagsGenOrdinal)
return resp_.S, err
}
@@ -1475,7 +1475,7 @@
Flags: flags,
}
resp_ := &fileGetBufferResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(FileGetBufferOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(FileGetBufferOrdinal, req_, resp_, FileGetBufferOrdinal, FileGetBufferGenOrdinal)
return resp_.S, resp_.Buffer, err
}
@@ -2201,7 +2201,7 @@
func (p *DirectoryInterface) Close() (int32, error) {
var req_ _bindings.Message
resp_ := &directoryCloseResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryCloseOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryCloseOrdinal, req_, resp_, DirectoryCloseOrdinal, DirectoryCloseGenOrdinal)
return resp_.S, err
}
@@ -2212,7 +2212,7 @@
func (p *DirectoryInterface) Describe() (NodeInfo, error) {
var req_ _bindings.Message
resp_ := &directoryDescribeResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryDescribeOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryDescribeOrdinal, req_, resp_, DirectoryDescribeOrdinal, DirectoryDescribeGenOrdinal)
return resp_.Info, err
}
@@ -2233,7 +2233,7 @@
func (p *DirectoryInterface) Sync() (int32, error) {
var req_ _bindings.Message
resp_ := &directorySyncResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectorySyncOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectorySyncOrdinal, req_, resp_, DirectorySyncOrdinal, DirectorySyncGenOrdinal)
return resp_.S, err
}
@@ -2243,7 +2243,7 @@
func (p *DirectoryInterface) GetAttr() (int32, NodeAttributes, error) {
var req_ _bindings.Message
resp_ := &directoryGetAttrResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryGetAttrOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryGetAttrOrdinal, req_, resp_, DirectoryGetAttrOrdinal, DirectoryGetAttrGenOrdinal)
return resp_.S, resp_.Attributes, err
}
@@ -2257,7 +2257,7 @@
Attributes: attributes,
}
resp_ := &directorySetAttrResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectorySetAttrOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectorySetAttrOrdinal, req_, resp_, DirectorySetAttrOrdinal, DirectorySetAttrGenOrdinal)
return resp_.S, err
}
@@ -2270,7 +2270,7 @@
In: in,
}
resp_ := &directoryIoctlResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryIoctlOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryIoctlOrdinal, req_, resp_, DirectoryIoctlOrdinal, DirectoryIoctlGenOrdinal)
return resp_.S, resp_.Handles, resp_.Out, err
}
@@ -2339,7 +2339,7 @@
Path: path,
}
resp_ := &directoryUnlinkResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryUnlinkOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryUnlinkOrdinal, req_, resp_, DirectoryUnlinkOrdinal, DirectoryUnlinkGenOrdinal)
return resp_.S, err
}
@@ -2368,7 +2368,7 @@
MaxBytes: maxBytes,
}
resp_ := &directoryReadDirentsResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryReadDirentsOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryReadDirentsOrdinal, req_, resp_, DirectoryReadDirentsOrdinal, DirectoryReadDirentsGenOrdinal)
return resp_.S, resp_.Dirents, err
}
@@ -2378,7 +2378,7 @@
func (p *DirectoryInterface) Rewind() (int32, error) {
var req_ _bindings.Message
resp_ := &directoryRewindResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryRewindOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryRewindOrdinal, req_, resp_, DirectoryRewindOrdinal, DirectoryRewindGenOrdinal)
return resp_.S, err
}
@@ -2389,7 +2389,7 @@
func (p *DirectoryInterface) GetToken() (int32, _zx.Handle, error) {
var req_ _bindings.Message
resp_ := &directoryGetTokenResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryGetTokenOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryGetTokenOrdinal, req_, resp_, DirectoryGetTokenOrdinal, DirectoryGetTokenGenOrdinal)
return resp_.S, resp_.Token, err
}
@@ -2408,7 +2408,7 @@
Dst: dst,
}
resp_ := &directoryRenameResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryRenameOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryRenameOrdinal, req_, resp_, DirectoryRenameOrdinal, DirectoryRenameGenOrdinal)
return resp_.S, err
}
@@ -2429,7 +2429,7 @@
Dst: dst,
}
resp_ := &directoryLinkResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryLinkOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryLinkOrdinal, req_, resp_, DirectoryLinkOrdinal, DirectoryLinkGenOrdinal)
return resp_.S, err
}
@@ -2457,7 +2457,7 @@
Watcher: watcher,
}
resp_ := &directoryWatchResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryWatchOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryWatchOrdinal, req_, resp_, DirectoryWatchOrdinal, DirectoryWatchGenOrdinal)
return resp_.S, err
}
@@ -3260,7 +3260,7 @@
func (p *DirectoryAdminInterface) Close() (int32, error) {
var req_ _bindings.Message
resp_ := &directoryAdminCloseResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminCloseOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminCloseOrdinal, req_, resp_, DirectoryAdminCloseOrdinal, DirectoryAdminCloseGenOrdinal)
return resp_.S, err
}
@@ -3271,7 +3271,7 @@
func (p *DirectoryAdminInterface) Describe() (NodeInfo, error) {
var req_ _bindings.Message
resp_ := &directoryAdminDescribeResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminDescribeOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminDescribeOrdinal, req_, resp_, DirectoryAdminDescribeOrdinal, DirectoryAdminDescribeGenOrdinal)
return resp_.Info, err
}
@@ -3292,7 +3292,7 @@
func (p *DirectoryAdminInterface) Sync() (int32, error) {
var req_ _bindings.Message
resp_ := &directoryAdminSyncResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminSyncOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminSyncOrdinal, req_, resp_, DirectoryAdminSyncOrdinal, DirectoryAdminSyncGenOrdinal)
return resp_.S, err
}
@@ -3302,7 +3302,7 @@
func (p *DirectoryAdminInterface) GetAttr() (int32, NodeAttributes, error) {
var req_ _bindings.Message
resp_ := &directoryAdminGetAttrResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminGetAttrOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminGetAttrOrdinal, req_, resp_, DirectoryAdminGetAttrOrdinal, DirectoryAdminGetAttrGenOrdinal)
return resp_.S, resp_.Attributes, err
}
@@ -3316,7 +3316,7 @@
Attributes: attributes,
}
resp_ := &directoryAdminSetAttrResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminSetAttrOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminSetAttrOrdinal, req_, resp_, DirectoryAdminSetAttrOrdinal, DirectoryAdminSetAttrGenOrdinal)
return resp_.S, err
}
@@ -3329,7 +3329,7 @@
In: in,
}
resp_ := &directoryAdminIoctlResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminIoctlOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminIoctlOrdinal, req_, resp_, DirectoryAdminIoctlOrdinal, DirectoryAdminIoctlGenOrdinal)
return resp_.S, resp_.Handles, resp_.Out, err
}
@@ -3398,7 +3398,7 @@
Path: path,
}
resp_ := &directoryAdminUnlinkResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminUnlinkOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminUnlinkOrdinal, req_, resp_, DirectoryAdminUnlinkOrdinal, DirectoryAdminUnlinkGenOrdinal)
return resp_.S, err
}
@@ -3427,7 +3427,7 @@
MaxBytes: maxBytes,
}
resp_ := &directoryAdminReadDirentsResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminReadDirentsOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminReadDirentsOrdinal, req_, resp_, DirectoryAdminReadDirentsOrdinal, DirectoryAdminReadDirentsGenOrdinal)
return resp_.S, resp_.Dirents, err
}
@@ -3437,7 +3437,7 @@
func (p *DirectoryAdminInterface) Rewind() (int32, error) {
var req_ _bindings.Message
resp_ := &directoryAdminRewindResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminRewindOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminRewindOrdinal, req_, resp_, DirectoryAdminRewindOrdinal, DirectoryAdminRewindGenOrdinal)
return resp_.S, err
}
@@ -3448,7 +3448,7 @@
func (p *DirectoryAdminInterface) GetToken() (int32, _zx.Handle, error) {
var req_ _bindings.Message
resp_ := &directoryAdminGetTokenResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminGetTokenOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminGetTokenOrdinal, req_, resp_, DirectoryAdminGetTokenOrdinal, DirectoryAdminGetTokenGenOrdinal)
return resp_.S, resp_.Token, err
}
@@ -3467,7 +3467,7 @@
Dst: dst,
}
resp_ := &directoryAdminRenameResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminRenameOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminRenameOrdinal, req_, resp_, DirectoryAdminRenameOrdinal, DirectoryAdminRenameGenOrdinal)
return resp_.S, err
}
@@ -3488,7 +3488,7 @@
Dst: dst,
}
resp_ := &directoryAdminLinkResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminLinkOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminLinkOrdinal, req_, resp_, DirectoryAdminLinkOrdinal, DirectoryAdminLinkGenOrdinal)
return resp_.S, err
}
@@ -3516,7 +3516,7 @@
Watcher: watcher,
}
resp_ := &directoryAdminWatchResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminWatchOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminWatchOrdinal, req_, resp_, DirectoryAdminWatchOrdinal, DirectoryAdminWatchGenOrdinal)
return resp_.S, err
}
@@ -3529,7 +3529,7 @@
Remote: remote,
}
resp_ := &directoryAdminMountResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminMountOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminMountOrdinal, req_, resp_, DirectoryAdminMountOrdinal, DirectoryAdminMountGenOrdinal)
return resp_.S, err
}
@@ -3542,7 +3542,7 @@
Flags: flags,
}
resp_ := &directoryAdminMountAndCreateResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminMountAndCreateOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminMountAndCreateOrdinal, req_, resp_, DirectoryAdminMountAndCreateOrdinal, DirectoryAdminMountAndCreateGenOrdinal)
return resp_.S, err
}
@@ -3551,7 +3551,7 @@
func (p *DirectoryAdminInterface) Unmount() (int32, error) {
var req_ _bindings.Message
resp_ := &directoryAdminUnmountResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminUnmountOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminUnmountOrdinal, req_, resp_, DirectoryAdminUnmountOrdinal, DirectoryAdminUnmountGenOrdinal)
return resp_.S, err
}
@@ -3560,7 +3560,7 @@
func (p *DirectoryAdminInterface) UnmountNode() (int32, DirectoryInterface, error) {
var req_ _bindings.Message
resp_ := &directoryAdminUnmountNodeResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminUnmountNodeOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminUnmountNodeOrdinal, req_, resp_, DirectoryAdminUnmountNodeOrdinal, DirectoryAdminUnmountNodeGenOrdinal)
return resp_.S, resp_.Remote, err
}
@@ -3568,7 +3568,7 @@
func (p *DirectoryAdminInterface) QueryFilesystem() (int32, *FilesystemInfo, error) {
var req_ _bindings.Message
resp_ := &directoryAdminQueryFilesystemResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminQueryFilesystemOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminQueryFilesystemOrdinal, req_, resp_, DirectoryAdminQueryFilesystemOrdinal, DirectoryAdminQueryFilesystemGenOrdinal)
return resp_.S, resp_.Info, err
}
@@ -3576,7 +3576,7 @@
func (p *DirectoryAdminInterface) GetDevicePath() (int32, *string, error) {
var req_ _bindings.Message
resp_ := &directoryAdminGetDevicePathResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminGetDevicePathOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(DirectoryAdminGetDevicePathOrdinal, req_, resp_, DirectoryAdminGetDevicePathOrdinal, DirectoryAdminGetDevicePathGenOrdinal)
return resp_.S, resp_.Path, err
}
diff --git a/src/syscall/zx/net/impl.go b/src/syscall/zx/net/impl.go
index 221c37d..f4fa5dc 100644
--- a/src/syscall/zx/net/impl.go
+++ b/src/syscall/zx/net/impl.go
@@ -390,7 +390,7 @@
func (p *ControlInterface) Close() (int32, error) {
var req_ _bindings.Message
resp_ := &controlCloseResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(ControlCloseOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(ControlCloseOrdinal, req_, resp_, ControlCloseOrdinal, ControlCloseGenOrdinal)
return resp_.S, err
}
@@ -401,7 +401,7 @@
func (p *ControlInterface) Describe() (fuchsiaio.NodeInfo, error) {
var req_ _bindings.Message
resp_ := &controlDescribeResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(ControlDescribeOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(ControlDescribeOrdinal, req_, resp_, ControlDescribeOrdinal, ControlDescribeGenOrdinal)
return resp_.Info, err
}
@@ -422,7 +422,7 @@
func (p *ControlInterface) Sync() (int32, error) {
var req_ _bindings.Message
resp_ := &controlSyncResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(ControlSyncOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(ControlSyncOrdinal, req_, resp_, ControlSyncOrdinal, ControlSyncGenOrdinal)
return resp_.S, err
}
@@ -432,7 +432,7 @@
func (p *ControlInterface) GetAttr() (int32, fuchsiaio.NodeAttributes, error) {
var req_ _bindings.Message
resp_ := &controlGetAttrResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(ControlGetAttrOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(ControlGetAttrOrdinal, req_, resp_, ControlGetAttrOrdinal, ControlGetAttrGenOrdinal)
return resp_.S, resp_.Attributes, err
}
@@ -446,7 +446,7 @@
Attributes: attributes,
}
resp_ := &controlSetAttrResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(ControlSetAttrOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(ControlSetAttrOrdinal, req_, resp_, ControlSetAttrOrdinal, ControlSetAttrGenOrdinal)
return resp_.S, err
}
@@ -459,7 +459,7 @@
In: in,
}
resp_ := &controlIoctlResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(ControlIoctlOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(ControlIoctlOrdinal, req_, resp_, ControlIoctlOrdinal, ControlIoctlGenOrdinal)
return resp_.S, resp_.Handles, resp_.Out, err
}
@@ -469,7 +469,7 @@
Addr: addr,
}
resp_ := &controlBindResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(ControlBindOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(ControlBindOrdinal, req_, resp_, ControlBindOrdinal, ControlBindGenOrdinal)
return resp_.Code, err
}
@@ -479,7 +479,7 @@
Addr: addr,
}
resp_ := &controlConnectResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(ControlConnectOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(ControlConnectOrdinal, req_, resp_, ControlConnectOrdinal, ControlConnectGenOrdinal)
return resp_.Code, err
}
@@ -490,7 +490,7 @@
Backlog: backlog,
}
resp_ := &controlListenResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(ControlListenOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(ControlListenOrdinal, req_, resp_, ControlListenOrdinal, ControlListenGenOrdinal)
return resp_.Code, err
}
@@ -500,7 +500,7 @@
Flags: flags,
}
resp_ := &controlAcceptResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(ControlAcceptOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(ControlAcceptOrdinal, req_, resp_, ControlAcceptOrdinal, ControlAcceptGenOrdinal)
return resp_.Code, resp_.S, err
}
@@ -508,7 +508,7 @@
func (p *ControlInterface) GetSockName() (int16, []uint8, error) {
var req_ _bindings.Message
resp_ := &controlGetSockNameResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(ControlGetSockNameOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(ControlGetSockNameOrdinal, req_, resp_, ControlGetSockNameOrdinal, ControlGetSockNameGenOrdinal)
return resp_.Code, resp_.Addr, err
}
@@ -516,7 +516,7 @@
func (p *ControlInterface) GetPeerName() (int16, []uint8, error) {
var req_ _bindings.Message
resp_ := &controlGetPeerNameResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(ControlGetPeerNameOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(ControlGetPeerNameOrdinal, req_, resp_, ControlGetPeerNameOrdinal, ControlGetPeerNameGenOrdinal)
return resp_.Code, resp_.Addr, err
}
@@ -528,7 +528,7 @@
Optval: optval,
}
resp_ := &controlSetSockOptResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(ControlSetSockOptOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(ControlSetSockOptOrdinal, req_, resp_, ControlSetSockOptOrdinal, ControlSetSockOptGenOrdinal)
return resp_.Code, err
}
@@ -539,7 +539,7 @@
Optname: optname,
}
resp_ := &controlGetSockOptResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(ControlGetSockOptOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(ControlGetSockOptOrdinal, req_, resp_, ControlGetSockOptOrdinal, ControlGetSockOptGenOrdinal)
return resp_.Code, resp_.Optval, err
}
@@ -550,7 +550,7 @@
In: in,
}
resp_ := &controlIoctlPosixResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(ControlIoctlPosixOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(ControlIoctlPosixOrdinal, req_, resp_, ControlIoctlPosixOrdinal, ControlIoctlPosixGenOrdinal)
return resp_.Code, resp_.Out, err
}
@@ -872,7 +872,7 @@
Protocol: protocol,
}
resp_ := &providerSocketResponse{}
- err := ((*_bindings.ChannelProxy)(p)).Call(ProviderSocketOrdinal, req_, resp_)
+ err := ((*_bindings.ChannelProxy)(p)).Call(ProviderSocketOrdinal, req_, resp_, ProviderSocketOrdinal, ProviderSocketGenOrdinal)
return resp_.Code, resp_.S, err
}
