From owner-p4-projects@FreeBSD.ORG  Wed Jun 20 10:54:23 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 739E416A46C; Wed, 20 Jun 2007 10:54:23 +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 2B31816A400
	for <perforce@FreeBSD.org>; Wed, 20 Jun 2007 10:54:23 +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 0D2DD13C43E
	for <perforce@FreeBSD.org>; Wed, 20 Jun 2007 10:54:23 +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 l5KAsMsr008699
	for <perforce@FreeBSD.org>; Wed, 20 Jun 2007 10:54:22 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5KAsMZQ008693
	for perforce@freebsd.org; Wed, 20 Jun 2007 10:54:22 GMT
	(envelope-from fli@FreeBSD.org)
Date: Wed, 20 Jun 2007 10:54:22 GMT
Message-Id: <200706201054.l5KAsMZQ008693@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 122025 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, 20 Jun 2007 10:54:23 -0000

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

Change 122025 by fli@fli_genesis on 2007/06/20 10:54:09

	- Follow record changes.
	- If a ttl of 0 was given in cache_set_ttl() bump it up to 1.

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/cache.c#2 edit

Differences ...

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

@@ -113,9 +113,8 @@
 	if (cr == NULL)
 		return;
 	MDNS_INIT_ASSERT(cr, cr_magic);
-	if (--cr->cr_ttl_rel > 0) {
+	if (--cr->cr_ttl_rel > 0)
 		return;
-	}
 
     /* Remove entries with the same ttl */
 	do {
@@ -164,10 +163,10 @@
 			*new = rr; 
 	}
 	else if (rrset->r_ttl > 0) {
-		record_get(&c->c_recs, &r, rrset->r_name, RECORD_ALLOC);
+		record_get(&c->c_recs, &r, 0, rrset->r_name);
 		cr = malloc(sizeof(struct cache_res));
 		rr = &cr->cr_res;
-		record_res_add(r, &rr, 0, rrset->r_type, rrset->r_data,
+		record_res_add(r, &rr, RECORD_NOALLOC, rrset->r_type, rrset->r_data,
 			rrset->r_datalen);
 		record_res_setparent(&cr->cr_res, cr);
 		cr->cr_ttl_abs = rrset->r_ttl;
@@ -283,6 +282,8 @@
 {
 	struct cache_res *cr;
 
+	if (ttl == 0)
+		ttl++;
 	cr = record_res_getparent(rr);
 	dequeue_ttl(c, cr);
 	cr->cr_ttl_rel = ttl;