From owner-p4-projects@FreeBSD.ORG Sat Jul 21 19:25:24 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E6C0016A421; Sat, 21 Jul 2007 19:25:23 +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 B08A516A417 for ; Sat, 21 Jul 2007 19:25:23 +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 A051613C48E for ; Sat, 21 Jul 2007 19:25:23 +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 l6LJPNM2011294 for ; Sat, 21 Jul 2007 19:25:23 GMT (envelope-from fli@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6LJPNTQ011291 for perforce@freebsd.org; Sat, 21 Jul 2007 19:25:23 GMT (envelope-from fli@FreeBSD.org) Date: Sat, 21 Jul 2007 19:25:23 GMT Message-Id: <200707211925.l6LJPNTQ011291@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 123860 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: Sat, 21 Jul 2007 19:25:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=123860 Change 123860 by fli@fli_nexus on 2007/07/21 19:24:22 - Follow cache system changes. - Add query system structure to interface. - Add an array with interface pointers (indexed by interface index). - Add unix pipe server to global software state structure. Affected files ... .. //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdnsd.h#5 edit Differences ... ==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdnsd.h#5 (text+ko) ==== @@ -32,11 +32,13 @@ #include "debug.h" #include "dbrec.h" +#include "clisrv.h" #include "event.h" #include "hash.h" #include "mdns.h" #include "output.h" #include "output_aggr.h" +#include "queries.h" #include "record.h" #include "threads.h" #include "var.h" @@ -54,7 +56,12 @@ struct eventlist *g_evl; /* Event list (own locking) */ struct mdns_bufpool *g_bp; /* Buffer pool */ DEF_MTX(g_bp_mtx); - TAILQ_HEAD(, md_if) g_ifs; /* Active interfaces */ + TAILQ_HEAD(, md_if) g_ifs_head; /* Active interfaces */ + struct md_if **g_ifs; /* Interfaces by index */ + int g_ifs_max; /* Maximum interface index */ + int g_flags; +#define GLOB_CSOPEN 0x01 /* unix client pipe open */ + struct clisrv g_cs; /* unix client pipe server */ }; /* @@ -74,6 +81,7 @@ */ struct cache { struct records c_recs; + struct queries *c_queries; TAILQ_HEAD(, cache_res) c_list; /* time delta list */ }; @@ -109,7 +117,8 @@ struct dbr mif_dbr; /* Self-claimed record database */ struct aqueue mif_aq4; /* INET4 multicast aggregation queue */ struct aqueue mif_aq6; /* INET6 multicast aggregation queue */ - struct oqueue mif_oq; /* Output queue */ + struct oqueue mif_oq; /* Output queue */ + struct queries mif_q; /* Outstanding queries */ char mif_ifnam[IFNAMSIZ]; }; @@ -119,7 +128,7 @@ wchar_t * _wcsdup(const wchar_t *); /* cache.c */ -void cache_init(struct cache *); +void cache_init(struct cache *, struct queries *); void cache_destroy(struct cache *); int cache_add(struct cache *, struct mdns_rrset *, struct record_res **); int cache_del(struct cache *, struct record_res *);