summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.vscode/ftp-kr.sync.cache.json356
-rw-r--r--access/include/ip_mgr.h2
-rw-r--r--conf/mgw.conf15
3 files changed, 155 insertions, 218 deletions
diff --git a/.vscode/ftp-kr.sync.cache.json b/.vscode/ftp-kr.sync.cache.json
index e366664..ac60b77 100644
--- a/.vscode/ftp-kr.sync.cache.json
+++ b/.vscode/ftp-kr.sync.cache.json
@@ -3,279 +3,199 @@
"root": {
"IPReuse": {
"mgw": {
- "common": {
- "include": {
- "mgw_utils.h": {
- "type": "-",
- "size": 2409,
- "lmtime": 1543324367843,
- "modified": false
- },
- "tun.h": {
- "type": "-",
- "size": 294,
- "lmtime": 1541750944509,
- "modified": false
- },
- "mgw_socket.h": {
- "type": "-",
- "size": 280,
- "lmtime": 1542803512494,
- "modified": false
- },
- "mgw_tun.h": {
- "type": "-",
- "size": 335,
- "lmtime": 1542337427911,
- "modified": false
- }
+ ".gitignore.swp": {
+ "type": "-",
+ "size": 4096,
+ "lmtime": 1543411055423,
+ "modified": false
+ },
+ ".gitignore": {
+ "type": "-",
+ "size": 18,
+ "lmtime": 1543411187230,
+ "modified": false
+ },
+ "conf": {
+ "table_info.conf": {
+ "type": "-",
+ "size": 638,
+ "lmtime": 1544172494281,
+ "modified": false
},
- "CMakeLists.txt": {
+ "mgw.conf": {
"type": "-",
- "size": 197,
- "lmtime": 1542267283818,
+ "size": 1581,
+ "lmtime": 1544172394868,
+ "modified": false
+ },
+ ".mgw.conf.swp": {
+ "type": "-",
+ "size": 4096,
+ "lmtime": 1544172426840,
"modified": false
},
+ ".table_info.conf.swp": {
+ "type": "-",
+ "size": 4096,
+ "lmtime": 1544172466147,
+ "modified": false
+ }
+ },
+ "access": {
"src": {
- "mgw_utils.cpp": {
+ "dnat.cpp": {
"type": "-",
- "size": 6240,
- "lmtime": 1543324108185,
+ "size": 23249,
+ "lmtime": 1544172317408,
"modified": false
},
- "tun.cpp": {
+ "snat.cpp": {
"type": "-",
- "size": 2742,
- "lmtime": 1541750772819,
+ "size": 23249,
+ "lmtime": 1544172317406,
"modified": false
},
- "mgw_socket.cpp": {
+ "ip_mgr.cpp": {
"type": "-",
- "size": 1222,
- "lmtime": 1542803548144,
- "modified": false
+ "size": 17898,
+ "lmtime": 1543461860280,
+ "modified": true
},
- "mgw_tun.cpp": {
+ "vpn_monitor.cpp": {
"type": "-",
- "size": 2598,
- "lmtime": 1543374190079,
- "modified": false
- }
- },
- "CMakeFiles": {},
- "Makefile": {
- "type": "-",
- "size": 6174,
- "lmtime": 0,
- "modified": true
- },
- "cmake_install.cmake": {
- "type": "-",
- "size": 1114,
- "lmtime": 0,
- "modified": false
- },
- "libcommon.a": {
- "type": "-",
- "size": 9328,
- "lmtime": 0,
- "modified": true
- }
- },
- "README.md": {
- "type": "-",
- "size": 26,
- "lmtime": 1540888536383,
- "modified": false
- },
- "access": {
- "CMakeLists.txt": {
- "type": "-",
- "size": 1421,
- "lmtime": 1542874405065,
- "modified": false
- },
- "include": {
- "vpn_monitor.h": {
+ "size": 9245,
+ "lmtime": 1543372925586,
+ "modified": true
+ },
+ "udp_server.cpp": {
"type": "-",
- "size": 205,
- "lmtime": 1543236257323,
+ "size": 2491,
+ "lmtime": 1544172317405,
"modified": false
},
- "nat.cpp": {
+ "main.cpp": {
"type": "-",
- "size": 0,
- "lmtime": 1541751728308,
- "modified": false
+ "size": 17213,
+ "lmtime": 1543409951644,
+ "modified": true
},
- "nat.h": {
+ ".main.cpp.swp": {
"type": "-",
- "size": 561,
- "lmtime": 1543324682605,
+ "size": 4096,
+ "lmtime": 1544172317408,
"modified": false
},
- "ip_mgr.h": {
+ "nat.cpp": {
"type": "-",
- "size": 1191,
- "lmtime": 1543325691334,
+ "size": 23249,
+ "lmtime": 1544172251000,
"modified": false
},
- "udp_server.h": {
+ ".main.cpp.swo": {
"type": "-",
- "size": 225,
- "lmtime": 1542964765077,
+ "size": 4096,
+ "lmtime": 1544172337018,
"modified": false
}
},
- "src": {
- "main.cpp": {
+ "include": {
+ "ip_mgr.h": {
"type": "-",
- "size": 16638,
- "lmtime": 1543409951644,
+ "size": 1191,
+ "lmtime": 1544172317404,
"modified": false
},
- "tun.cpp": {
+ "nat.h": {
"type": "-",
- "size": 2734,
- "lmtime": 1541164401820,
+ "size": 561,
+ "lmtime": 1544172250998,
"modified": false
},
- "vpn_monitor.cpp": {
+ "udp_server.h": {
"type": "-",
- "size": 9249,
- "lmtime": 1543372925586,
+ "size": 225,
+ "lmtime": 1544172250998,
"modified": false
},
- "nat.cpp": {
+ "vpn_monitor.h": {
"type": "-",
- "size": 23249,
- "lmtime": 1543410118010,
+ "size": 205,
+ "lmtime": 1544172250999,
"modified": false
- },
- "ip_translator.cpp": {
+ }
+ },
+ "CMakeLists.txt": {
+ "type": "-",
+ "size": 1421,
+ "lmtime": 1544172250997,
+ "modified": false
+ },
+ "test": {
+ "test_MESA_htable.cpp": {
"type": "-",
- "size": 0,
- "lmtime": 1541664138444,
+ "size": 3966,
+ "lmtime": 1544172251002,
"modified": false
},
- "ip_manager.cpp": {
+ "test_maat_redis.cpp": {
"type": "-",
- "size": 0,
- "lmtime": 1541751456565,
+ "size": 5515,
+ "lmtime": 1544172251002,
"modified": false
},
- "ip_pool_mgr.cpp": {
+ "test_tun.cpp": {
"type": "-",
- "size": 0,
- "lmtime": 1541751709640,
+ "size": 3123,
+ "lmtime": 1544172251002,
"modified": false
- },
- "ip_mgr.cpp": {
+ }
+ }
+ },
+ "common": {
+ "src": {
+ "mgw_utils.cpp": {
"type": "-",
- "size": 17432,
- "lmtime": 1543461860280,
+ "size": 6240,
+ "lmtime": 1544172389047,
"modified": false
},
- "udp_server.cpp": {
+ "mgw_socket.cpp": {
"type": "-",
- "size": 2491,
- "lmtime": 1543320908556,
+ "size": 1222,
+ "lmtime": 1544172251005,
"modified": false
},
- "status_monitor.cpp": {
+ "mgw_tun.cpp": {
"type": "-",
- "size": 3267,
- "lmtime": 1542873603316,
+ "size": 2598,
+ "lmtime": 1544172251005,
"modified": false
}
},
- "test": {
- "test_maat_redis.cpp": {
+ "include": {
+ "mgw_utils.h": {
"type": "-",
- "size": 5515,
- "lmtime": 1542703778965,
+ "size": 2409,
+ "lmtime": 1544172389047,
"modified": false
},
- "test_tun.cpp": {
+ "mgw_socket.h": {
"type": "-",
- "size": 3123,
- "lmtime": 1542176058502,
+ "size": 280,
+ "lmtime": 1544172251003,
"modified": false
},
- "test_MESA_htable.cpp": {
+ "mgw_tun.h": {
"type": "-",
- "size": 3966,
- "lmtime": 1543216225110,
+ "size": 335,
+ "lmtime": 1544172251004,
"modified": false
}
},
- "CMakeFiles": {},
- "Makefile": {
- "type": "-",
- "size": 13421,
- "lmtime": 0,
- "modified": true
- },
- "cmake_install.cmake": {
- "type": "-",
- "size": 1119,
- "lmtime": 0,
- "modified": true
- },
- "log": {},
- "test_htable": {
- "type": "-",
- "size": 8584,
- "lmtime": 0,
- "modified": true
- },
- "test_tun": {
- "type": "-",
- "size": 13584,
- "lmtime": 0,
- "modified": true
- },
- "test_maat_redis": {
- "type": "-",
- "size": 13696,
- "lmtime": 0,
- "modified": false
- },
- "mgw": {
- "type": "-",
- "size": 56312,
- "lmtime": 0,
- "modified": true
- },
- "conf": {},
- "rulescan_tmp": {}
- },
- "vendor": {
"CMakeLists.txt": {
"type": "-",
- "size": 1741,
- "lmtime": 1540969696627,
- "modified": false
- },
- "maat-v2.3.3.tar.gz": {
- "type": "-",
- "size": 1920396,
- "lmtime": 1540888536391,
- "modified": false
- }
- },
- "build": {},
- "conf": {
- "table_info.conf": {
- "type": "-",
- "size": 633,
- "lmtime": 1542702676007,
- "modified": false
- },
- "mgw.conf": {
- "type": "-",
- "size": 1581,
- "lmtime": 1543323941481,
+ "size": 197,
+ "lmtime": 1544172251003,
"modified": false
}
},
@@ -285,23 +205,31 @@
"lmtime": 1542863950666,
"modified": false
},
- "create_tun.sh": {
+ "README.md": {
"type": "-",
- "size": 324,
- "lmtime": 1543460762526,
+ "size": 26,
+ "lmtime": 1540888536383,
"modified": false
},
- ".gitignore.swp": {
+ "create_tun.sh": {
"type": "-",
- "size": 4096,
- "lmtime": 1543411055423,
+ "size": 324,
+ "lmtime": 1544172251016,
"modified": false
},
- ".gitignore": {
- "type": "-",
- "size": 18,
- "lmtime": 1543411187230,
- "modified": false
+ "vendor": {
+ "CMakeLists.txt": {
+ "type": "-",
+ "size": 1741,
+ "lmtime": 1544172251022,
+ "modified": false
+ },
+ "maat-v2.3.3.tar.gz": {
+ "type": "-",
+ "size": 1920396,
+ "lmtime": 1544172251038,
+ "modified": false
+ }
}
}
}
diff --git a/access/include/ip_mgr.h b/access/include/ip_mgr.h
index 7b2f9f7..9b8c2a7 100644
--- a/access/include/ip_mgr.h
+++ b/access/include/ip_mgr.h
@@ -29,6 +29,6 @@ struct ip_mgr_vxlan_info
struct ip_mgr_handle;
struct ip_mgr_handle *ip_mgr_init(const char *profile, MESA_htable_handle cand_ip_detail_htable, struct field_stat_handle *fs_handle,
- Maat_feather_t feather, void *logger);
+ Maat_feather_t Maat_feather_cand, Maat_feather_t Maat_feather_policy, void *logger);
void ip_mgr_destroy(struct ip_mgr_handle *handle);
int ip_mgr_candidata_ip_get(struct ip_mgr_handle *handle, const char *user_name, uint32_t *selected_ip); \ No newline at end of file
diff --git a/conf/mgw.conf b/conf/mgw.conf
index 054bf2a..cec2ae3 100644
--- a/conf/mgw.conf
+++ b/conf/mgw.conf
@@ -2,11 +2,20 @@
log_path = ./log/mgw.log
log_level = 30
-[maat]
+[Maat_cand]
table_info_path = ./conf/table_info.conf
max_thread_num = 1
-maat_redis_ip = 192.168.10.180
-maat_redis_port = 26379
+maat_redis_ip = 192.168.11.243
+maat_redis_port = 6800
+maat_redis_index = 5
+stat_file_path = ./log/maat_stat.log
+
+[Maat_policy]
+table_info_path = ./conf/table_info.conf
+max_thread_num = 1
+Maat_redis_ip = 192.168.11.243
+Maat_redis_port = 6379
+Maat_redis_index = 6
stat_file_path = ./log/maat_stat.log
[vpn_server]
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-30 11:57:45 +0000