ThePain/CasaOS
1
0
Fork 0
mirror of https://github.com/IceWhaleTech/CasaOS.git synced 2025-06-16 05:55:33 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Supplementary log

Browse Source
This commit is contained in:
LinkLeong 2023-07-18 08:13:11 +01:00
parent dd8032a8be
commit d0fb2f06f5
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
route/v1/zerotier.go
View File

@ -81,9 +81,10 @@ func copyHeaders(destination, source http.Header) {
} }
func CheckNetwork() { func CheckNetwork() {
logger.Info("start check network")
respBody, err := httper.ZTGet("/controller/network") respBody, err := httper.ZTGet("/controller/network")
if err != nil { if err != nil {
fmt.Println(err) logger.Error("get network error", zap.Error(err))
return return
} }
networkId := "" networkId := ""
@ -93,18 +94,17 @@ func CheckNetwork() {
for _, v := range networkNames { for _, v := range networkNames {
res, err := httper.ZTGet("/controller/network/" + v.Str) res, err := httper.ZTGet("/controller/network/" + v.Str)
if err != nil { if err != nil {
fmt.Println(err) logger.Error("get network error", zap.Error(err))
return return
} }
fmt.Println(string(res))
name := gjson.GetBytes(res, "name").Str name := gjson.GetBytes(res, "name").Str
if name == common.RANW_NAME { if name == common.RANW_NAME {
fmt.Println(string(res))
networkId = gjson.GetBytes(res, "id").Str networkId = gjson.GetBytes(res, "id").Str
break break
} }
} }
ip, s, e, c := getZTIP() ip, s, e, c := getZTIP()
logger.Info("ip", zap.Any("ip", ip))
if len(networkId) == 0 { if len(networkId) == 0 {
if len(address) == 0 { if len(address) == 0 {
address = GetAddress() address = GetAddress()
@ -113,7 +113,7 @@ func CheckNetwork() {
} }
res, err := httper.ZTGet("/network") res, err := httper.ZTGet("/network")
if err != nil { if err != nil {
fmt.Println(err) logger.Error("get network error", zap.Error(err))
return return
} }
joined := false joined := false
@ -124,6 +124,7 @@ func CheckNetwork() {
break break
} }
} }
logger.Info("joined", zap.Any("joined", joined))
if !joined { if !joined {
JoinAndUpdateNet(address, networkId, ip) JoinAndUpdateNet(address, networkId, ip)
} }
@ -131,18 +132,19 @@ func CheckNetwork() {
func GetAddress() string { func GetAddress() string {
nodeRes, err := httper.ZTGet("/status") nodeRes, err := httper.ZTGet("/status")
if err != nil { if err != nil {
fmt.Println(err) logger.Error("get status error", zap.Error(err))
return "" return ""
} }
return gjson.GetBytes(nodeRes, "address").String() return gjson.GetBytes(nodeRes, "address").String()
} }
func JoinAndUpdateNet(address, networkId, ip string) { func JoinAndUpdateNet(address, networkId, ip string) {
res, err := httper.ZTPost("/network/"+networkId, "") logger.Info("start join network", zap.Any("ip", ip))
_, err := httper.ZTPost("/network/"+networkId, "")
if err != nil { if err != nil {
fmt.Println(err) logger.Error(" get network error", zap.Error(err))
return return
} }
fmt.Println(string(res))
if len(address) == 0 { if len(address) == 0 {
address = GetAddress() address = GetAddress()
} }
@ -153,12 +155,11 @@ func JoinAndUpdateNet(address, networkId, ip string) {
"` + ip + `" "` + ip + `"
] ]
}` }`
r, err := httper.ZTPost("/controller/network/"+networkId+"/member/"+address, b) _, err = httper.ZTPost("/controller/network/"+networkId+"/member/"+address, b)
if err != nil { if err != nil {
fmt.Println(err) logger.Error("join network error", zap.Error(err))
return return
} }
fmt.Println(string(r))
} }
func CreateNet(address, s, e, c string) string { func CreateNet(address, s, e, c string) string {
body := `{ body := `{
@ -207,7 +208,7 @@ func CreateNet(address, s, e, c string) string {
}` }`
createRes, err := httper.ZTPost("/controller/network/"+address+"______", body) createRes, err := httper.ZTPost("/controller/network/"+address+"______", body)
if err != nil { if err != nil {
fmt.Println(err) logger.Error("post network error", zap.Error(err))
return "" return ""
} }
return gjson.GetBytes(createRes, "id").Str return gjson.GetBytes(createRes, "id").Str
@ -216,7 +217,7 @@ func CreateNet(address, s, e, c string) string {
func GetZTIPs() []gjson.Result { func GetZTIPs() []gjson.Result {
res, err := httper.ZTGet("/network") res, err := httper.ZTGet("/network")
if err != nil { if err != nil {
fmt.Println(err) logger.Error("get network error", zap.Error(err))
return []gjson.Result{} return []gjson.Result{}
} }
a := gjson.GetBytes(res, "#.routes.0.target") a := gjson.GetBytes(res, "#.routes.0.target")