diff --git a/src/lib/core/sio.c b/src/lib/core/sio.c
index 3e1b7e784ab8aec1c785dd9a54fc14ac1713863c..efb0782886364c643869ae423d9c963e42b1928e 100644
--- a/src/lib/core/sio.c
+++ b/src/lib/core/sio.c
@@ -338,11 +338,12 @@ sio_strfaddr(const struct sockaddr *addr, socklen_t addrlen)
}
int
-sio_uri_to_addr(const char *uri, struct sockaddr *addr)
+sio_uri_to_addr(const char *uri, struct sockaddr *addr, bool *is_host_empty)
{
struct uri u;
if (uri_parse(&u, uri) != 0 || u.service == NULL)
goto invalid_uri;
+ *is_host_empty = u.host_len == 0;
if (u.host_len == strlen(URI_HOST_UNIX) &&
memcmp(u.host, URI_HOST_UNIX, u.host_len) == 0) {
struct sockaddr_un *un = (struct sockaddr_un *) addr;
diff --git a/src/lib/core/sio.h b/src/lib/core/sio.h
index 093b5f5baa6c4245814ed5b5ac5fdf7a3dc3eee4..db2e3281fa6b9a0af80e7ffe6befbefeae0ce5bf 100644
--- a/src/lib/core/sio.h
+++ b/src/lib/core/sio.h
@@ -223,7 +223,7 @@ ssize_t sio_recvfrom(int fd, void *buf, size_t len, int flags,
* sockaddr_in/un structure.
*/
int
-sio_uri_to_addr(const char *uri, struct sockaddr *addr);
+sio_uri_to_addr(const char *uri, struct sockaddr *addr, bool *is_host_empty);
#if defined(__cplusplus)
} /* extern "C" */
diff --git a/src/lib/swim/swim.c b/src/lib/swim/swim.c
index a0c30a9c1a41473bd3021141951cd87288855f77..fa6b3a3792e3413cdac9c9ab074988cbc7db4544 100644
--- a/src/lib/swim/swim.c
+++ b/src/lib/swim/swim.c
@@ -1699,7 +1699,9 @@ swim_uri_to_addr(const char *uri, struct sockaddr_in *addr,
const char *prefix)
{
struct sockaddr_storage storage;
- if (sio_uri_to_addr(uri, (struct sockaddr *) &storage) != 0)
+ bool is_host_empty;
+ if (sio_uri_to_addr(uri, (struct sockaddr *) &storage,
+ &is_host_empty) != 0)
return -1;
if (storage.ss_family != AF_INET) {
diag_set(IllegalParams, "%s only IP sockets are supported",
@@ -1707,7 +1709,30 @@ swim_uri_to_addr(const char *uri, struct sockaddr_in *addr,
return -1;
}
*addr = *((struct sockaddr_in *) &storage);
- if (addr->sin_addr.s_addr == 0) {
+ if (is_host_empty) {
+ /*
+ * This condition is satisfied when host is
+ * omitted and URI is "port". Note, that
+ * traditionally "port" is converted to
+ * "0.0.0.0:port" what means binding to all the
+ * interfaces simultaneously, but it would not
+ * work for SWIM. There is why:
+ *
+ * - Different instances interacting with this
+ * one via not the same interface would see
+ * different source IP addresses. It would
+ * mess member tables;
+ *
+ * - This instance would not be able to encode
+ * its IP address in the meta section,
+ * because it has no a fixed IP. At the same
+ * time omission of it and usage of UDP
+ * header source address is not possible as
+ * well, because UDP header is not encrypted
+ * and therefore is not safe to look at.
+ */
+ addr->sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+ } else if (addr->sin_addr.s_addr == 0) {
diag_set(IllegalParams, "%s INADDR_ANY is not supported",
prefix);
return -1;
diff --git a/src/lib/swim/swim.h b/src/lib/swim/swim.h
index daa91b267765cc5e67129b58da5421dc5b313738..331bd14f04637515eb1fc5b1252370ecc46aad95 100644
--- a/src/lib/swim/swim.h
+++ b/src/lib/swim/swim.h
@@ -76,7 +76,8 @@ swim_is_configured(const struct swim *swim);
* Configure or reconfigure a SWIM instance.
*
* @param swim SWIM instance to configure.
- * @param uri URI in the format "ip:port".
+ * @param uri URI in the format "ip:port", or "port". In the
+ * latter case host is "127.0.0.1" by default.
* @param heartbeat_rate Rate of sending round messages. It does
* not mean that each member will be checked each
* @heartbeat_rate seconds. It is rather the protocol
diff --git a/test/unit/sio.c b/test/unit/sio.c
index dffdd5592d100c8addf71c3373b4fe9a6ed9e81d..4ded96f4a0c2c07339e2cae14298c89a3a926beb 100644
--- a/test/unit/sio.c
+++ b/test/unit/sio.c
@@ -39,40 +39,49 @@ static void
check_uri_to_addr(void)
{
header();
- plan(18);
+ plan(22);
+ bool is_host_empty;
struct sockaddr_storage storage;
struct sockaddr *addr = (struct sockaddr *) &storage;
struct sockaddr_un *un = (struct sockaddr_un *) addr;
struct sockaddr_in *in = (struct sockaddr_in *) addr;
- isnt(0, sio_uri_to_addr("invalid uri", addr),
+ isnt(0, sio_uri_to_addr("invalid uri", addr, &is_host_empty),
"invalid uri is detected");
char long_path[1000];
char *pos = long_path + sprintf(long_path, "unix/:/");
memset(pos, 'a', 900);
pos[900] = 0;
- isnt(0, sio_uri_to_addr(long_path, addr), "too long UNIX path");
+ isnt(0, sio_uri_to_addr(long_path, addr, &is_host_empty),
+ "too long UNIX path");
- is(0, sio_uri_to_addr("unix/:/normal_path", addr), "UNIX");
+ is(0, sio_uri_to_addr("unix/:/normal_path", addr, &is_host_empty),
+ "UNIX");
is(0, strcmp(un->sun_path, "/normal_path"), "UNIX path");
is(AF_UNIX, un->sun_family, "UNIX family");
+ ok(! is_host_empty, "unix host is not empty");
- is(0, sio_uri_to_addr("localhost:1234", addr), "localhost");
+ is(0, sio_uri_to_addr("localhost:1234", addr, &is_host_empty),
+ "localhost");
is(AF_INET, in->sin_family, "localhost family");
is(htonl(INADDR_LOOPBACK), in->sin_addr.s_addr, "localhost address");
is(htons(1234), in->sin_port, "localhost port");
+ ok(! is_host_empty, "'localhost' host is not empty");
- is(0, sio_uri_to_addr("5678", addr), "'any'");
+ is(0, sio_uri_to_addr("5678", addr, &is_host_empty), "'any'");
is(AF_INET, in->sin_family, "'any' family");
is(htonl(INADDR_ANY), in->sin_addr.s_addr, "'any' address");
is(htons(5678), in->sin_port, "'any' port");
+ ok(is_host_empty, "only port specified - host is empty");
- is(0, sio_uri_to_addr("192.168.0.1:9101", addr), "IP");
+ is(0, sio_uri_to_addr("192.168.0.1:9101", addr, &is_host_empty), "IP");
is(AF_INET, in->sin_family, "IP family");
is(inet_addr("192.168.0.1"), in->sin_addr.s_addr, "IP address");
is(htons(9101), in->sin_port, "IP port");
+ ok(! is_host_empty, "IPv4 host is not empty");
- isnt(0, sio_uri_to_addr("192.168.0.300:1112", addr), "invalid IP");
+ isnt(0, sio_uri_to_addr("192.168.0.300:1112", addr, &is_host_empty),
+ "invalid IP");
check_plan();
footer();
@@ -84,9 +93,11 @@ check_auto_bind(void)
header();
plan(3);
+ bool is_host_empty;
struct sockaddr_in addr;
socklen_t addrlen = sizeof(addr);
- sio_uri_to_addr("127.0.0.1:0", (struct sockaddr *) &addr);
+ sio_uri_to_addr("127.0.0.1:0", (struct sockaddr *) &addr,
+ &is_host_empty);
int fd = sio_socket(AF_INET, SOCK_STREAM, 0);
is(sio_bind(fd, (struct sockaddr *) &addr, sizeof(addr)), 0,
"bind to 0 works");
diff --git a/test/unit/sio.result b/test/unit/sio.result
index e5712ad3ccf03b24e7f5bb80e39b4051dd5d8f4d..896736bf9522600918cb07c31bb8f953ce218a07 100644
--- a/test/unit/sio.result
+++ b/test/unit/sio.result
@@ -1,25 +1,29 @@
*** main ***
1..2
*** check_uri_to_addr ***
- 1..18
+ 1..22
ok 1 - invalid uri is detected
ok 2 - too long UNIX path
ok 3 - UNIX
ok 4 - UNIX path
ok 5 - UNIX family
- ok 6 - localhost
- ok 7 - localhost family
- ok 8 - localhost address
- ok 9 - localhost port
- ok 10 - 'any'
- ok 11 - 'any' family
- ok 12 - 'any' address
- ok 13 - 'any' port
- ok 14 - IP
- ok 15 - IP family
- ok 16 - IP address
- ok 17 - IP port
- ok 18 - invalid IP
+ ok 6 - unix host is not empty
+ ok 7 - localhost
+ ok 8 - localhost family
+ ok 9 - localhost address
+ ok 10 - localhost port
+ ok 11 - 'localhost' host is not empty
+ ok 12 - 'any'
+ ok 13 - 'any' family
+ ok 14 - 'any' address
+ ok 15 - 'any' port
+ ok 16 - only port specified - host is empty
+ ok 17 - IP
+ ok 18 - IP family
+ ok 19 - IP address
+ ok 20 - IP port
+ ok 21 - IPv4 host is not empty
+ ok 22 - invalid IP
ok 1 - subtests
*** check_uri_to_addr: done ***
*** check_auto_bind ***