mount.ceph: use common implementations of secret handling and address resolving

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 127b941a34d3c077dc5b83345c616fd77aa90a77..118ac544dcef2a4e13ef5e53c311109cc484fed1 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -97,7 +97,7 @@ osdmaptool_SOURCES = osdmaptool.cc
 osdmaptool_LDADD = libcrush.a libcommon.a -lpthread -lm $(CRYPTO_LIBS) $(EXTRALIBS)
 bin_PROGRAMS += monmaptool crushtool osdmaptool
 
-mount_ceph_SOURCES = mount/mount.ceph.c common/armor.c common/secret.c
+mount_ceph_SOURCES = mount/mount.ceph.c common/armor.c common/secret.c include/addr_parsing.c
 mount_ceph_LDADD = -lkeyutils
 sbin_PROGRAMS += mount.ceph
 

diff --git a/src/mount/mount.ceph.c b/src/mount/mount.ceph.c
index 9f390fa7b64504f021b4a9f6ee20538f80d13367..cab21b723646a5bf4fedd4dcf6a35e7a7ffb3264 100755 (executable)
--- a/src/mount/mount.ceph.c
+++ b/src/mount/mount.ceph.c
@@ -1,21 +1,18 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <netdb.h>
 #include <errno.h>
 #include <sys/mount.h>
-#include <keyutils.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 
-#include "common/armor.h"
 #include "common/secret.h"
+#include "include/addr_parsing.h"
 
 #ifndef MS_RELATIME
 # define MS_RELATIME (1<<21)
 #endif
 
-#define BUF_SIZE 128
 #define MAX_SECRET_LEN 1000
 #define MAX_SECRET_OPTION_LEN (MAX_SECRET_LEN + 7)
 
@@ -37,35 +34,13 @@ static void block_signals (int how)
      sigprocmask (how, &sigs, (sigset_t *) 0);
 }
 
-
-static int safe_cat(char **pstr, int *plen, int pos, const char *str2)
-{
-       int len2 = strlen(str2);
-
-       while (*plen < pos + len2 + 1) {
-               *plen += BUF_SIZE;
-               *pstr = realloc(*pstr, (size_t)*plen);
-
-               if (!*pstr) {
-                       printf("Out of memory\n");
-                       exit(1);
-               }
-       }
-
-       strcpy((*pstr)+pos, str2);
-
-       return pos + len2;
-}
-
 static char *mount_resolve_src(const char *orig_str)
 {
-       char *new_str;
-       char *mount_path;
-       char *tok, *p, *port_str;
        int len, pos;
+       char *mount_path;
+       char *src;
        char buf[strlen(orig_str) + 1];
        strcpy(buf, orig_str);
-
        mount_path = strrchr(buf, ':');
        if (!mount_path) {
                printf("source mount path was not specified\n");
@@ -84,99 +59,15 @@ static char *mount_resolve_src(const char *orig_str)
                return NULL;
        }
 
-       len = BUF_SIZE;
-       new_str = (char *)malloc(len);
-
-       p = new_str;
-       pos = 0;
-
-       tok = strtok(buf, ",");
-
-       while (tok) {
-               struct addrinfo hint;
-               struct addrinfo *res, *ores;
-               char *firstcolon, *lastcolon, *bracecolon;
-               int r;
-               int brackets = 0;
-
-               firstcolon = strchr(tok, ':');
-               lastcolon = strrchr(tok, ':');
-               bracecolon = strstr(tok, "]:");
-
-               port_str = 0;
-               if (firstcolon && firstcolon == lastcolon) {
-                       /* host:port or a.b.c.d:port */
-                       *firstcolon = 0;
-                       port_str = firstcolon + 1;
-               } else if (bracecolon) {
-                       /* {ipv6addr}:port */
-                       port_str = bracecolon + 1;
-                       *port_str = 0;
-                       port_str++;
-               }
-               if (port_str && !*port_str)
-                       port_str = NULL;
-
-               if (*tok == '[' &&
-                   tok[strlen(tok)-1] == ']') {
-                       tok[strlen(tok)-1] = 0;
-                       tok++;
-                       brackets = 1;
-               }                       
-
-               /*printf("name '%s' port '%s'\n", tok, port_str);*/
-
-               memset(&hint, 0, sizeof(hint));
-               hint.ai_socktype = SOCK_STREAM;
-               hint.ai_protocol = IPPROTO_TCP;
-
-               r = getaddrinfo(tok, port_str, &hint, &res);
-               if (r < 0) {
-                       printf("server name not found: %s (%s)\n", tok, strerror(errno));
-                       free(new_str);
-                       return 0;
-               }
-
-               /* build resolved addr list */
-               ores = res;
-               while (res) {
-                       char host[40], port[40];
-                       getnameinfo(res->ai_addr, res->ai_addrlen,
-                                   host, sizeof(host),
-                                   port, sizeof(port),
-                                   NI_NUMERICSERV | NI_NUMERICHOST);
-                       /*printf(" host %s port %s flags %d family %d socktype %d proto %d sanonname %s\n",
-                              host, port,
-                              res->ai_flags, res->ai_family, res->ai_socktype, res->ai_protocol,
-                              res->ai_canonname);*/
-                       if (res->ai_family == AF_INET6)
-                               brackets = 1;  /* always surround ipv6 addrs with brackets */
-                       if (brackets)
-                               pos = safe_cat(&new_str, &len, pos, "[");
-                       pos = safe_cat(&new_str, &len, pos, host);
-                       if (brackets)
-                               pos = safe_cat(&new_str, &len, pos, "]");
-                       if (port_str) {
-                               pos = safe_cat(&new_str, &len, pos, ":");
-                               pos = safe_cat(&new_str, &len, pos, port);
-                       }
-                       res = res->ai_next;
-                       if (res)
-                               pos = safe_cat(&new_str, &len, pos, ",");
-               }
-               freeaddrinfo(ores);
-
-               tok = strtok(NULL, ",");
-               if (tok)
-                       pos = safe_cat(&new_str, &len, pos, ",");
-
-       }
+       src = resolve_addrs(buf);
+       if (!src)
+               return NULL;
 
-       pos = safe_cat(&new_str, &len, pos, ":");
-       pos = safe_cat(&new_str, &len, pos, mount_path);
+       len = strlen(src);
+       pos = safe_cat(&src, &len, len, ":");
+       safe_cat(&src, &len, pos, mount_path);
 
-       /*printf("new_str is '%s'\n", new_str);*/
-       return new_str;
+       return src;
 }
 
 /*