From owner-p4-projects@FreeBSD.ORG  Tue May 20 15:36:13 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AFD751065672; Tue, 20 May 2008 15:36:13 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 71CCA106566C
	for <perforce@freebsd.org>; Tue, 20 May 2008 15:36:13 +0000 (UTC)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6396B8FC1A
	for <perforce@freebsd.org>; Tue, 20 May 2008 15:36:13 +0000 (UTC)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4KFaD29041587
	for <perforce@freebsd.org>; Tue, 20 May 2008 15:36:13 GMT
	(envelope-from csjp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4KFaDwL041585
	for perforce@freebsd.org; Tue, 20 May 2008 15:36:13 GMT
	(envelope-from csjp@freebsd.org)
Date: Tue, 20 May 2008 15:36:13 GMT
Message-Id: <200805201536.m4KFaDwL041585@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	csjp@freebsd.org using -f
From: "Christian S.J. Peron" <csjp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 141921 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 May 2008 15:36:14 -0000

http://perforce.freebsd.org/chv.cgi?CH=141921

Change 141921 by csjp@ibm01 on 2008/05/20 15:36:00

	Use setsockopt(2) so we can re-use the address previously bound to.

Affected files ...

.. //depot/projects/trustedbsd/netauditd/reader.c#6 edit

Differences ...

==== //depot/projects/trustedbsd/netauditd/reader.c#6 (text+ko) ====

@@ -223,12 +223,19 @@
 int
 reader_init_net(struct au_cmpnt *ac)
 {
-	int fd;
+	int fd, opt;
+	socklen_t olen;
 
 	fd = socket(ac->ac_ainfo->ai_family, ac->ac_ainfo->ai_socktype,
 	    ac->ac_ainfo->ai_protocol);
 	if (fd == -1)
 		return (-1);
+	opt = 1;
+	olen = sizeof(opt);
+	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, olen) < 0) {
+		(void) close(fd);
+		return (-1);
+	}
 	if (bind(fd, ac->ac_ainfo->ai_addr, ac->ac_ainfo->ai_addrlen) == -1) {
 		(void) close(fd);
 		return (-1);