修改部分配置文件选项；修改日志输出形式；修改nominee_key，从uint32_t修改为char *HEADv1.0.0master

3 files changed, 20 insertions, 16 deletions

diff --git a/include/mrl_main.h b/include/mrl_main.h
index 67530b1..721e9b6 100644
--- a/include/mrl_main.h
+++ b/include/mrl_main.h
@@ -40,24 +40,26 @@ struct mrl_global_cfg
     int redis_index;

 

     //htable info

-    unsigned int ht_slots;

+    unsigned int ht_slot_size;

     unsigned int ht_max_element_num;

     unsigned int ht_mutex_num;

 

     /*vxlan info*/

-    unsigned int vxlan_gdev_num;

-    char **vxlan_outer_gdev_mac;

     char vxlan_outer_local_mac[MRL_STR_MAC_LEN];

-    char **vxlan_outer_gdev_ip;

     char vxlan_outer_local_ip[MRL_STR_IP_LEN];

-    char **vxlan_outer_gdev_port;

     char xvlan_outer_local_port[MRL_STR_PORT_LEN];

+    

+    int vxlan_vpn_id;

+    int vxlan_link_dir;

+

+    unsigned int vxlan_gdev_num;

+    char vxlan_outer_gdev_mac[MRL_STR_MAC_LEN];

+    char **vxlan_outer_gdev_ip;

+    char **vxlan_outer_gdev_port;

+

+    

     unsigned int vxlan_link_id_num;//���������豸������·��

-    int **vxlan_vpn_id;

-    int **vxlan_encap_type;

-    int **vxlan_link_dir;

     int **vxlan_link_id;

-    

     char ***vxlan_inner_smac;

     char ***vxlan_inner_dmac;  

 };

diff --git a/include/mrl_redis.h b/include/mrl_redis.h
index 252e133..8d56601 100644
--- a/include/mrl_redis.h
+++ b/include/mrl_redis.h
@@ -8,10 +8,10 @@
 #define IR_DNAT_POLICY_TABLE_NAME "IR_DNAT_POLICY"

 

 struct mrl_ht_nominee_key{

-uint32_t sip;//network order

-uint32_t dip;//network order

-uint16_t sport;//network order

-uint16_t dport;//network order

+char sip[MRL_STR_IP_LEN];

+char dip[MRL_STR_IP_LEN];

+uint16_t sport;//host order

+uint16_t dport;//host order

 };

 

 struct mrl_nominee_item{

@@ -58,8 +58,7 @@ void ht_nominee_free_cb(void * data);
 void Maat_set_cmd_line(Maat_feather_t feather, struct mrl_candidate_item *candidate_item);

 Maat_feather_t mrl_Maat_feather_init();

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

-bool mrl_identify_nominee(struct streaminfo *mystream,void *rawpkt);

-//bool mrl_identify_nominee(struct streaminfo *mystream);

+bool mrl_identify_nominee(struct streaminfo *mystream);

 

 #endif

 

diff --git a/include/mrl_utils.h b/include/mrl_utils.h
index d65f543..5d3f132 100644
--- a/include/mrl_utils.h
+++ b/include/mrl_utils.h
@@ -11,7 +11,7 @@
 #define MRL_STR_VPN_ID_LEN 5

 #define MRL_STR_PROT_LEN 4

 #define MRL_STR_EFFEC_RANGE_LEN 20

-

+#define MRL_STR_NETCARD_LEN 20

 #define MRL_DATE_LEN 50

 

 #define MRL_MAX_PATH 50

@@ -38,6 +38,9 @@ unsigned int mrl_split_str(char *str, const char *delim, char **dest);
 int mrl_mac_pton(const char *str, int delim, uint8_t *mac);

 void get_cur_time(char *time);

 unsigned short mrl_get_checksum(unsigned short * buffer, size_t len);

+unsigned int mrl_get_ip_by_eth_name(const char *ifname);

+int mrl_inet_ntoa(uint32_t ip, char *dest);

+

 

 void mrl_mmdb_init(const char *path);

 int mrl_search_ip_country(MMDB_s mmdb, const char *ip_address, const char *mycountry);