PERFORCE change 123857 for review

[Fredrik Lindberg]

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

Change 123857 by fli at fli_nexus on 2007/07/21 19:19:03

	Add several new object types used by the query system and by
	the unix pipe server.

Affected files ...

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

Differences ...

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

@@ -31,10 +31,12 @@
 
 #include "debug.h"
 #include "dbrec.h"
+#include "clisrv.h"
 #include "log.h"
 #include "mdns.h"
 #include "objalloc.h"
 #include "output.h"
+#include "queries.h"
 #include "threads.h"
 #include "stack_mdns.h"
 
@@ -71,7 +73,15 @@
 	/* Probe/Announce context */
 	{ .os_sz = sizeof(struct dbr_pac) },
 	/* Output queue entry */
-	{ .os_sz = sizeof(struct oq_entry) }
+	{ .os_sz = sizeof(struct oq_entry) },
+	/* UNIX pipe client */
+	{ .os_sz = sizeof(struct cs_client) },
+	/* Query consumer */
+	{ .os_sz = sizeof(struct query_cons) },
+	/* Query type */ 
+	{ .os_sz = sizeof(struct query_type) },
+	/* Outstanding UNIX pipe client query */
+	{ .os_sz = sizeof(struct csc_query) }
 };
 static int obj_table_size = sizeof(obj_table) / sizeof(struct objs);
 

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

@@ -31,8 +31,12 @@
 #define OBJ_PKG			1 /* struct mdns_packet {} */ 
 #define OBJ_PKGRES		2 /* struct mdns_pkg_res {} */
 #define OBJ_PAC			3 /* struct dbr_pac {} */
-#define OBJ_OQE			4 /* stuct oq_entry {} */
-#define _OBJ_MAX		OBJ_OQE
+#define OBJ_OQE			4 /* struct oq_entry {} */
+#define OBJ_CSC			5 /* struct cs_client {} */
+#define OBJ_QCONS		6 /* struct query_cons {} */
+#define OBJ_QTYPE		7 /* struct query_type {} */
+#define OBJ_CSCQ		8 /* struct csc_query {} */
+#define _OBJ_MAX		8
 
 void obj_init(void);
 void * obj_alloc(int);