You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2011/06/05 11:23:29 UTC

svn commit: r1132312 - /incubator/mesos/trunk/third_party/libprocess/pid.cpp

Author: benh
Date: Sun Jun  5 09:23:29 2011
New Revision: 1132312

URL: http://svn.apache.org/viewvc?rev=1132312&view=rev
Log:
Updated parsing of pids to account for bad DNS resolutions (e.g., sometimes DNS fails and will return nothing).

Modified:
    incubator/mesos/trunk/third_party/libprocess/pid.cpp

Modified: incubator/mesos/trunk/third_party/libprocess/pid.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/pid.cpp?rev=1132312&r1=1132311&r2=1132312&view=diff
==============================================================================
--- incubator/mesos/trunk/third_party/libprocess/pid.cpp (original)
+++ incubator/mesos/trunk/third_party/libprocess/pid.cpp Sun Jun  5 09:23:29 2011
@@ -77,7 +77,7 @@ istream& operator >> (istream& stream, U
     return stream;
   }
 
-  if (str.size() > 512) {
+  if (str.size() == 0) {
     stream.setstate(std::ios_base::badbit);
     return stream;
   }
@@ -106,8 +106,13 @@ istream& operator >> (istream& stream, U
     return stream;
   }
 
-  hostent *he = gethostbyname2(host.c_str(), AF_INET);
-  if (!he) {
+  hostent* he = gethostbyname2(host.c_str(), AF_INET);
+  if (he == NULL) {
+    stream.setstate(std::ios_base::badbit);
+    return stream;
+  }
+
+  if (he->h_addr_list[0] == NULL) {
     stream.setstate(std::ios_base::badbit);
     return stream;
   }
@@ -120,7 +125,7 @@ istream& operator >> (istream& stream, U
   }
 
   pid.id = id;
-  pid.ip = *((uint32_t *) he->h_addr);
+  pid.ip = *((uint32_t*) he->h_addr_list[0]);
   pid.port = port;
 
   return stream;