From owner-svn-src-all@FreeBSD.ORG  Sun Apr 17 06:05:38 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 602201065670;
	Sun, 17 Apr 2011 06:05:38 +0000 (UTC)
	(envelope-from sobomax@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3577F8FC14;
	Sun, 17 Apr 2011 06:05:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p3H65cjI028892;
	Sun, 17 Apr 2011 06:05:38 GMT (envelope-from sobomax@svn.freebsd.org)
Received: (from sobomax@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3H65cab028890;
	Sun, 17 Apr 2011 06:05:38 GMT (envelope-from sobomax@svn.freebsd.org)
Message-Id: <201104170605.p3H65cab028890@svn.freebsd.org>
From: Maxim Sobolev <sobomax@FreeBSD.org>
Date: Sun, 17 Apr 2011 06:05:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220736 - head/sbin/natd
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Apr 2011 06:05:38 -0000

Author: sobomax
Date: Sun Apr 17 06:05:37 2011
New Revision: 220736
URL: http://svn.freebsd.org/changeset/base/220736

Log:
  If we can retrieve interface address sleep for one second and try again.
  This can happen during start-up, when natd starts before dhclient has a
  chance to receive IP address from the upstream provider.
  
  MFC after:	2 weeks

Modified:
  head/sbin/natd/natd.c

Modified: head/sbin/natd/natd.c
==============================================================================
--- head/sbin/natd/natd.c	Sun Apr 17 02:44:51 2011	(r220735)
+++ head/sbin/natd/natd.c	Sun Apr 17 06:05:37 2011	(r220736)
@@ -111,7 +111,7 @@ static void	Usage (void);
 static char*	FormatPacket (struct ip*);
 static void	PrintPacket (struct ip*);
 static void	SyslogPacket (struct ip*, int priority, const char *label);
-static void	SetAliasAddressFromIfName (const char *ifName);
+static int	SetAliasAddressFromIfName (const char *ifName);
 static void	InitiateShutdown (int);
 static void	Shutdown (int);
 static void	RefreshAddr (int);
@@ -156,6 +156,7 @@ int main (int argc, char** argv)
 	struct sockaddr_in	addr;
 	fd_set			readMask;
 	int			fdMax;
+	int			rval;
 /* 
  * Initialize packet aliasing software.
  * Done already here to be able to alter option bits
@@ -301,8 +302,15 @@ int main (int argc, char** argv)
 
 				mip->assignAliasAddr = 1;
 			}
-			else
-				SetAliasAddressFromIfName (mip->ifName);
+			else {
+				do {
+					rval = SetAliasAddressFromIfName (mip->ifName);
+					if (rval == -2)
+						sleep(1);
+				} while (rval == -2);
+				if (rval != 0)
+					exit(1);
+			}
 		}
 
 	}
@@ -531,7 +539,8 @@ static void DoGlobal (int fd)
 
 #if 0
 	if (mip->assignAliasAddr) {
-		SetAliasAddressFromIfName (mip->ifName);
+		if (SetAliasAddressFromIfName (mip->ifName) != 0)
+			exit(1);
 		mip->assignAliasAddr = 0;
 	}
 #endif
@@ -634,10 +643,16 @@ static void DoAliasing (int fd, int dire
 	socklen_t		addrSize;
 	struct ip*		ip;
 	char			msgBuf[80];
+	int			rval;
 
 	if (mip->assignAliasAddr) {
-
-		SetAliasAddressFromIfName (mip->ifName);
+		do {
+			rval = SetAliasAddressFromIfName (mip->ifName);
+			if (rval == -2)
+				sleep(1);
+		} while (rval == -2);
+		if (rval != 0)
+			exit(1);
 		mip->assignAliasAddr = 0;
 	}
 /*
@@ -867,7 +882,7 @@ static char* FormatPacket (struct ip* ip
 	return buf;
 }
 
-static void
+static int
 SetAliasAddressFromIfName(const char *ifn)
 {
 	size_t needed;
@@ -951,14 +966,19 @@ SetAliasAddressFromIfName(const char *if
 			}
 		}
 	}
-	if (sin == NULL)
-		errx(1, "%s: cannot get interface address", ifn);
+	if (sin == NULL) {
+		warnx("%s: cannot get interface address", ifn);
+		free(buf);
+		return -2;
+	}
 
 	LibAliasSetAddress(mla, sin->sin_addr);
 	syslog(LOG_INFO, "Aliasing to %s, mtu %d bytes",
 	       inet_ntoa(sin->sin_addr), mip->ifMTU);
 
 	free(buf);
+
+	return 0;
 }
 
 void Quit (const char* msg)