Checkpoint commit: refactoring the request code in TIDS for better reuse

[trust_router.git] / include / trp_ptable.h

diff --git a/include/trp_ptable.h b/include/trp_ptable.h
index 303bbc3..0bf7c30 100644 (file)
--- a/include/trp_ptable.h
+++ b/include/trp_ptable.h
@@ -38,8 +38,8 @@
 #include <time.h>
 #include <talloc.h>
 
-#include <trust_router/tr_name.h>
-#include <tr_gss.h>
+#include <tr_name_internal.h>
+#include <tr_gss_names.h>
 #include <trust_router/trp.h>
 #include <tr_filter.h>
 
@@ -62,7 +62,7 @@ struct trp_peer {
   TRP_PEER_CONN_STATUS incoming_status;
   void (*conn_status_cb)(TRP_PEER *, void *); /* callback for connected status change */
   void *conn_status_cookie;
-  TR_FILTER *filter;
+  TR_FILTER_SET *filters;
 };
 
 typedef struct trp_ptable {
@@ -108,8 +108,8 @@ void trp_peer_set_incoming_status(TRP_PEER *peer, TRP_PEER_CONN_STATUS status);
 int trp_peer_is_connected(TRP_PEER *peer);
 void trp_peer_set_linkcost(TRP_PEER *peer, unsigned int linkcost);
 void trp_peer_set_conn_status_cb(TRP_PEER *peer, void (*cb)(TRP_PEER *, void *), void *cookie);
-void trp_peer_set_filter(TRP_PEER *peer, TR_FILTER *filt);
-TR_FILTER *trp_peer_get_filter(TRP_PEER *peer);
+void trp_peer_set_filters(TRP_PEER *peer, TR_FILTER_SET *filts);
+TR_FILTER *trp_peer_get_filter(TRP_PEER *peer, TR_FILTER_TYPE ftype);
 char *trp_peer_to_str(TALLOC_CTX *memctx, TRP_PEER *peer, const char *sep);
 
 #endif /* _TRP_PTABLE_H_ */