From owner-p4-projects@FreeBSD.ORG  Sat Oct  6 17:05:11 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1D5C816A468; Sat,  6 Oct 2007 17:05:11 +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 CD87016A420
	for <perforce@FreeBSD.org>; Sat,  6 Oct 2007 17:05:10 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B619E13C45B
	for <perforce@FreeBSD.org>; Sat,  6 Oct 2007 17:05:10 +0000 (UTC)
	(envelope-from fli@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 l96H5Acu006994
	for <perforce@FreeBSD.org>; Sat, 6 Oct 2007 17:05:10 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l96H5A6c006991
	for perforce@freebsd.org; Sat, 6 Oct 2007 17:05:10 GMT
	(envelope-from fli@FreeBSD.org)
Date: Sat, 6 Oct 2007 17:05:10 GMT
Message-Id: <200710061705.l96H5A6c006991@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127250 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: Sat, 06 Oct 2007 17:05:11 -0000

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

Change 127250 by fli@fli_nexus on 2007/10/06 17:04:48

	Ehm..a sockaddr_in6 is larger than a sockaddr, fix.

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/output.c#3 edit
.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/output.h#3 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/output.c#3 (text+ko) ====

@@ -131,7 +131,7 @@
 	}
 
 	if (peer != NULL) {
-		memcpy(&oqe->oqe_peer, peer, peerlen);
+		memcpy(&oqe->oqe_peer.sa, peer, peerlen);
 		oqe->oqe_peerlen = peerlen;
 	}
 	else
@@ -203,7 +203,7 @@
 				    oqe->oqe_fam);
 			else
 				mdns_send_unicast(&mif->mif_stack, &oqe->oqe_pc,
-				    &oqe->oqe_peer, oqe->oqe_peerlen);
+				    &oqe->oqe_peer.sa, oqe->oqe_peerlen);
 
 			mdns_pkgchain_free(&oqe->oqe_pc);
 			obj_free(OBJ_OQE, oqe);

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/output.h#3 (text+ko) ====

@@ -39,8 +39,14 @@
 	MAGIC(oqe_magic);
 	TAILQ_ENTRY(oq_entry) oqe_next;
 	int oqe_fam;
-	struct sockaddr oqe_peer;
 	socklen_t oqe_peerlen;
+	union {
+		struct sockaddr sa;
+		struct sockaddr_in in;
+#ifdef INET6
+		struct sockaddr_in6 in6;
+#endif
+	} oqe_peer;
 	struct mdns_pkgchain oqe_pc;
 };