syz-manager: factor out rpc serving part

Update #605

2 files changed, 8 insertions, 4 deletions

diff --git a/pkg/mgrconfig/mgrconfig.go b/pkg/mgrconfig/mgrconfig.go
index 8859ac7e8..595b2558b 100644
--- a/pkg/mgrconfig/mgrconfig.go
+++ b/pkg/mgrconfig/mgrconfig.go
@@ -261,7 +261,7 @@ func splitTarget(target string) (string, string, string, error) {
 	return os, vmarch, arch, nil
 }
 
-func ParseEnabledSyscalls(target *prog.Target, enabled, disabled []string) (map[int]bool, error) {
+func ParseEnabledSyscalls(target *prog.Target, enabled, disabled []string) ([]int, error) {
 	syscalls := make(map[int]bool)
 	if len(enabled) != 0 {
 		for _, c := range enabled {
@@ -296,7 +296,11 @@ func ParseEnabledSyscalls(target *prog.Target, enabled, disabled []string) (map[
 	if len(syscalls) == 0 {
 		return nil, fmt.Errorf("all syscalls are disabled by disable_syscalls in config")
 	}
-	return syscalls, nil
+	var arr []int
+	for id := range syscalls {
+		arr = append(arr, id)
+	}
+	return arr, nil
 }
 
 func matchSyscall(name, pattern string) bool {
diff --git a/pkg/rpctype/rpc.go b/pkg/rpctype/rpc.go
index 42cab2969..a7900bb13 100644
--- a/pkg/rpctype/rpc.go
+++ b/pkg/rpctype/rpc.go
@@ -20,13 +20,13 @@ type RPCServer struct {
 	s  *rpc.Server
 }
 
-func NewRPCServer(addr string, receiver interface{}) (*RPCServer, error) {
+func NewRPCServer(addr, name string, receiver interface{}) (*RPCServer, error) {
 	ln, err := net.Listen("tcp", addr)
 	if err != nil {
 		return nil, fmt.Errorf("failed to listen on %v: %v", addr, err)
 	}
 	s := rpc.NewServer()
-	if err := s.Register(receiver); err != nil {
+	if err := s.RegisterName(name, receiver); err != nil {
 		return nil, err
 	}
 	serv := &RPCServer{