syz-manager: factor out rpc serving part

Update #605

2 files changed, 4 insertions, 3 deletions

diff --git a/tools/syz-mutate/mutate.go b/tools/syz-mutate/mutate.go
index 63bc47ef5..b0361a20b 100644
--- a/tools/syz-mutate/mutate.go
+++ b/tools/syz-mutate/mutate.go
@@ -36,13 +36,14 @@ func main() {
 	}
 	var syscalls map[*prog.Syscall]bool
 	if *flagEnable != "" {
-		syscallsIDs, err := mgrconfig.ParseEnabledSyscalls(target, strings.Split(*flagEnable, ","), nil)
+		enabled := strings.Split(*flagEnable, ",")
+		syscallsIDs, err := mgrconfig.ParseEnabledSyscalls(target, enabled, nil)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "failed to parse enabled syscalls: %v", err)
 			os.Exit(1)
 		}
 		syscalls = make(map[*prog.Syscall]bool)
-		for id := range syscallsIDs {
+		for _, id := range syscallsIDs {
 			syscalls[target.Syscalls[id]] = true
 		}
 		var disabled map[*prog.Syscall]string
diff --git a/tools/syz-runtest/runtest.go b/tools/syz-runtest/runtest.go
index b21852299..54be07703 100644
--- a/tools/syz-runtest/runtest.go
+++ b/tools/syz-runtest/runtest.go
@@ -71,7 +71,7 @@ func main() {
 		reqMap:           make(map[int]*runtest.RunRequest),
 		lastReq:          make(map[string]int),
 	}
-	s, err := rpctype.NewRPCServer(cfg.RPC, mgr)
+	s, err := rpctype.NewRPCServer(cfg.RPC, "Manager", mgr)
 	if err != nil {
 		log.Fatalf("failed to create rpc server: %v", err)
 	}