summaryrefslogtreecommitdiff
path: root/src/mrl_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mrl_main.c')
-rw-r--r--src/mrl_main.c357
1 files changed, 60 insertions, 297 deletions
diff --git a/src/mrl_main.c b/src/mrl_main.c
index ed40fd2..8b67066 100644
--- a/src/mrl_main.c
+++ b/src/mrl_main.c
@@ -13,25 +13,15 @@ struct mrl_global_instance mrl_instance;
extern struct global_stat_t global_stat;
void mrl_cfg_init(const char *profile)
{
- char *temp_mac_str;
char *temp_port_str;
char *temp_ip_str;
- char *temp_encap_type_str;
- char *temp_vpn_id_str;
char *temp_link_id_str;
- char *temp_link_dir_str;
char *temp_inner_mac_str;
char **_link_id_str;
- char **_encap_type_str;
- char **_vpn_id_str;
- char **_link_dir_str;
char **_inner_mac_str;
- char **encap_type_str;
- char **vpn_id_str;
char **link_id_str;
- char **link_dir_str;
char **gdev_inner_mac_str;
unsigned int split_num = 0;
@@ -45,27 +35,34 @@ void mrl_cfg_init(const char *profile)
/********** load detect info **********/
MESA_load_profile_string_def(profile, "DETECT_INFO", "dest_ip", mrl_instance.mrl_cfg.dest_ip, MRL_STR_IP_LEN, "0.0.0.0");
-
MESA_load_profile_int_def(profile, "DETECT_INFO", "dest_port",&(temp_port),8888);
assert(temp_port > 0 && temp_port <= 65535);
mrl_instance.mrl_cfg.dest_port = temp_port;
-
MESA_load_profile_int_def(profile, "DETECT_INFO", "local_port",&(temp_port),8888);
assert(temp_port > 0 && temp_port <= 65535);
mrl_instance.mrl_cfg.local_port = temp_port;
/********** load sock info **********/
- MESA_load_profile_int_def(profile, "SOCK_INFO", "mrl_port",&(temp_port),8888);
- assert(temp_port > 0 && temp_port <= 65535);
- mrl_instance.mrl_cfg.mrl_port = temp_port;
-
-
+ MESA_load_profile_string_def(profile, "SOCK_INFO", "mgw_ip", mrl_instance.mrl_cfg.mgw_ip, MRL_STR_IP_LEN, "0.0.0.0");
MESA_load_profile_int_def(profile, "SOCK_INFO", "mgw_port",&(temp_port),8888);
assert(temp_port > 0 && temp_port <= 65535);
mrl_instance.mrl_cfg.mgw_port = temp_port;
- MESA_load_profile_string_def(profile, "SOCK_INFO", "mgw_ip", mrl_instance.mrl_cfg.mgw_ip, MRL_STR_IP_LEN, "0.0.0.0");
- MESA_load_profile_string_def(profile, "SOCK_INFO", "mrl_ip",mrl_instance.mrl_cfg.mrl_ip, MRL_STR_IP_LEN, "0.0.0.0");
+ char mrl_netcard[MRL_STR_NETCARD_LEN];
+ memset(mrl_netcard,0,MRL_STR_NETCARD_LEN);
+ MESA_load_profile_string_def(profile, "SOCK_INFO", "mrl_netcard", mrl_netcard, MRL_STR_NETCARD_LEN, "eth0");
+ printf("mrl netcard is %s\n",mrl_netcard);
+ uint32_t temp_mrl_ip = mrl_get_ip_by_eth_name(mrl_netcard);
+ if(temp_mrl_ip < 0)
+ {
+ MESA_handle_runtime_log(mrl_instance.mrl_log_handle, RLOG_LV_FATAL,"mrl_cfg_init","get ip from eth name error,eth name is %s",mrl_netcard);
+ assert(0);
+ }
+ inet_ntop(AF_INET,(void *)&temp_mrl_ip, mrl_instance.mrl_cfg.mrl_ip,MRL_STR_IP_LEN);
+ printf("mrl ip is %s\n",mrl_instance.mrl_cfg.mrl_ip);
+ MESA_load_profile_int_def(profile, "SOCK_INFO", "mrl_port",&(temp_port),8888);
+ assert(temp_port > 0 && temp_port <= 65535);
+ mrl_instance.mrl_cfg.mrl_port = temp_port;
/********** load maat info **********/
@@ -80,38 +77,29 @@ void mrl_cfg_init(const char *profile)
/********** load htable info *********/
- MESA_load_profile_uint_def(profile, "HTABLE_INFO", "ht_slots", &(mrl_instance.mrl_cfg.ht_slots), 1048576);
+ MESA_load_profile_uint_def(profile, "HTABLE_INFO", "ht_slot_size", &(mrl_instance.mrl_cfg.ht_slot_size), 1048576);
MESA_load_profile_uint_def(profile, "HTABLE_INFO", "ht_max_element_num", &(mrl_instance.mrl_cfg.ht_max_element_num), 0);
MESA_load_profile_uint_def(profile, "HTABLE_INFO", "ht_mutex_num", &(mrl_instance.mrl_cfg.ht_mutex_num), 1);
/********** load gdev info **********/
- MESA_load_profile_uint_def(profile, "VXLAN_INFO", "vxlan_gdev_num", &(mrl_instance.mrl_cfg.vxlan_gdev_num), 1);
-
- temp_mac_str = (char *)calloc(mrl_instance.mrl_cfg.vxlan_gdev_num * MRL_STR_MAC_LEN,sizeof(char));
- global_stat.malloc_memory += mrl_instance.mrl_cfg.vxlan_gdev_num * MRL_STR_MAC_LEN;
- temp_ip_str = (char *)calloc(mrl_instance.mrl_cfg.vxlan_gdev_num * MRL_STR_IP_LEN,sizeof(char));
- global_stat.malloc_memory += mrl_instance.mrl_cfg.vxlan_gdev_num * MRL_STR_IP_LEN;
-
- temp_port_str = (char *)calloc(mrl_instance.mrl_cfg.vxlan_gdev_num * MRL_STR_PORT_LEN, sizeof(char));
- global_stat.malloc_memory += mrl_instance.mrl_cfg.vxlan_gdev_num * MRL_STR_PORT_LEN;
+ MESA_load_profile_string_def(profile, "VXLAN_INFO", "vxlan_local_mac", mrl_instance.mrl_cfg.vxlan_outer_local_mac, MRL_STR_MAC_LEN, "00:00:00:00:00:00");
+ MESA_load_profile_string_def(profile, "VXLAN_INFO", "vxlan_local_ip", mrl_instance.mrl_cfg.vxlan_outer_local_ip, MRL_STR_IP_LEN, "127.0.0.1");
+ MESA_load_profile_string_def(profile, "VXLAN_INFO", "vxlan_local_port", mrl_instance.mrl_cfg.xvlan_outer_local_port,MRL_STR_PORT_LEN, "8888");
- MESA_load_profile_string_def(profile, "VXLAN_INFO", "vxlan_gdev_mac",temp_mac_str, mrl_instance.mrl_cfg.vxlan_gdev_num*MRL_STR_MAC_LEN, "00:00:00:00:00:00");
- mrl_instance.mrl_cfg.vxlan_outer_gdev_mac = (char **)calloc(mrl_instance.mrl_cfg.vxlan_gdev_num, sizeof(char *));
- global_stat.malloc_memory += mrl_instance.mrl_cfg.vxlan_gdev_num * sizeof(char *);
- for(i=0;i<mrl_instance.mrl_cfg.vxlan_gdev_num;i++)
- {
- mrl_instance.mrl_cfg.vxlan_outer_gdev_mac[i] = (char *)calloc(MRL_STR_MAC_LEN, sizeof(char));
- global_stat.malloc_memory += sizeof(char)*MRL_STR_MAC_LEN;
+ MESA_load_profile_int_def(profile, "VXLAN_INFO", "vxlan_vpn_id", &(mrl_instance.mrl_cfg.vxlan_vpn_id), 112);
+ MESA_load_profile_int_def(profile, "VXLAN_INFO", "vxlan_link_dir", &(mrl_instance.mrl_cfg.vxlan_link_dir), 0);
+ MESA_load_profile_string_def(profile, "VXLAN_INFO", "vxlan_gdev_mac",mrl_instance.mrl_cfg.vxlan_outer_gdev_mac,MRL_STR_MAC_LEN, "00:00:00:00:00:00");
- }
- split_num = mrl_split_str(temp_mac_str,";",mrl_instance.mrl_cfg.vxlan_outer_gdev_mac);
- assert(split_num == mrl_instance.mrl_cfg.vxlan_gdev_num);
+ MESA_load_profile_uint_def(profile, "VXLAN_INFO", "vxlan_gdev_num", &(mrl_instance.mrl_cfg.vxlan_gdev_num), 1);
+
+ int gdev_ip_len = mrl_instance.mrl_cfg.vxlan_gdev_num*MRL_STR_IP_LEN;
+ temp_ip_str = (char *)calloc(gdev_ip_len,sizeof(char));
+ global_stat.malloc_memory += gdev_ip_len;
-
- MESA_load_profile_string_def(profile, "VXLAN_INFO", "vxlan_gdev_ip",temp_ip_str, mrl_instance.mrl_cfg.vxlan_gdev_num*MRL_STR_IP_LEN, "0.0.0.0");
+ MESA_load_profile_string_def(profile, "VXLAN_INFO", "vxlan_gdev_ip",temp_ip_str, gdev_ip_len, "0.0.0.0");
mrl_instance.mrl_cfg.vxlan_outer_gdev_ip = (char **)calloc(mrl_instance.mrl_cfg.vxlan_gdev_num, sizeof(char *));
global_stat.malloc_memory +=mrl_instance.mrl_cfg.vxlan_gdev_num * sizeof(char *);
@@ -123,8 +111,11 @@ void mrl_cfg_init(const char *profile)
split_num = mrl_split_str(temp_ip_str,";",mrl_instance.mrl_cfg.vxlan_outer_gdev_ip);
assert(split_num == mrl_instance.mrl_cfg.vxlan_gdev_num);
+ int gdev_port_len = mrl_instance.mrl_cfg.vxlan_gdev_num*MRL_STR_PORT_LEN;
+ temp_port_str = (char *)calloc(gdev_port_len,sizeof(char));
+ global_stat.malloc_memory += gdev_port_len;
- MESA_load_profile_string_def(profile, "VXLAN_INFO", "vxlan_gdev_port",temp_port_str, mrl_instance.mrl_cfg.vxlan_gdev_num*MRL_STR_PORT_LEN, "8888");
+ MESA_load_profile_string_def(profile, "VXLAN_INFO", "vxlan_gdev_port",temp_port_str, gdev_port_len, "8888");
mrl_instance.mrl_cfg.vxlan_outer_gdev_port = (char **)calloc(mrl_instance.mrl_cfg.vxlan_gdev_num, sizeof(char *));
global_stat.malloc_memory +=mrl_instance.mrl_cfg.vxlan_gdev_num * sizeof(char *);
@@ -134,12 +125,11 @@ void mrl_cfg_init(const char *profile)
global_stat.malloc_memory += sizeof(char)*MRL_STR_PORT_LEN;
}
split_num = mrl_split_str(temp_port_str,";",mrl_instance.mrl_cfg.vxlan_outer_gdev_port);
- assert(split_num == mrl_instance.mrl_cfg.vxlan_gdev_num);
+ assert(split_num == mrl_instance.mrl_cfg.vxlan_gdev_num);
-
MESA_load_profile_uint_def(profile, "VXLAN_INFO", "vxlan_link_id_num", &(mrl_instance.mrl_cfg.vxlan_link_id_num), 1);
+
int link_id_len = mrl_instance.mrl_cfg.vxlan_gdev_num*mrl_instance.mrl_cfg.vxlan_link_id_num*MRL_STR_LINK_ID_LEN;
- printf("link id len is %d\n",link_id_len);
temp_link_id_str = (char *)calloc(link_id_len,sizeof(char));
global_stat.malloc_memory += link_id_len;
MESA_load_profile_string_def(profile, "VXLAN_INFO", "vxlan_link_id",temp_link_id_str,link_id_len,"0");
@@ -155,7 +145,6 @@ void mrl_cfg_init(const char *profile)
mrl_instance.mrl_cfg.vxlan_link_id[i] = (int *)calloc(mrl_instance.mrl_cfg.vxlan_link_id_num, sizeof(int));
global_stat.malloc_memory += sizeof(int)*mrl_instance.mrl_cfg.vxlan_link_id_num;
}
-
split_num = mrl_split_str(temp_link_id_str,";",link_id_str);
assert(split_num == mrl_instance.mrl_cfg.vxlan_gdev_num);
_link_id_str = (char **)calloc(mrl_instance.mrl_cfg.vxlan_link_id_num, sizeof(char*));
@@ -175,141 +164,10 @@ void mrl_cfg_init(const char *profile)
printf("%d gdev %d link id is %d\n",i,j,mrl_instance.mrl_cfg.vxlan_link_id[i][j]);
}
}
-
-
- int encap_type_len = mrl_instance.mrl_cfg.vxlan_gdev_num*mrl_instance.mrl_cfg.vxlan_link_id_num*MRL_STR_ENCAP_TYPE_LEN;
- printf("encap type len is %d\n",encap_type_len);
-
- temp_encap_type_str = (char *)calloc(encap_type_len,sizeof(char));
- global_stat.malloc_memory += encap_type_len;
-
- MESA_load_profile_string_def(profile, "VXLAN_INFO", "vxlan_encap_type",temp_encap_type_str,encap_type_len,"0");
- encap_type_str = (char **)calloc(mrl_instance.mrl_cfg.vxlan_gdev_num, sizeof(char *));
- global_stat.malloc_memory += mrl_instance.mrl_cfg.vxlan_gdev_num * sizeof(char *);
-
- mrl_instance.mrl_cfg.vxlan_encap_type= (int **)calloc(mrl_instance.mrl_cfg.vxlan_gdev_num,sizeof(int *));
- global_stat.malloc_memory += mrl_instance.mrl_cfg.vxlan_gdev_num * sizeof(int *);
-
- for(i=0;i<mrl_instance.mrl_cfg.vxlan_gdev_num;i++)
- {
- encap_type_str[i] = (char *)calloc(MRL_STR_ENCAP_TYPE_LEN*mrl_instance.mrl_cfg.vxlan_link_id_num, sizeof(char));
- global_stat.malloc_memory += sizeof(char)*MRL_STR_ENCAP_TYPE_LEN*mrl_instance.mrl_cfg.vxlan_link_id_num;
-
- mrl_instance.mrl_cfg.vxlan_encap_type[i] = (int *)calloc(mrl_instance.mrl_cfg.vxlan_link_id_num, sizeof(int));
- global_stat.malloc_memory += sizeof(int)*mrl_instance.mrl_cfg.vxlan_link_id_num;
- }
-
- split_num = mrl_split_str(temp_encap_type_str,";",encap_type_str);
- assert(split_num == mrl_instance.mrl_cfg.vxlan_gdev_num);
- _encap_type_str = (char **)calloc(mrl_instance.mrl_cfg.vxlan_link_id_num, sizeof(char*));
- global_stat.malloc_memory +=mrl_instance.mrl_cfg.vxlan_link_id_num * sizeof(char *);
- for(i =0; i< mrl_instance.mrl_cfg.vxlan_link_id_num; i++)
- {
- _encap_type_str[i] = (char *)calloc(MRL_STR_ENCAP_TYPE_LEN,sizeof(char));
- global_stat.malloc_memory +=MRL_STR_ENCAP_TYPE_LEN * sizeof(char);
- }
- for(i = 0; i < mrl_instance.mrl_cfg.vxlan_gdev_num; i++)
- {
- split_num = mrl_split_str(encap_type_str[i],",",_encap_type_str);
- assert(split_num == mrl_instance.mrl_cfg.vxlan_link_id_num);
- for(j = 0; j < mrl_instance.mrl_cfg.vxlan_link_id_num; j++)
- {
- mrl_instance.mrl_cfg.vxlan_encap_type[i][j] = atoi(_encap_type_str[j]);
- printf("%d gdev %d encap type is %d\n",i,j,mrl_instance.mrl_cfg.vxlan_encap_type[i][j]);
- }
- }
-
-
- int vpn_id_len = mrl_instance.mrl_cfg.vxlan_gdev_num*mrl_instance.mrl_cfg.vxlan_link_id_num*MRL_STR_VPN_ID_LEN;
- printf("vpn id len is %d\n",vpn_id_len);
-
- temp_vpn_id_str = (char *)calloc(vpn_id_len,sizeof(char));
- global_stat.malloc_memory += vpn_id_len;
-
- MESA_load_profile_string_def(profile, "VXLAN_INFO", "vxlan_vpn_id",temp_vpn_id_str,vpn_id_len,"0");
- vpn_id_str = (char **)calloc(mrl_instance.mrl_cfg.vxlan_gdev_num, sizeof(char *));
- global_stat.malloc_memory += mrl_instance.mrl_cfg.vxlan_gdev_num * sizeof(char *);
-
- mrl_instance.mrl_cfg.vxlan_vpn_id= (int **)calloc(mrl_instance.mrl_cfg.vxlan_gdev_num,sizeof(int *));
- global_stat.malloc_memory += mrl_instance.mrl_cfg.vxlan_gdev_num * sizeof(int *);
-
- for(i=0;i<mrl_instance.mrl_cfg.vxlan_gdev_num;i++)
- {
- vpn_id_str[i] = (char *)calloc(MRL_STR_VPN_ID_LEN*mrl_instance.mrl_cfg.vxlan_link_id_num, sizeof(char));
- global_stat.malloc_memory += sizeof(char)*MRL_STR_VPN_ID_LEN*mrl_instance.mrl_cfg.vxlan_link_id_num;
-
- mrl_instance.mrl_cfg.vxlan_vpn_id[i] = (int *)calloc(mrl_instance.mrl_cfg.vxlan_link_id_num, sizeof(int));
- global_stat.malloc_memory += sizeof(int)*mrl_instance.mrl_cfg.vxlan_link_id_num;
- }
-
- split_num = mrl_split_str(temp_vpn_id_str,";",vpn_id_str);
- assert(split_num == mrl_instance.mrl_cfg.vxlan_gdev_num);
- _vpn_id_str = (char **)calloc(mrl_instance.mrl_cfg.vxlan_link_id_num, sizeof(char*));
- global_stat.malloc_memory +=mrl_instance.mrl_cfg.vxlan_link_id_num * sizeof(char *);
- for(i =0; i< mrl_instance.mrl_cfg.vxlan_link_id_num; i++)
- {
- _vpn_id_str[i] = (char *)calloc(MRL_STR_VPN_ID_LEN,sizeof(char));
- global_stat.malloc_memory += MRL_STR_VPN_ID_LEN * sizeof(char);
- }
- for(i = 0; i < mrl_instance.mrl_cfg.vxlan_gdev_num; i++)
- {
- split_num = mrl_split_str(vpn_id_str[i],",",_vpn_id_str);
- assert(split_num == mrl_instance.mrl_cfg.vxlan_link_id_num);
- for(j = 0; j < mrl_instance.mrl_cfg.vxlan_link_id_num; j++)
- {
- mrl_instance.mrl_cfg.vxlan_vpn_id[i][j] = atoi(_vpn_id_str[j]);
- printf("%d gdev %d vpn id is %d\n",i,j,mrl_instance.mrl_cfg.vxlan_vpn_id[i][j]);
- }
- }
- int link_dir_len = mrl_instance.mrl_cfg.vxlan_gdev_num*mrl_instance.mrl_cfg.vxlan_link_id_num*MRL_STR_LINK_DIR_LEN;
- printf("link dir len is %d\n",link_dir_len);
-
- temp_link_dir_str = (char *)calloc(link_dir_len,sizeof(char));
- global_stat.malloc_memory += link_dir_len;
-
- MESA_load_profile_string_def(profile, "VXLAN_INFO", "vxlan_link_id",temp_link_dir_str,link_dir_len,"0");
-
- link_dir_str = (char **)calloc(mrl_instance.mrl_cfg.vxlan_gdev_num, sizeof(char *));
- global_stat.malloc_memory += mrl_instance.mrl_cfg.vxlan_gdev_num * sizeof(char *);
-
- mrl_instance.mrl_cfg.vxlan_link_dir= (int **)calloc(mrl_instance.mrl_cfg.vxlan_gdev_num,sizeof(int *));
- global_stat.malloc_memory += mrl_instance.mrl_cfg.vxlan_gdev_num * sizeof(int *);
-
- for(i=0;i<mrl_instance.mrl_cfg.vxlan_gdev_num;i++)
- {
- link_dir_str[i] = (char *)calloc(MRL_STR_LINK_DIR_LEN*mrl_instance.mrl_cfg.vxlan_link_id_num, sizeof(char));
- global_stat.malloc_memory += sizeof(char)*MRL_STR_LINK_DIR_LEN*mrl_instance.mrl_cfg.vxlan_link_id_num;
-
- mrl_instance.mrl_cfg.vxlan_link_dir[i] = (int *)calloc(mrl_instance.mrl_cfg.vxlan_link_id_num, sizeof(int));
- global_stat.malloc_memory += sizeof(int)*mrl_instance.mrl_cfg.vxlan_link_id_num;
- }
-
- split_num = mrl_split_str(temp_link_dir_str,";",link_dir_str);
- assert(split_num == mrl_instance.mrl_cfg.vxlan_gdev_num);
-
- _link_dir_str = (char **)calloc(mrl_instance.mrl_cfg.vxlan_link_id_num, sizeof(char*));
- global_stat.malloc_memory +=mrl_instance.mrl_cfg.vxlan_link_id_num * sizeof(char *);
- for(i =0; i< mrl_instance.mrl_cfg.vxlan_link_id_num; i++)
- {
- _link_dir_str[i] = (char *)calloc(MRL_STR_LINK_DIR_LEN,sizeof(char));
- global_stat.malloc_memory +=MRL_STR_LINK_DIR_LEN * sizeof(char);
- }
- for(i = 0; i < mrl_instance.mrl_cfg.vxlan_gdev_num; i++)
- {
- split_num = mrl_split_str(link_dir_str[i],",",_link_dir_str);
- assert(split_num == mrl_instance.mrl_cfg.vxlan_link_id_num);
- for(j = 0; j < mrl_instance.mrl_cfg.vxlan_link_id_num; j++)
- {
- mrl_instance.mrl_cfg.vxlan_link_dir[i][j] = atoi(_link_dir_str[j]);
- printf("%d gdev %d link dir is %d\n",i,j,mrl_instance.mrl_cfg.vxlan_link_dir[i][j]);
- }
- }
-
int inner_mac_len = mrl_instance.mrl_cfg.vxlan_gdev_num*mrl_instance.mrl_cfg.vxlan_link_id_num*MRL_STR_MAC_LEN;
printf("inner mac len is %d\n",inner_mac_len);
-
temp_inner_mac_str = (char *)calloc(inner_mac_len,sizeof(char));
global_stat.malloc_memory += inner_mac_len;
@@ -354,79 +212,51 @@ void mrl_cfg_init(const char *profile)
}
}
- MESA_load_profile_string_def(profile, "VXLAN_INFO", "vxlan_inner_dmac",temp_inner_mac_str, inner_mac_len, "00:00:00:00:00:00");
- split_num = mrl_split_str(temp_inner_mac_str,";",gdev_inner_mac_str);
- assert(split_num == mrl_instance.mrl_cfg.vxlan_gdev_num);
- mrl_instance.mrl_cfg.vxlan_inner_dmac = (char ***)calloc(mrl_instance.mrl_cfg.vxlan_gdev_num,sizeof(char **));
- global_stat.malloc_memory += sizeof(char **)*mrl_instance.mrl_cfg.vxlan_gdev_num;
- for(i = 0; i< mrl_instance.mrl_cfg.vxlan_gdev_num; i++)
- {
- mrl_instance.mrl_cfg.vxlan_inner_dmac[i] = (char **)calloc(mrl_instance.mrl_cfg.vxlan_link_id_num, sizeof(char *));
- global_stat.malloc_memory += sizeof(char *)*mrl_instance.mrl_cfg.vxlan_link_id_num;
- for(j = 0; j< mrl_instance.mrl_cfg.vxlan_link_id_num; j++)
- {
- mrl_instance.mrl_cfg.vxlan_inner_dmac[i][j]=(char *)calloc(MRL_STR_MAC_LEN,sizeof(char));
- global_stat.malloc_memory += sizeof(char)*MRL_STR_MAC_LEN;
- }
- }
-
- for(i=0; i<mrl_instance.mrl_cfg.vxlan_gdev_num;i++)
- {
- split_num = mrl_split_str(gdev_inner_mac_str[i],",",_inner_mac_str);
- assert(split_num == mrl_instance.mrl_cfg.vxlan_link_id_num);
- for(j = 0; j < mrl_instance.mrl_cfg.vxlan_link_id_num; j++)
+ MESA_load_profile_string_def(profile, "VXLAN_INFO", "vxlan_inner_dmac",temp_inner_mac_str, inner_mac_len, "00:00:00:00:00:00");
+ split_num = mrl_split_str(temp_inner_mac_str,";",gdev_inner_mac_str);
+ assert(split_num == mrl_instance.mrl_cfg.vxlan_gdev_num);
+ mrl_instance.mrl_cfg.vxlan_inner_dmac = (char ***)calloc(mrl_instance.mrl_cfg.vxlan_gdev_num,sizeof(char **));
+ global_stat.malloc_memory += sizeof(char **)*mrl_instance.mrl_cfg.vxlan_gdev_num;
+ for(i = 0; i< mrl_instance.mrl_cfg.vxlan_gdev_num; i++)
+ {
+ mrl_instance.mrl_cfg.vxlan_inner_dmac[i] = (char **)calloc(mrl_instance.mrl_cfg.vxlan_link_id_num, sizeof(char *));
+ global_stat.malloc_memory += sizeof(char *)*mrl_instance.mrl_cfg.vxlan_link_id_num;
+ for(j = 0; j< mrl_instance.mrl_cfg.vxlan_link_id_num; j++)
{
- memcpy(mrl_instance.mrl_cfg.vxlan_inner_dmac[i][j], _inner_mac_str[j],strlen(_inner_mac_str[j]));
- printf("the dmac of %d gdev %d link id is %s\n",i,j,mrl_instance.mrl_cfg.vxlan_inner_dmac[i][j]);
+ mrl_instance.mrl_cfg.vxlan_inner_dmac[i][j]=(char *)calloc(MRL_STR_MAC_LEN,sizeof(char));
+ global_stat.malloc_memory += sizeof(char)*MRL_STR_MAC_LEN;
}
- }
-
- MESA_load_profile_string_def(profile, "VXLAN_INFO", "vxlan_local_mac", mrl_instance.mrl_cfg.vxlan_outer_local_mac, MRL_STR_MAC_LEN, "00:00:00:00:00:00");
- MESA_load_profile_string_def(profile, "VXLAN_INFO", "vxlan_local_ip", mrl_instance.mrl_cfg.vxlan_outer_local_ip, MRL_STR_IP_LEN, "0.0.0.0");
- MESA_load_profile_string_def(profile, "VXLAN_INFO", "vxlan_local_port", mrl_instance.mrl_cfg.xvlan_outer_local_port,MRL_STR_PORT_LEN, "8888");
-
- free(temp_mac_str);
- global_stat.free_memory += mrl_instance.mrl_cfg.vxlan_gdev_num * MRL_STR_MAC_LEN*sizeof(char);
+ }
+ for(i=0; i<mrl_instance.mrl_cfg.vxlan_gdev_num;i++)
+ {
+ split_num = mrl_split_str(gdev_inner_mac_str[i],",",_inner_mac_str);
+ assert(split_num == mrl_instance.mrl_cfg.vxlan_link_id_num);
+ for(j = 0; j < mrl_instance.mrl_cfg.vxlan_link_id_num; j++)
+ {
+ memcpy(mrl_instance.mrl_cfg.vxlan_inner_dmac[i][j], _inner_mac_str[j],strlen(_inner_mac_str[j]));
+ printf("the dmac of %d gdev %d link id is %s\n",i,j,mrl_instance.mrl_cfg.vxlan_inner_dmac[i][j]);
+ }
+ }
+
free(temp_ip_str);
global_stat.free_memory += mrl_instance.mrl_cfg.vxlan_gdev_num * MRL_STR_IP_LEN*sizeof(char);
free(temp_port_str);
global_stat.free_memory += mrl_instance.mrl_cfg.vxlan_gdev_num * MRL_STR_PORT_LEN*sizeof(char);
- free(temp_encap_type_str);
- global_stat.free_memory += encap_type_len*sizeof(char);
-
- free(temp_vpn_id_str);
- global_stat.free_memory += vpn_id_len*sizeof(char);
-
free(temp_link_id_str);
global_stat.free_memory += link_id_len*sizeof(char);
- free(temp_link_dir_str);
- global_stat.free_memory += link_dir_len*sizeof(char);
-
free(temp_inner_mac_str);
global_stat.free_memory += inner_mac_len*sizeof(char);
for(i=0; i<mrl_instance.mrl_cfg.vxlan_gdev_num; i++)
{
- free(encap_type_str[i]);
- encap_type_str[i]=NULL;
- global_stat.free_memory += sizeof(char)*MRL_STR_ENCAP_TYPE_LEN;
-
- free(vpn_id_str[i]);
- vpn_id_str[i]=NULL;
- global_stat.free_memory += sizeof(char)*MRL_STR_VPN_ID_LEN;
-
free(link_id_str[i]);
link_id_str[i]=NULL;
global_stat.free_memory += sizeof(char)*MRL_STR_LINK_ID_LEN;
- free(link_dir_str[i]);
- link_dir_str[i]=NULL;
- global_stat.free_memory += sizeof(char)*MRL_STR_LINK_DIR_LEN;
-
free(gdev_inner_mac_str[i]);
gdev_inner_mac_str[i]=NULL;
global_stat.free_memory += sizeof(char)*MRL_STR_MAC_LEN*mrl_instance.mrl_cfg.vxlan_link_id_num;
@@ -435,42 +265,14 @@ void mrl_cfg_init(const char *profile)
for(i=0; i<mrl_instance.mrl_cfg.vxlan_link_id_num; i++)
{
- free(_encap_type_str[i]);
- _encap_type_str[i]=NULL;
- global_stat.free_memory += sizeof(char)*MRL_STR_ENCAP_TYPE_LEN;
-
- free(_vpn_id_str[i]);
- _vpn_id_str[i]=NULL;
- global_stat.free_memory += sizeof(char)*MRL_STR_VPN_ID_LEN;
-
free(_link_id_str[i]);
_link_id_str[i]=NULL;
global_stat.free_memory += sizeof(char)*MRL_STR_LINK_ID_LEN;
- free(_link_dir_str[i]);
- _link_dir_str[i]=NULL;
- global_stat.free_memory += sizeof(char)*MRL_STR_LINK_DIR_LEN;
-
free(_inner_mac_str[i]);
_inner_mac_str[i]=NULL;
global_stat.free_memory += sizeof(char)*MRL_STR_MAC_LEN;
}
-
- free(encap_type_str);
- encap_type_str = NULL;
- global_stat.free_memory += mrl_instance.mrl_cfg.vxlan_gdev_num * sizeof(char*);
-
- free(_encap_type_str);
- _encap_type_str = NULL;
- global_stat.free_memory += mrl_instance.mrl_cfg.vxlan_link_id_num* sizeof(char*);
-
- free(vpn_id_str);
- vpn_id_str = NULL;
- global_stat.free_memory += mrl_instance.mrl_cfg.vxlan_gdev_num * sizeof(char*);
-
- free(_vpn_id_str);
- _vpn_id_str = NULL;
- global_stat.free_memory += mrl_instance.mrl_cfg.vxlan_link_id_num* sizeof(char*);
free(link_id_str);
link_id_str = NULL;
@@ -480,14 +282,6 @@ void mrl_cfg_init(const char *profile)
_link_id_str = NULL;
global_stat.free_memory += mrl_instance.mrl_cfg.vxlan_link_id_num* sizeof(char*);
- free(link_dir_str);
- link_dir_str = NULL;
- global_stat.free_memory += mrl_instance.mrl_cfg.vxlan_gdev_num * sizeof(char*);
-
- free(_link_dir_str);
- _link_dir_str = NULL;
- global_stat.free_memory += mrl_instance.mrl_cfg.vxlan_link_id_num* sizeof(char*);
-
free(gdev_inner_mac_str);
gdev_inner_mac_str = NULL;
global_stat.free_memory += mrl_instance.mrl_cfg.vxlan_gdev_num* sizeof(char*);
@@ -566,28 +360,13 @@ void mrl_destroy_cfg()
unsigned int i=0, j = 0;
for(i=0;i<mrl_instance.mrl_cfg.vxlan_link_id_num; i++)
{
- free(mrl_instance.mrl_cfg.vxlan_encap_type[i]);
- mrl_instance.mrl_cfg.vxlan_encap_type[i] = NULL;
- global_stat.free_memory += sizeof(int)*mrl_instance.mrl_cfg.vxlan_link_id_num;
-
free(mrl_instance.mrl_cfg.vxlan_link_id[i]);
mrl_instance.mrl_cfg.vxlan_link_id[i] = NULL;
global_stat.free_memory += sizeof(int)*mrl_instance.mrl_cfg.vxlan_link_id_num;
-
- free(mrl_instance.mrl_cfg.vxlan_link_dir[i]);
- mrl_instance.mrl_cfg.vxlan_link_dir[i] = NULL;
- global_stat.free_memory += sizeof(int)*mrl_instance.mrl_cfg.vxlan_link_id_num;
-
- free(mrl_instance.mrl_cfg.vxlan_vpn_id[i]);
- mrl_instance.mrl_cfg.vxlan_vpn_id[i] = NULL;
- global_stat.free_memory += sizeof(int)*mrl_instance.mrl_cfg.vxlan_link_id_num;
}
for(i = 0; i<mrl_instance.mrl_cfg.vxlan_gdev_num;i++)
{
- free(mrl_instance.mrl_cfg.vxlan_outer_gdev_mac[i]);
- mrl_instance.mrl_cfg.vxlan_outer_gdev_mac[i] =NULL;
- global_stat.free_memory += sizeof(int)*MRL_STR_MAC_LEN;
free(mrl_instance.mrl_cfg.vxlan_outer_gdev_ip[i]);
mrl_instance.mrl_cfg.vxlan_outer_gdev_ip[i] =NULL;
@@ -616,10 +395,6 @@ void mrl_destroy_cfg()
global_stat.free_memory += sizeof(char*)*mrl_instance.mrl_cfg.vxlan_link_id_num;
}
-
- free(mrl_instance.mrl_cfg.vxlan_outer_gdev_mac);
- mrl_instance.mrl_cfg.vxlan_outer_gdev_mac =NULL;
- global_stat.free_memory += mrl_instance.mrl_cfg.vxlan_gdev_num * sizeof(char *);
free(mrl_instance.mrl_cfg.vxlan_outer_gdev_ip);
mrl_instance.mrl_cfg.vxlan_outer_gdev_ip =NULL;
@@ -629,22 +404,10 @@ void mrl_destroy_cfg()
mrl_instance.mrl_cfg.vxlan_outer_gdev_port =NULL;
global_stat.free_memory += mrl_instance.mrl_cfg.vxlan_gdev_num * sizeof(char *);
- free(mrl_instance.mrl_cfg.vxlan_encap_type);
- mrl_instance.mrl_cfg.vxlan_encap_type =NULL;
- global_stat.free_memory += mrl_instance.mrl_cfg.vxlan_gdev_num * sizeof(char *);
-
free(mrl_instance.mrl_cfg.vxlan_link_id);
mrl_instance.mrl_cfg.vxlan_link_id =NULL;
global_stat.free_memory += mrl_instance.mrl_cfg.vxlan_gdev_num * sizeof(char *);
- free(mrl_instance.mrl_cfg.vxlan_link_dir);
- mrl_instance.mrl_cfg.vxlan_link_dir =NULL;
- global_stat.free_memory += mrl_instance.mrl_cfg.vxlan_gdev_num * sizeof(char *);
-
- free(mrl_instance.mrl_cfg.vxlan_vpn_id);
- mrl_instance.mrl_cfg.vxlan_vpn_id =NULL;
- global_stat.free_memory += mrl_instance.mrl_cfg.vxlan_gdev_num * sizeof(char *);
-
free(mrl_instance.mrl_cfg.vxlan_inner_smac);
mrl_instance.mrl_cfg.vxlan_inner_smac =NULL;
global_stat.free_memory += mrl_instance.mrl_cfg.vxlan_gdev_num * sizeof(char **);
@@ -724,7 +487,7 @@ extern "C" char mrl_udp_entry(struct streaminfo *a_udp, void **pme, int thread_
}
else
{
- if(mrl_identify_nominee(a_udp,raw_packet))
+ if(mrl_identify_nominee(a_udp))
{
ret =APP_STATE_GIVEME;
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-30 23:25:14 +0000