147 Commits

Author SHA1 Message Date
dqy
63933a1d19 test: threshold set to 2 2023-10-24 21:00:19 +08:00
b952bfeb3d fix: clean db while exit 2023-10-24 20:58:31 +08:00
ee3c55a588 fix: ip error 2023-10-24 20:39:22 +08:00
dqy
4e577e41c7 Merge branch 'main' of https://git.mamahaha.work/dqy/mimajingsai 2023-10-24 20:21:43 +08:00
dqy
452253111b test: test 2023-10-24 20:21:41 +08:00
dqy
40fd8945c8 Merge pull request 'main' (#25) from sangge/mimajingsai:main into main
Reviewed-on: dqy/mimajingsai#25
2023-10-24 20:16:57 +08:00
57766a6bf3 test: test 2023-10-24 20:15:56 +08:00
1fcdf20afb test: update test 2023-10-24 20:10:24 +08:00
f55b581059 Merge branch 'main' of https://git.mamahaha.work/sangge/mimajingsai 2023-10-24 20:01:57 +08:00
f0e16d0a60 test: tpem test 2023-10-24 20:01:56 +08:00
dqy
70a0e6b63f Merge pull request 'fix: set timeout while init' (#24) from sangge/mimajingsai:main into main
Reviewed-on: dqy/mimajingsai#24
2023-10-24 19:56:50 +08:00
93b6d4d38c fix: set timeout while init 2023-10-24 19:56:12 +08:00
dqy
569c6b1a77 Merge branch 'main' of https://git.mamahaha.work/dqy/mimajingsai 2023-10-24 19:23:36 +08:00
dqy
2271369d2e feat:change serveraddress 2023-10-24 19:23:34 +08:00
dqy
156c65570d Merge pull request 'main' (#22) from sangge/mimajingsai:main into main
Reviewed-on: dqy/mimajingsai#22
2023-10-24 19:20:52 +08:00
97e1bb49a5 feat: read host ip from env 2023-10-24 19:20:03 +08:00
dqy
54fcf431e1 Merge branch 'main' of https://git.mamahaha.work/sangge/mimajingsai into sangge-main 2023-10-24 18:58:49 +08:00
e304771743 Merge branch 'main' of https://git.mamahaha.work/sangge/mimajingsai 2023-10-23 22:21:16 +08:00
2277cd577d test: temp change 2023-10-23 22:21:15 +08:00
3349474f22 Merge pull request 'test: temp test' (#21) from sangge/mimajingsai:main into main
Reviewed-on: ccyj/mimajingsai#21
2023-10-23 21:40:43 +08:00
ba8bab8a17 fix: 修改了中心服务器接收心跳包函数;修改客户端变量类型id 2023-10-23 21:39:12 +08:00
dqy
47a48d448f Merge pull request 'test: temp test' (#21) from sangge/mimajingsai:main into main
Reviewed-on: dqy/mimajingsai#21
2023-10-23 18:37:28 +08:00
9ed7a7ecf7 test: temp test 2023-10-23 18:36:56 +08:00
dqy
8dab4be36c Merge branch 'main' of https://git.mamahaha.work/dqy/mimajingsai 2023-10-23 17:58:55 +08:00
dqy
a45cd66e9d modified: src/client.ini
modified:   src/client.py
	modified:   src/node.py
2023-10-23 17:54:30 +08:00
dqy
e6d1119d4f Merge pull request 'main' (#20) from sangge/mimajingsai:main into main
Reviewed-on: dqy/mimajingsai#20
2023-10-23 17:30:52 +08:00
4e67b03565 sytle: modify code 2023-10-23 17:30:17 +08:00
989300a841 feat: update receive_user_src_message 2023-10-23 17:29:52 +08:00
dqy
55add91467 style: 美化代码 2023-10-23 17:12:18 +08:00
83b50056f6 Merge branch 'main' of https://git.mamahaha.work/dqy/mimajingsai 2023-10-23 17:02:04 +08:00
acef670d1d fix: update demo 2023-10-23 17:00:30 +08:00
aeccc72b97 fix: fix some errors 2023-10-23 17:00:09 +08:00
7977557fc4 feat: add client_cli 2023-10-23 16:59:52 +08:00
dqy
5ea41956fd feat: get_node_ip测试完毕 2023-10-23 16:41:48 +08:00
3c6b989039 feat: update code 2023-10-23 14:21:41 +08:00
1e86f9ca6b Merge branch 'main' into main 2023-10-23 14:11:21 +08:00
7db5db66b5 build: 实现了节点的功能:向服务器发送ip和心跳包,与客户之间通信 2023-10-23 10:12:00 +08:00
dqy
dfb3a06aa0 Merge pull request 'main' (#18) from sangge/mimajingsai:main into main
Reviewed-on: dqy/mimajingsai#18
2023-10-22 17:01:07 +08:00
dqy
58ca8a6564 feat: GenerateReKey增加ID元组; 修改生成s_x和Kfrag的ID参数 2023-10-21 21:58:15 +08:00
dqy
d7ca5f4725 feat: change timeout 2023-10-21 20:42:41 +08:00
4f2dd9727e feat: add heartbeat package 2023-10-21 20:39:43 +08:00
e784b526ce Merge pull request 'main' (#15) from ccyj/mimajingsai:main into main
Reviewed-on: sangge/mimajingsai#15
2023-10-21 20:38:27 +08:00
2334cb68cf build: 节点功能构建 2023-10-21 20:36:58 +08:00
8a049fbe6f feat: finish timer 2023-10-21 20:31:23 +08:00
ad3f14ae1f Merge pull request 'main' (#14) from dqy/mimajingsai:main into main
Reviewed-on: sangge/mimajingsai#14
2023-10-21 20:27:20 +08:00
dqy
6efb7179bb feat: 提交server.py 2023-10-21 20:25:40 +08:00
40c375bf98 feat: update feature 2023-10-21 20:25:18 +08:00
459b03c872 feat: add init config 2023-10-21 14:39:37 +08:00
7b6e45690e feat: init client 2023-10-20 22:27:14 +08:00
8e961eda8e doc: create doc folder 2023-10-20 17:17:02 +08:00