From owner-svn-src-all@FreeBSD.ORG  Mon Apr 18 23:15:30 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 2D803106566C;
	Mon, 18 Apr 2011 23:15:30 +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 1B8178FC0A;
	Mon, 18 Apr 2011 23:15:30 +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 p3INFUIR087023;
	Mon, 18 Apr 2011 23:15:30 GMT (envelope-from sobomax@svn.freebsd.org)
Received: (from sobomax@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3INFTnH087021;
	Mon, 18 Apr 2011 23:15:29 GMT (envelope-from sobomax@svn.freebsd.org)
Message-Id: <201104182315.p3INFTnH087021@svn.freebsd.org>
From: Maxim Sobolev <sobomax@FreeBSD.org>
Date: Mon, 18 Apr 2011 23:15:29 +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: r220806 - 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: Mon, 18 Apr 2011 23:15:30 -0000

Author: sobomax
Date: Mon Apr 18 23:15:29 2011
New Revision: 220806
URL: http://svn.freebsd.org/changeset/base/220806

Log:
  Only wait for the IP to appear on the interface if natd is running in the
  background.
  
  Suggested by:   Garrett Cooper <yanegomi@gmail.com>
  
  Use EAGAIN instead of magic value of -2 to report this condition from the
  SetAliasAddressFromIfName routine.
  
  MFC after:	2 weeks

Modified:
  head/sbin/natd/natd.c

Modified: head/sbin/natd/natd.c
==============================================================================
--- head/sbin/natd/natd.c	Mon Apr 18 23:12:41 2011	(r220805)
+++ head/sbin/natd/natd.c	Mon Apr 18 23:15:29 2011	(r220806)
@@ -305,9 +305,9 @@ int main (int argc, char** argv)
 			else {
 				do {
 					rval = SetAliasAddressFromIfName (mip->ifName);
-					if (rval == -2)
+					if (background != 0 && rval == EAGAIN)
 						sleep(1);
-				} while (rval == -2);
+				} while (background != 0 && rval == EAGAIN);
 				if (rval != 0)
 					exit(1);
 			}
@@ -648,9 +648,9 @@ static void DoAliasing (int fd, int dire
 	if (mip->assignAliasAddr) {
 		do {
 			rval = SetAliasAddressFromIfName (mip->ifName);
-			if (rval == -2)
+			if (background != 0 && rval == EAGAIN)
 				sleep(1);
-		} while (rval == -2);
+		} while (background != 0 && rval == EAGAIN);
 		if (rval != 0)
 			exit(1);
 		mip->assignAliasAddr = 0;
@@ -969,7 +969,7 @@ SetAliasAddressFromIfName(const char *if
 	if (sin == NULL) {
 		warnx("%s: cannot get interface address", ifn);
 		free(buf);
-		return -2;
+		return EAGAIN;
 	}
 
 	LibAliasSetAddress(mla, sin->sin_addr);