Correct erl_global{register, unregister} functions

C node needs DFLAG_DIST_MONITOR flag set when connecting,
and support for processing monitoring start/end messages
received from counterpart, to make global registration
actually work.

2 files changed, 18 insertions, 6 deletions

diff --git a/lib/erl_interface/src/legacy/global_register.c b/lib/erl_interface/src/legacy/global_register.c
index 3a4de8b08e..f12eb6b448 100644
--- a/lib/erl_interface/src/legacy/global_register.c
+++ b/lib/erl_interface/src/legacy/global_register.c
@@ -31,7 +31,7 @@ int erl_global_register(int fd, const char *name, ETERM *pid)
   int index = 0;
   erlang_pid self;
   erlang_msg msg;
-  int needlink, needatom;
+  int needlink, needatom, needmonitor;
   int arity;
   int version;
   int msglen;
@@ -65,7 +65,7 @@ int erl_global_register(int fd, const char *name, ETERM *pid)
   if (ei_send_reg_encoded(fd,&self,"rex",buf,index)) return -1;
 
   /* get the reply: expect link and an atom, or just an atom */
-  needlink = needatom = 1;
+  needlink = needatom = needmonitor = 1;
   while (1) {
     /* get message */
     while (1) {
@@ -78,9 +78,15 @@ int erl_global_register(int fd, const char *name, ETERM *pid)
     case ERL_LINK:
       /* got link */
       if (!needlink) return -1;
-	needlink = 0;
+      needlink = 0;
       break;
       
+    case ERL_MONITOR_P-10:
+      /* got monitor */
+	if (!needmonitor) { return -1;}
+	needmonitor = 0;
+      break;
+
     case ERL_SEND:
       /* got message - does it contain our atom? */
       if (!needatom) return -1;
diff --git a/lib/erl_interface/src/legacy/global_unregister.c b/lib/erl_interface/src/legacy/global_unregister.c
index 514dbc3c68..97a1c2d03c 100644
--- a/lib/erl_interface/src/legacy/global_unregister.c
+++ b/lib/erl_interface/src/legacy/global_unregister.c
@@ -37,7 +37,7 @@ int erl_global_unregister(int fd, const char *name)
   erlang_msg msg;
   int i;
   int version,arity,msglen;
-  int needunlink, needatom;
+  int needunlink, needatom, needdemonitor;
 
   /* make a self pid */
   self->num = fd;
@@ -57,7 +57,7 @@ int erl_global_unregister(int fd, const char *name)
   if (ei_send_reg_encoded(fd,self,"rex",buf,index)) return -1;
 
   /* get the reply: expect unlink and an atom, or just an atom */
-  needunlink = needatom = 1;
+  needunlink = needatom = needdemonitor = 1;
   while (1) {
     /* get message */
     while (1) {
@@ -68,11 +68,17 @@ int erl_global_unregister(int fd, const char *name)
 
     switch (i) {
     case ERL_UNLINK:
-      /* got link */
+      /* got unlink */
       if (!needunlink) return -1;
       needunlink = 0;
       break;
 
+    case ERL_DEMONITOR_P-10:
+      /* got demonitor */
+      if (!needdemonitor) return -1;
+      needdemonitor = 0;
+      break;
+
     case ERL_SEND:
       /* got message - does it contain our atom? */
       if (!needatom) return -1;