clusterer: refactor topology related code into a new file

OpenSIPS · Jan 12, 2021 · 0b7a94a · 0b7a94a
1 parent 9ae8ca7
commit 0b7a94a
Show file tree

Hide file tree

Showing 8 changed files with 1,444 additions and 1,364 deletions.
diff --git a/modules/clusterer/clusterer.c b/modules/clusterer/clusterer.c
diff --git a/modules/clusterer/clusterer.h b/modules/clusterer/clusterer.h
@@ -57,7 +57,6 @@
 #define CAP_SYNC_PENDING	(1<<1)
 #define CAP_PKT_BUFFERING	(1<<2)
 
-
 typedef enum { CLUSTERER_PING, CLUSTERER_PONG,
 				CLUSTERER_LS_UPDATE, CLUSTERER_FULL_TOP_UPDATE,
 				CLUSTERER_UNKNOWN_ID, CLUSTERER_NODE_DESCRIPTION,
@@ -131,25 +130,30 @@ struct node_search_info {
 	struct node_search_info *next;      /* linker in queue */
 };
 
+#define TIME_DIFF(_start, _now) \
+	((_now).tv_sec*1000000 + (_now).tv_usec \
+	- (_start).tv_sec*1000000 - (_start).tv_usec)
+
 extern enum sip_protos clusterer_proto;
 
 extern str cl_internal_cap;
 extern str cl_extra_cap;
 
-void heartbeats_timer(void);
 void seed_fb_check_timer(utime_t ticks, void *param);
 
 void bin_rcv_cl_packets(bin_packet_t *packet, int packet_type,
 									struct receive_info *ri, void *att);
 void bin_rcv_cl_extra_packets(bin_packet_t *packet, int packet_type,
 									struct receive_info *ri, void *att);
 
-int get_next_hop(struct node_info *dest);
 int msg_add_trailer(bin_packet_t *packet, int cluster_id, int dst_id);
 enum clusterer_send_ret clusterer_send_msg(bin_packet_t *packet,
 												int cluster_id, int dst_id);
 int send_single_cap_update(struct cluster_info *cluster, struct local_cap *cap,
 							int cap_state);
+int send_cap_update(struct node_info *dest_node, int require_reply);
+void do_actions_node_ev(struct cluster_info *clusters, int *select_cluster,
+								int no_clusters);
 
 enum clusterer_send_ret send_gen_msg(int cluster_id, int node_id, str *gen_msg,
 										str *exchg_tag, int req_like);

diff --git a/modules/clusterer/clusterer_mod.c b/modules/clusterer/clusterer_mod.c
@@ -34,6 +34,7 @@
 
 #include "api.h"
 #include "node_info.h"
+#include "topology.h"
 #include "clusterer.h"
 #include "sync.h"
 #include "sharing_tags.h"

diff --git a/modules/clusterer/node_info.c b/modules/clusterer/node_info.c
@@ -34,6 +34,7 @@
 
 #include "api.h"
 #include "node_info.h"
+#include "topology.h"
 #include "clusterer.h"
 
 /* DB */

diff --git a/modules/clusterer/node_info.h b/modules/clusterer/node_info.h
@@ -27,6 +27,7 @@
 #define CL_NODE_INFO_H
 
 #include "../../db/db.h"
+#include "../../rw_locking.h"
 #include "api.h"
 #include "clusterer.h"
 

diff --git a/modules/clusterer/sync.c b/modules/clusterer/sync.c
@@ -22,6 +22,7 @@
 
 #include "api.h"
 #include "node_info.h"
+#include "topology.h"
 #include "clusterer.h"
 #include "sync.h"