X-Git-Url: http://git.madism.org/?p=apps%2Fpfixtools.git;a=blobdiff_plain;f=postlicyd%2Fmatch.c;h=558bc88a19de0b6ae40709b8b34226717ac714b9;hp=ebee763703f918a455c30abed21807bd7e7dcc74;hb=e327d3786ba0371eaaff8e6ba0fe3fc39f095ae2;hpb=90966df1a5149c39beed4f6a3c5d6a7699b83024

diff --git a/postlicyd/match.c b/postlicyd/match.c
index ebee763..558bc88 100644
--- a/postlicyd/match.c
+++ b/postlicyd/match.c
@@ -182,36 +182,7 @@ static void match_filter_destructor(filter_t *filter)
 
 static inline bool match_condition(const match_condition_t *cond, const query_t *query)
 {
-    const char *field = NULL;
-    switch (cond->field) {
-#define CASE(Up, Low)                                                          \
-      case PTK_ ## Up: field = query->Low; break;
-      CASE(HELO_NAME, helo_name)
-      CASE(QUEUE_ID, queue_id)
-      CASE(SENDER, sender)
-      CASE(SENDER_DOMAIN, sender_domain)
-      CASE(RECIPIENT, recipient)
-      CASE(RECIPIENT_DOMAIN, recipient_domain)
-      CASE(RECIPIENT_COUNT, recipient_count)
-      CASE(CLIENT_ADDRESS, client_address)
-      CASE(CLIENT_NAME, client_name)
-      CASE(REVERSE_CLIENT_NAME, reverse_client_name)
-      CASE(INSTANCE, instance)
-      CASE(SASL_METHOD, sasl_method)
-      CASE(SASL_USERNAME, sasl_username)
-      CASE(SASL_SENDER, sasl_sender)
-      CASE(SIZE, size)
-      CASE(CCERT_SUBJECT, ccert_subject)
-      CASE(CCERT_ISSUER, ccert_issuer)
-      CASE(CCERT_FINGERPRINT, ccert_fingerprint)
-      CASE(ENCRYPTION_PROTOCOL, encryption_protocol)
-      CASE(ENCRYPTION_CIPHER, encryption_cipher)
-      CASE(ENCRYPTION_KEYSIZE, encryption_keysize)
-      CASE(ETRN_DOMAIN, etrn_domain)
-      CASE(STRESS, stress)
-#undef CASE
-      default: return false;
-    }
+    const char *field = query_field_for_id(query, cond->field);
     debug("running condition: \"%s\" %s %s\"%s\"",
           field, condition_names[cond->condition],
           cond->case_sensitive ? "" : "(alternative) ",