Merge branch 'sd/epmd-stop-cli' into dev

* sd/epmd-stop-cli:
  allow epmd -stop name to unregister a client from epmd

3 files changed, 46 insertions, 4 deletions

diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c
index c509c49b39..6ddf30efe3 100644
--- a/erts/epmd/src/epmd.c
+++ b/erts/epmd/src/epmd.c
@@ -226,6 +226,12 @@ int main(int argc, char** argv)
 	    else
 		usage(g);
 	    epmd_cleanup_exit(g,0);
+	} else if (strcmp(argv[0], "-stop") == 0) {
+	    if (argc == 2)
+		stop_cli(g, argv[1]);
+	    else
+		usage(g);
+	    epmd_cleanup_exit(g,0);
 	}
 	else
 	    usage(g);
@@ -382,7 +388,7 @@ static void run_daemon(EpmdVars *g)
 static void usage(EpmdVars *g)
 {
     fprintf(stderr, "usage: epmd [-d|-debug] [DbgExtra...] [-port No] [-daemon]\n");
-    fprintf(stderr, "            [-d|-debug] [-port No] [-names|-kill]\n\n");
+    fprintf(stderr, "            [-d|-debug] [-port No] [-names|-kill|-stop name]\n\n");
     fprintf(stderr, "See the Erlang epmd manual page for info about the usage.\n");
     fprintf(stderr, "The -port and DbgExtra options are\n\n");
     fprintf(stderr, "    -port No\n");
diff --git a/erts/epmd/src/epmd_cli.c b/erts/epmd/src/epmd_cli.c
index c12f711bc5..2aed861390 100644
--- a/erts/epmd/src/epmd_cli.c
+++ b/erts/epmd/src/epmd_cli.c
@@ -54,6 +54,42 @@ void kill_epmd(EpmdVars *g)
     }
 }
 
+void stop_cli(EpmdVars *g, char *name)
+{
+    char buf[1024];
+    int fd, rval, bsize;
+
+    bsize = strlen(name);
+    if (bsize > 1000) {
+	printf("epmd: Name too long!");
+	epmd_cleanup_exit(g, 1);
+    }
+
+    fd = conn_to_epmd(g);
+    bsize++;
+    put_int16(bsize, buf);
+    buf[2] = EPMD_STOP_REQ;
+    bsize += 2;
+    strcpy(buf+3, name);
+
+    if (write(fd, buf, bsize) != bsize) {
+	printf("epmd: Can't write to epmd\n");
+	epmd_cleanup_exit(g,1);
+    }
+    if ((rval = read_fill(fd,buf,7)) == 7) {
+	buf[7] = '\000';
+	printf("%s\n", buf);
+	epmd_cleanup_exit(g,0);
+    } else if (rval < 0) {
+	printf("epmd: failed to read answer from local epmd\n");
+	epmd_cleanup_exit(g,1);
+    } else { 			/* rval is now 0 or 1 */
+	buf[rval] = '\0';
+	printf("epmd: local epmd responded with <%s>\n", buf);
+	epmd_cleanup_exit(g,1);
+    }
+}
+
 /* what == EPMD_NAMES_REQ || EPMD_DUMP_REQ */
 
 void epmd_call(EpmdVars *g,int what)
diff --git a/erts/epmd/src/epmd_srv.c b/erts/epmd/src/epmd_srv.c
index 34f657fb16..c836bf0bb7 100644
--- a/erts/epmd/src/epmd_srv.c
+++ b/erts/epmd/src/epmd_srv.c
@@ -591,7 +591,7 @@ static void do_request(g, fd, s, buf, bsize)
 	
       if (bsize <= 1)
 	{
-	  dbg_printf(g,0,"packet to small for request PORT2_REQ (%d)", bsize);
+	  dbg_printf(g,0,"packet too small for request PORT2_REQ (%d)", bsize);
 	  return;
 	}
 
@@ -740,7 +740,7 @@ static void do_request(g, fd, s, buf, bsize)
       dbg_printf(g,1,"** got STOP_REQ");
       if (bsize <= 1 )
 	{
-	  dbg_printf(g,0,"packet to small for request STOP_REQ (%d)",bsize);
+	  dbg_printf(g,0,"packet too small for request STOP_REQ (%d)",bsize);
 	  return;
 	}
 
@@ -902,7 +902,7 @@ static void node_init(EpmdVars *g)
 
 
 /* We have got a close on a connection and it may be a
-   EPMD_ALIVE_CLOSE_REQ. Note that this call shouild be called
+   EPMD_ALIVE_CLOSE_REQ. Note that this call should be called
    *before* calling conn_close() */
 
 static int node_unreg(EpmdVars *g,char *name)