From owner-p4-projects@FreeBSD.ORG  Wed Oct  3 21:32:40 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2DE4016A418; Wed,  3 Oct 2007 21:32:40 +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 D9E9E16A46D
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:32:39 +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 B2F8C13C45A
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:32:39 +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 l93LWdOE097479
	for <perforce@FreeBSD.org>; Wed, 3 Oct 2007 21:32:39 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l93LWdeT097476
	for perforce@freebsd.org; Wed, 3 Oct 2007 21:32:39 GMT
	(envelope-from fli@FreeBSD.org)
Date: Wed, 3 Oct 2007 21:32:39 GMT
Message-Id: <200710032132.l93LWdeT097476@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 127151 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: Wed, 03 Oct 2007 21:32:40 -0000

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

Change 127151 by fli@fli_nexus on 2007/10/03 21:32:25

	- Ignore empty packets.
	- Abort transmission if memory allocation fails.

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_mdns.c#7 edit

Differences ...

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

@@ -622,6 +622,7 @@
 	struct mdns_packet *pkg;
 	struct mdns_buf *buf;
 	int i, error;
+	size_t len;
 	struct iovec *iov;
 	struct msghdr msg;
 
@@ -629,6 +630,7 @@
 	msg.msg_namelen = salen;
 	msg.msg_control = NULL;
 	msg.msg_controllen = 0;
+	len = 0;
 
 	TAILQ_FOREACH(pkg, &pc->pc_head, p_list) {
 		iov = malloc(sizeof(struct iovec) *
@@ -638,7 +640,12 @@
 			iov[i].iov_base = MDNS_BUF(buf);
 			iov[i].iov_len = MDNS_BUFLEN(buf);
 			i++;
+			len += MDNS_BUFLEN(buf);
 		}
+		if (len == 0) {
+			free(iov);
+			continue;
+		}
 
 		msg.msg_iov = iov;
 		msg.msg_iovlen = i;
@@ -646,7 +653,7 @@
 		error = sendmsg(sock, &msg, 0);
 		free(iov);
 		if (error < 0)
-			return (-1);
+			continue;
 	}
 	return (0);
 }