From owner-p4-projects@FreeBSD.ORG Fri May 11 18:34:03 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F42A16A409; Fri, 11 May 2007 18:34:03 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4358E16A405 for ; Fri, 11 May 2007 18:34:03 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2AEF313C45D for ; Fri, 11 May 2007 18:34:03 +0000 (UTC) (envelope-from fli@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4BIY3YB013462 for ; Fri, 11 May 2007 18:34:03 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4BIY2ON013458 for perforce@freebsd.org; Fri, 11 May 2007 18:34:02 GMT (envelope-from fli@FreeBSD.org) Date: Fri, 11 May 2007 18:34:02 GMT Message-Id: <200705111834.l4BIY2ON013458@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fli@FreeBSD.org using -f From: Fredrik Lindberg To: Perforce Change Reviews Cc: Subject: PERFORCE change 119683 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 May 2007 18:34:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=119683 Change 119683 by fli@fli_genesis on 2007/05/11 18:33:21 o Check if we actually managed to allocate a buffer o Make mdns_tcp_recv return bytes read (as mdns_udp_recv does) o Remove false unused attribute o mdns_tcp_client have to return the new socket, not 0 Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_mdns.c#3 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_mdns.c#3 (text+ko) ==== @@ -730,13 +730,14 @@ return (-1); } - pkg = pc->pc_pkg; + pkg = pc->pc_pkg != NULL ? pc->pc_pkg : pkg_alloc(pc); if (pkg == NULL) - pkg = pkg_alloc(pc); + return (-1); - buf = MDNS_BUFH(&pkg->p_buflist); + buf = MDNS_BUFH(&pkg->p_buflist) != NULL ? MDNS_BUFH(&pkg->p_buflist) : + mdns_buf_alloc(md->md_bp, &pkg->p_buflist, 0, 0); if (buf == NULL) - buf = mdns_buf_alloc(md->md_bp, &pkg->p_buflist, 0, 1); + return (-1); iov[0].iov_base = MDNS_BUF(buf); iov[0].iov_len = MDNS_BUFSZ(buf); @@ -780,7 +781,7 @@ if (nsock < 0) return (-1); fcntl(nsock, F_SETFL, O_NONBLOCK); - return (0); + return (nsock); } /* @@ -847,8 +848,7 @@ * pc - Destination packet chain */ int -mdns_tcp_recv(__attribute__((unused)) struct mdns *md, int sock, - struct mdns_pkgchain *pc) +mdns_tcp_recv(struct mdns *md, int sock, struct mdns_pkgchain *pc) { struct mdns_packet *pkg; struct mdns_buf *buf; @@ -857,13 +857,14 @@ MDNS_INIT_ASSERT(md, md_magic); MDNS_INIT_ASSERT(pc, pc_magic); - pkg = pc->pc_pkg; + pkg = pc->pc_pkg != NULL ? pc->pc_pkg : pkg_alloc(pc); if (pkg == NULL) - pkg = pkg_alloc(pc); + return (-1); - buf = MDNS_BUFH(&pkg->p_buflist); + buf = MDNS_BUFH(&pkg->p_buflist) != NULL ? MDNS_BUFH(&pkg->p_buflist) : + mdns_buf_alloc(md->md_bp, &pkg->p_buflist, 0, 0); if (buf == NULL) - buf = mdns_buf_alloc(md->md_bp, &pkg->p_buflist, 0, 1); + return (-1); for (;;) { n = read(sock, MDNS_BUF(buf), MDNS_BUFSZ(buf)); @@ -873,7 +874,9 @@ } if ((unsigned int)n < MDNS_BUFSZ(buf)) break; - buf = mdns_buf_alloc(md->md_bp, &pkg->p_buflist, 0, 1); + buf = mdns_buf_alloc(md->md_bp, &pkg->p_buflist, 0, 0); + if (buf == NULL) + return (-1); } /* @@ -883,8 +886,10 @@ * with legacy clients. */ buf = mdns_buf_merge(md->md_bp, &pkg->p_buflist, 1); + if (buf == NULL) + return (-1); - return (0); + return (pkg->p_len); } /*