4 files changed, 23 insertions, 17 deletions
diff --git a/lib/erl_interface/src/connect/ei_connect.c b/lib/erl_interface/src/connect/ei_connect.c
index 1b1479d2e9..f600758385 100644
--- a/lib/erl_interface/src/connect/ei_connect.c
+++ b/lib/erl_interface/src/connect/ei_connect.c
@@ -659,7 +659,7 @@ int ei_connect_xinit_ussi(ei_cnode* ec, const char *thishostname,
         return ERL_ERROR;
     }
     
-    ec->creation = creation & 0x3; /* 2 bits */
+    ec->creation = creation;
     
     if (cookie) {
 	if (strlen(cookie) >= sizeof(ec->ei_connect_cookie)) { 
@@ -698,7 +698,7 @@ int ei_connect_xinit_ussi(ei_cnode* ec, const char *thishostname,
     strcpy(ec->self.node,thisnodename);
     ec->self.num = 0;
     ec->self.serial = 0;
-    ec->self.creation = creation & 0x3; /* 2 bits */
+    ec->self.creation = creation;
 
     ec->cbs = cbs;
     ec->setup_context = setup_context;
diff --git a/lib/erl_interface/src/epmd/ei_epmd.h b/lib/erl_interface/src/epmd/ei_epmd.h
index ac153b6e66..597a955676 100644
--- a/lib/erl_interface/src/epmd/ei_epmd.h
+++ b/lib/erl_interface/src/epmd/ei_epmd.h
@@ -25,8 +25,8 @@
 #endif
 
 #ifndef EI_DIST_HIGH
-#define EI_DIST_HIGH 5 /* R4 and later */
-#define EI_DIST_LOW  1 /* R3 and earlier */
+#define EI_DIST_HIGH 6 /* OTP 23 and later */
+#define EI_DIST_LOW  5 /* OTP R4 - 22 */
 #endif
 
 #ifndef EPMD_PORT
@@ -45,6 +45,7 @@
 #ifndef EI_EPMD_ALIVE2_REQ
 #define EI_EPMD_ALIVE2_REQ  120
 #define EI_EPMD_ALIVE2_RESP 121
+#define EI_EPMD_ALIVE2_X_RESP 118
 #define EI_EPMD_PORT2_REQ   122
 #define EI_EPMD_PORT2_RESP  119
 #define EI_EPMD_STOP_REQ      's'
diff --git a/lib/erl_interface/src/epmd/epmd_publish.c b/lib/erl_interface/src/epmd/epmd_publish.c
index 20b8e867e8..ef8a5d6b70 100644
--- a/lib/erl_interface/src/epmd/epmd_publish.c
+++ b/lib/erl_interface/src/epmd/epmd_publish.c
@@ -68,7 +68,8 @@ static int ei_epmd_r4_publish (int port, const char *alive, unsigned ms)
   int nlen = strlen(alive);
   int len = elen + nlen + 13; /* hard coded: be careful! */
   int n;
-  int err, res, creation;
+  int err, response, res;
+  unsigned creation;
   ssize_t dlen;
   unsigned tmo = ms == 0 ? EI_SCLBK_INF_TMO : ms;
 
@@ -124,8 +125,10 @@ static int ei_epmd_r4_publish (int port, const char *alive, unsigned ms)
 
   /* Don't close fd here! It keeps us registered with epmd */
   s = buf;
-  if (((res=get8(s)) != EI_EPMD_ALIVE2_RESP)) {  /* response */
-    EI_TRACE_ERR1("ei_epmd_r4_publish","<- unknown (%d)",res);
+  response = get8(s);
+  if (response != EI_EPMD_ALIVE2_RESP &&
+      response != EI_EPMD_ALIVE2_X_RESP) {
+    EI_TRACE_ERR1("ei_epmd_r4_publish","<- unknown (%d)",response);
     EI_TRACE_ERR0("ei_epmd_r4_publish","-> CLOSE");
     ei_close__(fd);
     erl_errno = EIO;
@@ -141,18 +144,21 @@ static int ei_epmd_r4_publish (int port, const char *alive, unsigned ms)
     return -1;
   }
 
-  creation = get16be(s);
+  if (response == EI_EPMD_ALIVE2_RESP)
+      creation = get16be(s);
+  else /* EI_EPMD_ALIVE2_X_RESP */
+      creation = get32be(s);
 
   EI_TRACE_CONN2("ei_epmd_r4_publish",
-		 " result=%d (ok) creation=%d",res,creation);
+		 " result=%d (ok) creation=%u",res,creation);
 
-  /* probably should save fd so we can close it later... */
-  /* epmd_saveconn(OPEN,fd,alive); */
+  /*
+   * Would be nice to somehow use the nice "unique" creation value
+   * received here from epmd instead of using the crappy one
+   * passed (already) to ei_connect_init.
+   */
 
-  /* return the creation number, for no good reason */
-  /* return creation;*/
-
-  /* no - return the descriptor */
+  /* return the descriptor */
   return fd;
 }
 
diff --git a/lib/erl_interface/src/prog/erl_call.c b/lib/erl_interface/src/prog/erl_call.c
index ab91157035..dce2ecdec2 100644
--- a/lib/erl_interface/src/prog/erl_call.c
+++ b/lib/erl_interface/src/prog/erl_call.c
@@ -292,8 +292,7 @@ int erl_call(int argc, char **argv)
 	flags.cookie = NULL;
     }
 
-    /* FIXME decide how many bits etc or leave to connect_xinit? */
-    creation = (time(NULL) % 3) + 1; /* "random" */
+    creation = time(NULL) + 1; /* "random" */
 
     if (flags.hidden == NULL) {
       /* As default we are c17@gethostname */