PERFORCE change 123860 for review

[Fredrik Lindberg]

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

Change 123860 by fli at 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 *);