初步和接入网关联调成功

4 files changed, 13 insertions, 8 deletions

diff --git a/bin/conf/mrl.conf b/bin/conf/mrl.conf
index 58ee390..92c58f0 100644
--- a/bin/conf/mrl.conf
+++ b/bin/conf/mrl.conf
@@ -1,6 +1,10 @@
 [LOG_INFO]

-log_level=20

+log_level=10

 log_path=./log/mrl.log

+[DETECT_INFO]

+dest_ip=123.57.35.217

+dest_port=20181

+local_port=20182

 [SOCK_INFO]

 mrl_port=23456

 mgw_port=33456

@@ -18,14 +22,15 @@ ht_max_element_num=40000
 ht_mutex_num=5

 [VXLAN_INFO]

 vxlan_gdev_num=1

-vxlan_local_mac=e4:95:6e:20:0d:0as

+vxlan_local_mac=e4:95:6e:20:0d:0a

 vxlan_gdev_mac=00:1e:73:6c:fa:43

 vxlan_local_ip=192.168.1.10

 vxlan_gdev_ip=10.1.1.1

-vxlan_local_port=4789

-vxlan_gdev_port=50710

+vxlan_local_port=50710

+vxlan_gdev_port=4789

 vxlan_encap_type=0

 vxlan_link_id=1

 vxlan_link_dir=1

-vxlan_inner_smac=60:67:20:2a:6a:b0

+vxlan_vpn_id=112

+vxlan_inner_smac=7c:2a:31:a3:44:9a

 vxlan_inner_dmac=e8:61:1f:13:70:7a
\ No newline at end of file
diff --git a/bin/conf/mrl.inf b/bin/conf/mrl.inf
index 66e03a1..203ec1c 100644
--- a/bin/conf/mrl.inf
+++ b/bin/conf/mrl.inf
@@ -4,9 +4,9 @@ SO_PATH=./plug/business/mrl/mrl.so
 INIT_FUNC=mrl_init
 DESTROY_FUNC=mrl_destroy
 
-[TCPALL]
+[TCP_ALL]
 FUNC_FLAG=ALL
-FUNC_NAME=mrl_tcp_entry
+FUNC_NAME=mrl_tcpall_entry
 
 [UDP]
 FUNC_FLAG=ALL
diff --git a/bin/conf/table_info.conf b/bin/conf/table_info.conf
index 42d2ead..d860d44 100644
--- a/bin/conf/table_info.conf
+++ b/bin/conf/table_info.conf
@@ -16,4 +16,4 @@
 #For expr/expr_plus Table

 #id	name	type	src_charset	dst_charset	do_merge cross_cache quick_mode

 0	IR_NOMINEE_IP	plugin	5	--

-1	IR_CANDIDATE_IP	plugin	18	--
\ No newline at end of file
+1	IR_CANDIDATE_IP	plugin	19	--
\ No newline at end of file
diff --git a/bin/mrl.so b/bin/mrl.so
deleted file mode 100644
index f269249..0000000
--- a/bin/mrl.so
+++ /dev/null