X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=postlicyd%2Fmain-postlicyd.c;h=cae2d236dc8b9de5d91143af242ff011ec14872c;hb=e6d0c7ab6103af206f95c1291b29c3f151a41484;hp=5f46e76e2377171cd1d242f6e3976fcccdb1c4f1;hpb=913c6a51acdb1e8a6acc88fbcceac8d0a09450b7;p=apps%2Fpfixtools.git

diff --git a/postlicyd/main-postlicyd.c b/postlicyd/main-postlicyd.c
index 5f46e76..cae2d23 100644
--- a/postlicyd/main-postlicyd.c
+++ b/postlicyd/main-postlicyd.c
@@ -61,102 +61,6 @@ static bool config_refresh(void *config)
     return config_reload(config);
 }
 
-static int postfix_parsejob(query_t *query, char *p)
-{
-#define PARSE_CHECK(expr, error, ...)                                        \
-    do {                                                                     \
-        if (!(expr)) {                                                       \
-            syslog(LOG_ERR, error, ##__VA_ARGS__);                           \
-            return -1;                                                       \
-        }                                                                    \
-    } while (0)
-
-    p_clear(query, 1);
-    query->state = SMTP_UNKNOWN;
-    while (*p != '\n') {
-        char *k, *v;
-        int klen, vlen, vtk;
-
-        while (isblank(*p))
-            p++;
-        p = strchr(k = p, '=');
-        PARSE_CHECK(p, "could not find '=' in line");
-        for (klen = p - k; klen && isblank(k[klen]); klen--);
-        p += 1; /* skip = */
-
-        while (isblank(*p))
-            p++;
-        p = strchr(v = p, '\n');
-        PARSE_CHECK(p, "could not find final \\n in line");
-        for (vlen = p - v; vlen && isblank(v[vlen]); vlen--);
-        p += 1; /* skip \n */
-
-        vtk = policy_tokenize(v, vlen);
-        switch (policy_tokenize(k, klen)) {
-#define CASE(up, low)  case PTK_##up: query->low = v; v[vlen] = '\0'; syslog(LOG_DEBUG, "%s = %s", ptokens[PTK_##up], query->low); break;
-            CASE(HELO_NAME,           helo_name);
-            CASE(QUEUE_ID,            queue_id);
-            CASE(SENDER,              sender);
-            CASE(RECIPIENT,           recipient);
-            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
-
-          case PTK_REQUEST:
-            PARSE_CHECK(vtk == PTK_SMTPD_ACCESS_POLICY,
-                        "unexpected `request' value: %.*s", vlen, v);
-            break;
-
-          case PTK_PROTOCOL_NAME:
-            PARSE_CHECK(vtk == PTK_SMTP || vtk == PTK_ESMTP,
-                        "unexpected `protocol_name' value: %.*s", vlen, v);
-            query->esmtp = vtk == PTK_ESMTP;
-            break;
-
-          case PTK_PROTOCOL_STATE:
-            switch (vtk) {
-#define CASE(name)  case PTK_##name: query->state = SMTP_##name; break;
-                CASE(CONNECT);
-                CASE(EHLO);
-                CASE(HELO);
-                CASE(MAIL);
-                CASE(RCPT);
-                CASE(DATA);
-                CASE(END_OF_MESSAGE);
-                CASE(VRFY);
-                CASE(ETRN);
-              default:
-                PARSE_CHECK(false, "unexpected `protocol_state` value: %.*s",
-                            vlen, v);
-#undef CASE
-            }
-            break;
-
-          default:
-            syslog(LOG_WARNING, "unexpected key, skipped: %.*s", klen, k);
-            continue;
-        }
-    }
-
-    return query->state == SMTP_UNKNOWN ? -1 : 0;
-#undef PARSE_CHECK
-}
-
 __attribute__((format(printf,2,0)))
 static void policy_answer(server_t *pcy, const char *fmt, ...)
 {
@@ -218,7 +122,7 @@ static int policy_run(server_t *pcy, void* vconfig)
     if (!(eoq = strstr(pcy->ibuf.data + search_offs, "\n\n")))
         return 0;
 
-    if (postfix_parsejob(pcy->data, pcy->ibuf.data) < 0)
+    if (!query_parse(pcy->data, pcy->ibuf.data))
         return -1;
     query->eoq = eoq + strlen("\n\n");
     epoll_modify(pcy->fd, 0, pcy);