diff -r 28b7fb13e35d -r 406d4f7eb00d applib/dtn_types.h
--- a/applib/dtn_types.h	Thu Jun 30 15:32:09 2011 +0100
+++ b/applib/dtn_types.h	Wed Aug 03 14:35:09 2011 +0100
@@ -235,6 +235,30 @@
 typedef enum dtn_extension_block_flags_t dtn_extension_block_flags_t;
 
 /**
+ * BPQ Extension block kind. 
+ *
+ *     BPQ_BLOCK_KIND_QUERY
+ *     BPQ_BLOCK_KIND_RESPONSE
+ */
+
+enum dtn_bpq_extension_block_kind_t {
+    BPQ_BLOCK_KIND_QUERY = 0,
+    BPQ_BLOCK_KIND_RESPONSE = 1,
+};
+typedef enum dtn_bpq_extension_block_kind_t dtn_bpq_extension_block_kind_t;
+
+/**
+ * BPQ Extension block matching rule. (More may be added later)
+ *
+ *     BPQ_MATCHING_RULE_EXACT
+ */
+
+enum dtn_bpq_extension_block_matching_rule_t {
+    BPQ_MATCHING_RULE_EXACT = 1, 
+};
+typedef enum dtn_bpq_extension_block_matching_rule_t dtn_bpq_extension_block_matching_rule_t;
+
+/**
  * Extension block.
  */
 
@@ -424,6 +448,8 @@
 extern  bool_t xdr_dtn_bundle_delivery_opts_t (XDR *, dtn_bundle_delivery_opts_t*);
 extern  bool_t xdr_dtn_extension_block_flags_t (XDR *, dtn_extension_block_flags_t*);
 extern  bool_t xdr_dtn_extension_block_t (XDR *, dtn_extension_block_t*);
+extern  bool_t xdr_dtn_bpq_extension_block_kind_t (XDR *, dtn_bpq_extension_block_kind_t*);
+extern  bool_t xdr_dtn_bpq_extension_block_matching_rule_t (XDR *, dtn_bpq_extension_block_matching_rule_t*);
 extern  bool_t xdr_dtn_bpq_extension_block_data_t (XDR *, dtn_bpq_extension_block_data_t*);
 extern  bool_t xdr_dtn_sequence_id_t (XDR *, dtn_sequence_id_t*);
 extern  bool_t xdr_dtn_bundle_spec_t (XDR *, dtn_bundle_spec_t*);
@@ -446,6 +472,8 @@
 extern bool_t xdr_dtn_bundle_delivery_opts_t ();
 extern bool_t xdr_dtn_extension_block_flags_t ();
 extern bool_t xdr_dtn_extension_block_t ();
+extern bool_t xdr_dtn_bpq_extension_block_kind_t ();
+extern bool_t xdr_dtn_bpq_extension_block_matching_rule_t ();
 extern bool_t xdr_dtn_bpq_extension_block_data_t ();
 extern bool_t xdr_dtn_sequence_id_t ();
 extern bool_t xdr_dtn_bundle_spec_t ();