extern/EtherGuard-VPN
1
0
Fork 0
mirror of https://github.com/KusakabeShi/EtherGuard-VPN.git synced 2025-01-26 22:18:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug: HttpServer MultiListen

Browse Source
This commit is contained in:
Kusakabe Si 2021-12-10 18:30:45 +00:00
parent 64a08ebe1e
commit 3bd54ceb58
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
main_httpserver.go
View File

@ -939,7 +939,7 @@ func manage_peerdel(w http.ResponseWriter, r *http.Request) {
w.Write([]byte("NodeID: " + toDelete.ToString() + " deleted.")) w.Write([]byte("NodeID: " + toDelete.ToString() + " deleted."))
} }
func HttpServer(edgeListen string, manageListen string, apiprefix string) (err error) { func HttpServer(edgeListen string, manageListen string, apiprefix string, errchan chan error) {
if len(apiprefix) > 0 && apiprefix[0] != '/' { if len(apiprefix) > 0 && apiprefix[0] != '/' {
apiprefix = "/" + apiprefix apiprefix = "/" + apiprefix
} }
@ -960,7 +960,13 @@ func HttpServer(edgeListen string, manageListen string, apiprefix string) (err e
mux.HandleFunc(apiprefix+"/manage/peer/update", manage_peerupdate) mux.HandleFunc(apiprefix+"/manage/peer/update", manage_peerupdate)
mux.HandleFunc(apiprefix+"/manage/super/state", manage_get_peerstate) mux.HandleFunc(apiprefix+"/manage/super/state", manage_get_peerstate)
mux.HandleFunc(apiprefix+"/manage/super/update", manage_superupdate) mux.HandleFunc(apiprefix+"/manage/super/update", manage_superupdate)
err = http.ListenAndServe(edgeListen, mux)
go func() {
err := http.ListenAndServe(edgeListen, mux)
if err != nil {
errchan <- err
}
}()
return return
} else { } else {
edgemux := http.NewServeMux() edgemux := http.NewServeMux()
@ -974,14 +980,22 @@ func HttpServer(edgeListen string, manageListen string, apiprefix string) (err e
managemux.HandleFunc(apiprefix+"/manage/peer/update", manage_peerupdate) managemux.HandleFunc(apiprefix+"/manage/peer/update", manage_peerupdate)
managemux.HandleFunc(apiprefix+"/manage/super/state", manage_get_peerstate) managemux.HandleFunc(apiprefix+"/manage/super/state", manage_get_peerstate)
managemux.HandleFunc(apiprefix+"/manage/super/update", manage_superupdate) managemux.HandleFunc(apiprefix+"/manage/super/update", manage_superupdate)
err = http.ListenAndServe(edgeListen, edgemux)
go func() {
err := http.ListenAndServe(edgeListen, edgemux)
if err != nil { if err != nil {
return errchan <- err
} }
}()
if manageListen != "" { if manageListen != "" {
err = http.ListenAndServe(manageListen, managemux) go func() {
err := http.ListenAndServe(manageListen, managemux)
if err != nil {
errchan <- err
}
}()
} }
return
} }
} }

5
main_super.go
View File

@ -204,10 +204,7 @@ func Super(configPath string, useUAPI bool, printExample bool, bindmode string)
go Event_server_event_hendler(httpobj.http_graph, httpobj.http_super_chains) go Event_server_event_hendler(httpobj.http_graph, httpobj.http_super_chains)
go RoutinePushSettings(mtypes.S2TD(sconfig.RePushConfigInterval)) go RoutinePushSettings(mtypes.S2TD(sconfig.RePushConfigInterval))
go RoutineTimeoutCheck() go RoutineTimeoutCheck()
err = HttpServer(sconfig.ListenPort_EdgeAPI, sconfig.ListenPort_ManageAPI, sconfig.API_Prefix) HttpServer(sconfig.ListenPort_EdgeAPI, sconfig.ListenPort_ManageAPI, sconfig.API_Prefix, errs)
if err != nil {
return err
}
if sconfig.PostScript != "" { if sconfig.PostScript != "" {
envs := make(map[string]string) envs := make(map[string]string)