add ct-zone filtering inat src host

nutanix · Sep 16, 2024 · 4133437 · 4133437
1 parent ba199c9
commit 4133437
Show file tree

Hide file tree

Showing 28 changed files with 5,734 additions and 113 deletions.
diff --git a/Plugins b/Plugins
diff --git a/VIM b/VIM
diff --git a/build/conntrack_migrator b/build/conntrack_migrator
diff --git a/build/gen/dbus_vmstate1.o b/build/gen/dbus_vmstate1.o
diff --git a/build/src/common.o b/build/src/common.o
diff --git a/build/src/conntrack.o b/build/src/conntrack.o
diff --git a/build/src/conntrack_entry.o b/build/src/conntrack_entry.o
diff --git a/build/src/conntrack_entry_print.o b/build/src/conntrack_entry_print.o
diff --git a/build/src/conntrack_store.o b/build/src/conntrack_store.o
diff --git a/build/src/data_template.o b/build/src/data_template.o
diff --git a/build/src/dbus_server.o b/build/src/dbus_server.o
diff --git a/build/src/lmct_config.o b/build/src/lmct_config.o
diff --git a/build/src/log.o b/build/src/log.o
diff --git a/build/src/main.o b/build/src/main.o
diff --git a/build/src/marshal.o b/build/src/marshal.o
diff --git a/build/src/unmarshal.o b/build/src/unmarshal.o
diff --git a/gen/dbus_vmstate1.c b/gen/dbus_vmstate1.c
diff --git a/gen/dbus_vmstate1.h b/gen/dbus_vmstate1.h
diff --git a/include/common.h b/include/common.h
@@ -20,4 +20,7 @@
 GHashTable *
 create_hashtable_from_ip_list(const char *[], int);
 
+GHashTable *
+create_hashtable_from_ct_zones_list(const char *[], int);
+
 #endif /* COMMON_H */
diff --git a/include/conntrack.h b/include/conntrack.h
@@ -29,17 +29,22 @@
  * the conntrack events.
  */
 struct ct_events_targs {
-    pthread_t tid;              // thread ID
-    GHashTable *ips_to_migrate; // IPs for which CT events needs to be listened
-    bool *stop_flag; // Flag when True, stop listening for CT events
-    bool is_src; // Flag indicating whether the args are for src based events
+    pthread_t tid;                      // thread ID
+    GHashTable *ips_to_migrate;         // IPs for which CT events needs to be
+                                        // listened
+    GHashTable *ct_zones_to_migrate;    // CT Zones for which events needs to
+                                        // be listened
+    bool *stop_flag;                    // Flag when True, stop listening for
+                                        // CT events
+    bool is_src;                        // Flag indicating whether the args are
+                                        // for src based events
 };
 
 int
-get_conntrack_dump(struct nfct_handle *, GHashTable *);
+get_conntrack_dump(struct nfct_handle *, struct ct_events_targs *);
 
 int
-listen_for_conntrack_events(struct mnl_socket *, GHashTable *, bool, bool *);
+listen_for_conntrack_events(struct mnl_socket *, struct ct_events_targs *);
 
 void
 append_ct_to_batch(char *, struct nf_conntrack *, uint32_t *, int);

diff --git a/include/lmct_config.h b/include/lmct_config.h
@@ -19,6 +19,11 @@
 
 #include "log.h"
 
+
+enum filter_type {
+    FILTER_BY_CT_ZONE,
+    FILTER_BY_IP
+};
 /**
  * Represents the config options which are used globally in the application.
  */
@@ -29,7 +34,11 @@ struct lmct_config {
 
 extern struct lmct_config lmct_conf;
 
+extern enum filter_type fltr_type;
 void
 init_lmct_config();
 
+void
+populate_filter_type(enum filter_type);
+
 #endif /* LMCT_CONFIG_H */