From: Greg Farnum <gregf@hq.newdream.net>
Date: Tue, 14 Sep 2010 17:56:49 +0000 (-0700)
Subject: addr_parsing: make more resilient; turn down debugging
X-Git-Tag: v0.22~162
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=409bc411f0c21db2c47d45b8044aa89d66e7b02d;p=ceph.git

addr_parsing: make more resilient; turn down debugging
---

diff --git a/src/include/addr_parsing.h b/src/include/addr_parsing.h
index 00bc1998819a..f70daf8d7484 100644
--- a/src/include/addr_parsing.h
+++ b/src/include/addr_parsing.h
@@ -38,21 +38,14 @@ char *mount_resolve_dest(char *orig_str)
         int len, pos;
 
         mount_path = strrchr(orig_str, ':');
-        if (!mount_path) {
-                printf("source mount path was not specified\n");
-                return NULL;
-        }
         if (mount_path == orig_str) {
                 printf("server address expected\n");
                 return NULL;
         }
 
-        *mount_path = '\0';
-        mount_path++;
-
-        if (!*mount_path) {
-                printf("incorrect source mount path\n");
-                return NULL;
+        if (mount_path) {
+          *mount_path = '\0';
+          mount_path++;
         }
 
         len = BUF_SIZE;
@@ -95,7 +88,7 @@ char *mount_resolve_dest(char *orig_str)
                         brackets = 1;
                 }
 
-                printf("name '%s' port '%s'\n", tok, port_str);
+                //printf("name '%s' port '%s'\n", tok, port_str);
 
                 memset(&hint, 0, sizeof(hint));
                 hint.ai_socktype = SOCK_STREAM;
@@ -116,10 +109,10 @@ char *mount_resolve_dest(char *orig_str)
                                     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",
+                        /*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);
+                               res->ai_canonname);*/
                         if (res->ai_family == AF_INET6)
                                 brackets = 1;  /* always surround ipv6 addrs with brackets */
                         if (brackets)
@@ -143,10 +136,12 @@ char *mount_resolve_dest(char *orig_str)
 
         }
 
-        pos = safe_cat(&new_str, &len, pos, ":");
-        pos = safe_cat(&new_str, &len, pos, mount_path);
+        if (mount_path) {
+          pos = safe_cat(&new_str, &len, pos, ":");
+          pos = safe_cat(&new_str, &len, pos, mount_path);
+        }
 
-        printf("new_str is '%s'\n", new_str);
+        //printf("new_str is '%s'\n", new_str);
         return new_str;
 }