diff options
author | Rickard Green <[email protected]> | 2019-01-24 17:51:08 +0100 |
---|---|---|
committer | Rickard Green <[email protected]> | 2019-01-24 17:51:08 +0100 |
commit | 1ff44ec786828c3eeb2114cfeb5dd47e1a7fae61 (patch) | |
tree | d4bcae227e9aa7e56edfe84c4c58b253510b2773 /lib/erl_interface/src/epmd/epmd_unpublish.c | |
parent | a4aeacd28e4e31d3d79b091afcdc528082be2865 (diff) | |
parent | a4641c5b3469d2e3cb9b0937ed941748fbbf2036 (diff) | |
download | otp-1ff44ec786828c3eeb2114cfeb5dd47e1a7fae61.tar.gz otp-1ff44ec786828c3eeb2114cfeb5dd47e1a7fae61.tar.bz2 otp-1ff44ec786828c3eeb2114cfeb5dd47e1a7fae61.zip |
Merge branch 'rickard/ei-ext-maint/OTP-15442' into maint
* rickard/ei-ext-maint/OTP-15442:
Pluggable distribution socket implementation for EI
Diffstat (limited to 'lib/erl_interface/src/epmd/epmd_unpublish.c')
-rw-r--r-- | lib/erl_interface/src/epmd/epmd_unpublish.c | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/lib/erl_interface/src/epmd/epmd_unpublish.c b/lib/erl_interface/src/epmd/epmd_unpublish.c index 255d0ffb59..c112f74147 100644 --- a/lib/erl_interface/src/epmd/epmd_unpublish.c +++ b/lib/erl_interface/src/epmd/epmd_unpublish.c @@ -58,7 +58,9 @@ int ei_unpublish_tmo(const char *alive, unsigned ms) char buf[EPMDBUF]; char *s = (char*)buf; int len = 1 + strlen(alive); - int fd, res; + int fd, err; + ssize_t dlen; + unsigned tmo = ms == 0 ? EI_SCLBK_INF_TMO : ms; if (len > sizeof(buf)-3) { erl_errno = ERANGE; @@ -72,20 +74,29 @@ int ei_unpublish_tmo(const char *alive, unsigned ms) /* FIXME can't connect, return success?! At least commen whats up */ if ((fd = ei_epmd_connect_tmo(NULL,ms)) < 0) return fd; - if ((res = ei_write_fill_t(fd, buf, len+2,ms)) != len+2) { - closesocket(fd); - erl_errno = (res == -2) ? ETIMEDOUT : EIO; - return -1; + dlen = (ssize_t) len+2; + err = ei_write_fill_t__(fd, buf, &dlen, tmo); + if (!err && dlen != (ssize_t) len + 2) + erl_errno = EIO; + if (err) { + ei_close__(fd); + EI_CONN_SAVE_ERRNO__(err); + return -1; } EI_TRACE_CONN1("ei_unpublish_tmo","-> STOP %s",alive); - - if ((res = ei_read_fill_t(fd, buf, 7, ms)) != 7) { - closesocket(fd); - erl_errno = (res == -2) ? ETIMEDOUT : EIO; - return -1; + + dlen = (ssize_t) 7; + err = ei_read_fill_t__(fd, buf, &dlen, tmo); + if (!err && dlen != (ssize_t) 7) + erl_errno = EIO; + if (err) { + ei_close__(fd); + EI_CONN_SAVE_ERRNO__(err); + return -1; } - closesocket(fd); + + ei_close__(fd); buf[7]=(char)0; /* terminate the string */ if (!strcmp("STOPPED",(char *)buf)) { |