interface: switch to using clsact for filters

[project/qosify.git] / map.c

diff --git a/map.c b/map.c
index 436de60ded8ace0aecc6004e4752dd6e0d48ea5c..83e119bfb89356f462136d7d31040f6cdcab5d02 100644 (file)
--- a/map.c
+++ b/map.c
@@ -31,6 +31,7 @@ int qosify_map_timeout;
 int qosify_active_timeout;
 struct qosify_config config;
 struct qosify_flow_config flow_config;
+static uint32_t map_dns_seq;
 
 struct qosify_map_file {
        struct list_head list;
@@ -332,6 +333,9 @@ void __qosify_map_set_entry(struct qosify_map_data *data)
                bpf_map_update_elem(fd, &data->addr, &val, BPF_ANY);
        }
 
+       if (data->id == CL_MAP_DNS)
+               e->data.addr.dns.seq = ++map_dns_seq;
+
        if (add) {
                if (qosify_map_timeout == ~0 || file) {
                        e->timeout = ~0;
@@ -402,6 +406,8 @@ int qosify_map_set_entry(enum qosify_map_id id, bool file, const char *str,
        switch (id) {
        case CL_MAP_DNS:
                data.addr.dns.pattern = str;
+               if (str[-2] == 'c')
+                       data.addr.dns.only_cname = 1;
                break;
        case CL_MAP_TCP_PORTS:
        case CL_MAP_UDP_PORTS:
@@ -521,6 +527,8 @@ qosify_map_parse_line(char *str)
 
        if (!strncmp(key, "dns:", 4))
                qosify_map_set_entry(CL_MAP_DNS, true, key + 4, dscp);
+       if (!strncmp(key, "dns_q:", 6) || !strncmp(key, "dns_c:", 6))
+               qosify_map_set_entry(CL_MAP_DNS, true, key + 6, dscp);
        if (!strncmp(key, "tcp:", 4))
                qosify_map_set_entry(CL_MAP_TCP_PORTS, true, key + 4, dscp);
        else if (!strncmp(key, "udp:", 4))
@@ -599,6 +607,7 @@ static void qosify_map_reset_file_entries(void)
 {
        struct qosify_map_entry *e;
 
+       map_dns_seq = 0;
        avl_for_each_element(&map_data, e, avl)
                e->data.file = false;
 }
@@ -710,7 +719,7 @@ void qosify_map_gc(void)
        uloop_timeout_set(&qosify_map_timer, timeout * 1000);
 }
 
-int qosify_map_lookup_dns_entry(char *host, uint8_t *dscp)
+int qosify_map_lookup_dns_entry(char *host, bool cname, uint8_t *dscp, uint32_t *seq)
 {
        struct qosify_map_data data = {
                .id = CL_MAP_DNS,
@@ -733,6 +742,9 @@ int qosify_map_lookup_dns_entry(char *host, uint8_t *dscp)
                if (e->data.id != CL_MAP_DNS)
                        break;
 
+               if (!cname && e->data.addr.dns.only_cname)
+                       continue;
+
                if (e->data.addr.dns.pattern[0] == '/') {
                        if (regexec(regex, host, 0, NULL, 0) != 0)
                                continue;
@@ -741,7 +753,10 @@ int qosify_map_lookup_dns_entry(char *host, uint8_t *dscp)
                                continue;
                }
 
-               *dscp = e->data.dscp;
+               if (*dscp == 0xff || e->data.addr.dns.seq < *seq) {
+                       *dscp = e->data.dscp;
+                       *seq = e->data.addr.dns.seq;
+               }
                ret = 0;
        }
 
@@ -753,8 +768,9 @@ int qosify_map_add_dns_host(char *host, const char *addr, const char *type, int
 {
        struct qosify_map_data data = {};
        int prev_timeout = qosify_map_timeout;
+       uint32_t lookup_seq = 0;
 
-       if (qosify_map_lookup_dns_entry(host, &data.dscp))
+       if (qosify_map_lookup_dns_entry(host, false, &data.dscp, &lookup_seq))
                return 0;
 
        data.user = true;