#include <talloc.h>
#include <jansson.h>
-#include <trust_router/tr_name.h>
+#include <tr_name_internal.h>
#include <trust_router/tr_constraint.h>
#include <trust_router/tid.h>
#include <trust_router/trp.h>
#define TR_MAX_FILTERS 5
#define TR_MAX_FILTER_LINES 8
#define TR_MAX_FILTER_SPECS 8
-#define TR_MAX_FILTER_SPEC_MATCHES 8
+#define TR_MAX_FILTER_SPEC_MATCHES 64
/* Filter actions */
-typedef enum {
+typedef enum tr_filter_action {
TR_FILTER_ACTION_REJECT = 0,
TR_FILTER_ACTION_ACCEPT,
TR_FILTER_ACTION_UNKNOWN
typedef struct tr_filter_target {
/* An inforec also needs realm and community information */
TRP_INFOREC *trp_inforec;
- TR_NAME *realm;
- TR_NAME *comm;
+ TRP_UPD *trp_upd;
/* a TID request has all the data it needs to be filtered */
TID_REQ *tid_req;
int tr_filter_apply(TR_FILTER_TARGET *target, TR_FILTER *filt, TR_CONSTRAINT_SET **constraints, TR_FILTER_ACTION *out_action);
void tr_filter_target_free(TR_FILTER_TARGET *target);
TR_FILTER_TARGET *tr_filter_target_tid_req(TALLOC_CTX *mem_ctx, TID_REQ *req);
-TR_FILTER_TARGET *tr_filter_target_trp_inforec(TALLOC_CTX *mem_ctx, TRP_INFOREC *inforec, TR_NAME *realm, TR_NAME *comm);
+TR_FILTER_TARGET *tr_filter_target_trp_inforec(TALLOC_CTX *mem_ctx, TRP_UPD *upd, TRP_INFOREC *inforec);
TR_CONSTRAINT_SET *tr_constraint_set_from_fline(TR_FLINE *fline);
const char *tr_filter_type_to_string(TR_FILTER_TYPE ftype);
TR_FILTER_TYPE tr_filter_type_from_string(const char *s);
+/* tr_filter_encoders.c */
+json_t *tr_filter_set_to_json(TR_FILTER_SET *filter_set);
+
#endif