X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=util.c;h=803098cb2b81183eae8161a963ff27d7c0c5c8d6;hb=9c44ef13ed639445ee2e8a4037f7b3c5fcc11aa2;hp=12e52085735508950874bacc4af2dcce571a7a66;hpb=c72aa74324481a2ee642b1739baec10eb616cbca;p=secnet.git

diff --git a/util.c b/util.c
index 12e5208..803098c 100644
--- a/util.c
+++ b/util.c
@@ -204,7 +204,8 @@ static const char *phases[NR_PHASES]={
     "PHASE_GETRESOURCES",
     "PHASE_DROPPRIV",
     "PHASE_RUN",
-    "PHASE_SHUTDOWN"
+    "PHASE_SHUTDOWN",
+    "PHASE_CHILDPERSIST"
 };
 
 void enter_phase(uint32_t new_phase)
@@ -590,19 +591,22 @@ const char *iaddr_to_string(const union iaddr *ia)
     return bufs[b];
 }
 
-bool_t iaddr_equal(const union iaddr *ia, const union iaddr *ib)
+bool_t iaddr_equal(const union iaddr *ia, const union iaddr *ib,
+		   bool_t ignoreport)
 {
     if (ia->sa.sa_family != ib->sa.sa_family)
 	return 0;
     switch (ia->sa.sa_family) {
     case AF_INET:
 	return ia->sin.sin_addr.s_addr == ib->sin.sin_addr.s_addr
-	    && ia->sin.sin_port        == ib->sin.sin_port;
+           && (ignoreport ||
+	       ia->sin.sin_port        == ib->sin.sin_port);
 #ifdef CONFIG_IPV6
     case AF_INET6:
 	return !memcmp(&ia->sin6.sin6_addr, &ib->sin6.sin6_addr, 16)
-	    && ia->sin6.sin6_scope_id  == ib->sin6.sin6_scope_id
-	    && ia->sin6.sin6_port      == ib->sin6.sin6_port
+	   &&  ia->sin6.sin6_scope_id  == ib->sin6.sin6_scope_id
+           && (ignoreport ||
+	       ia->sin6.sin6_port      == ib->sin6.sin6_port)
 	    /* we ignore the flowinfo field */;
 #endif /* CONFIG_IPV6 */
     default: