libceph: use CEPH_MON_PORT when the specified port is 0
authorIlya Dryomov <ilya.dryomov@inktank.com>
Mon, 30 Dec 2013 17:21:29 +0000 (19:21 +0200)
committerIlya Dryomov <ilya.dryomov@inktank.com>
Tue, 31 Dec 2013 18:32:30 +0000 (20:32 +0200)
Similar to userspace, don't bail with "parse_ips bad ip ..." if the
specified port is port 0, instead use port CEPH_MON_PORT (6789, the
default monitor port).

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
net/ceph/messenger.c

index bd172e1..d2cadb5 100644 (file)
@@ -1866,7 +1866,9 @@ int ceph_parse_ips(const char *c, const char *end,
                                port = (port * 10) + (*p - '0');
                                p++;
                        }
-                       if (port > 65535 || port == 0)
+                       if (port == 0)
+                               port = CEPH_MON_PORT;
+                       else if (port > 65535)
                                goto bad;
                } else {
                        port = CEPH_MON_PORT;