测试完成写candidate表功能

4 files changed, 20 insertions, 24 deletions

diff --git a/include/mrl_main.h b/include/mrl_main.h
index d6f029a..5f47ad2 100644
--- a/include/mrl_main.h
+++ b/include/mrl_main.h
@@ -15,7 +15,7 @@
 #define MRL_STR_PORT_LEN 6

 #define MRL_STR_IP_LEN 16

 

-#define DATE_LEN 50

+#define MRL_DATE_LEN 50

 

 #define MRL_MAX_PATH 50

 

diff --git a/include/mrl_packet.h b/include/mrl_packet.h
index 4378c80..da14d50 100644
--- a/include/mrl_packet.h
+++ b/include/mrl_packet.h
@@ -9,6 +9,10 @@ void mrl_send_to_gdev(int thread_seq, struct mrl_vxlan_info * vxlan_info, const
 bool mrl_pkt_signature_identify(struct streaminfo *mystream);

 void *mrl_recv_mgw_action(void *arg);

 void mrl_send_to_mgw(void *raw_pkt, int thread_seq);

+void mrl_detect_init();

+void detect_ip_addr(const char *ip_addr);

+

+

 

 

 #endif

diff --git a/include/mrl_redis.h b/include/mrl_redis.h
index bdf35f9..84578f3 100644
--- a/include/mrl_redis.h
+++ b/include/mrl_redis.h
@@ -4,25 +4,16 @@
 #include "mrl_main.h"

 

 #define IR_NOMINEE_IP_TABLE_NAME "IR_NOMINEE_IP"

-#define IR_CANDIDATE_IP_TABLE_NAME  "IR_CANDINATE_IP"

-#define REDIS_CANDIATE_KEY_NAME  "IR_CANDIDATE_ID"

+#define IR_CANDIDATE_IP_TABLE_NAME  "IR_CANDIDATE_IP"

+//#define REDIS_CANDIATE_KEY_NAME  "IR_CANDIDATE_ID"

 

 struct mrl_nominee_item{

-    int region_id;

+    int config_id;

     int group_id;

     int addr_type;

-    char src_ip[MRL_STR_IP_LEN];

-    char mask_src_ip[MRL_STR_IP_LEN];

-    char dport[MRL_STR_PORT_LEN];

-    char mask_dport[MRL_STR_PORT_LEN];

-    int protocol;

-    int direction;

+    char ip_addr[MRL_STR_IP_LEN];

     int is_vaild;

-    int action;

-    int service;

-    char date[DATE_LEN];

-    int type;

-    int strategy_group_id;

+    char op_time[MRL_DATE_LEN];

 };

 

 struct mrl_vxlan_info{

@@ -39,23 +30,23 @@ struct mrl_vxlan_info{
     char vxlan_inner_dmac[MRL_STR_MAC_LEN];

 };

 struct mrl_candidate_item{

-    int candidate_id;

+    int config_id;

+    int group_id;

     int addr_type;

-    char client_ip[MRL_STR_IP_LEN];//�ͻ���IP

-    int type;

+    char ip_addr[MRL_STR_IP_LEN];//�ͻ���IP

     int location;

-    int group_id;

     char mrl_ip[MRL_STR_IP_LEN];

     struct mrl_vxlan_info vxlan_info;

+    int is_vaild;

+    char op_time[MRL_DATE_LEN];

 };

 

 MESA_htable_handle mrl_htable_init(void * fn_data_free_cb);

+

 void ht_candidate_free_cb(void * data);

 void ht_nominee_free_cb(void * data);

 void Maat_set_cmd_line(Maat_feather_t feather, struct mrl_candidate_item *candidate_item);

-

-

-

+void Maat_set_nominee_cmd_line(Maat_feather_t feather, struct mrl_nominee_item *nominee_item);

 

 Maat_feather_t mrl_Maat_feather_init(const char * instance_name,const char *table_name, Maat_start_callback_t *start,Maat_update_callback_t *update,Maat_finish_callback_t *finish,void *u_para);

 void nominee_update_cb(int table_id,const char* table_line,void* u_para);

diff --git a/include/mrl_base.h b/include/mrl_utils.h
index ab34663..63a489b 100644
--- a/include/mrl_base.h
+++ b/include/mrl_utils.h
@@ -1,8 +1,9 @@
-#ifndef __MRL_BASE_H_

-#define __MRL_BASE_H_

+#ifndef __MRL_UTILS_H_

+#define __MRL_UTILS_H_

 

 unsigned int mrl_split_str(char *str, const char *delim, char **dest);

 int mrl_mac_pton(const char *str, int delim, char *mac);

+void get_cur_time(char *time);

 

 

 #endif