fixbug#116 rpc:call from [Erlang/OTP24] to [Ergo/Go 1.19] is not working

leonlee2013 · Dec 3, 2022 · a98e834 · a98e834
1 parent 73feb27
commit a98e834
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/node/core.go b/node/core.go
@@ -894,7 +894,7 @@ func (c *core) RouteSpawnRequest(node string, behaviorName string, request gen.R
 
 		// spawn new process
 		process_opts := processOptions{}
-		process_opts.Env = map[gen.EnvKey]interface{}{EnvKeyRemoteSpawn: request.Options}
+		process_opts.Env = map[gen.EnvKey]interface{}{EnvKeyRemoteSpawn: request.Options, "ergo:RemoteSpawnRequest": request}
 		process, err_spawn := c.spawn(request.Options.Name, process_opts, b.Behavior, args...)
 
 		// reply

diff --git a/proto/dist/proto.go b/proto/dist/proto.go
@@ -1297,12 +1297,11 @@ func (dc *distConnection) handleMessage(message *distMessage) (err error) {
 				registerName := ""
 				for _, option := range t.Element(6).(etf.List) {
 					name, ok := option.(etf.Tuple)
-					if !ok || len(name) != 2 {
-						return fmt.Errorf("malformed spawn request")
-					}
-					switch name.Element(1) {
-					case etf.Atom("name"):
-						registerName = string(name.Element(2).(etf.Atom))
+					if ok || len(name) == 2 {
+						switch name.Element(1) {
+						case etf.Atom("name"):
+							registerName = string(name.Element(2).(etf.Atom))
+						}
 					}
 				}
 
@@ -1323,6 +1322,10 @@ func (dc *distConnection) handleMessage(message *distMessage) (err error) {
 					}
 				}
 
+				if registerName == "" && module == etf.Atom("erpc") {
+					registerName = "erpc"
+				}
+
 				spawnRequestOptions := gen.RemoteSpawnOptions{
 					Name:     registerName,
 					Function: string(function),