Use pointer instead of struct
This commit is contained in:
parent
853477e54a
commit
6d8f38d749
18 changed files with 187 additions and 142 deletions
|
|
@ -27,7 +27,7 @@ func init() {
|
|||
}
|
||||
})
|
||||
router.GET("/api/wg/", apiAuthHandler(showWgTunnel))
|
||||
router.GET("/api/wginfo", apiAuthHandler(func(student adlin.Student, ps httprouter.Params, body []byte) (interface{}, error) {
|
||||
router.GET("/api/wginfo", apiAuthHandler(func(student *adlin.Student, ps httprouter.Params, body []byte) (interface{}, error) {
|
||||
return getTunnelInfo(student.Id), nil
|
||||
}))
|
||||
router.POST("/api/wg/", apiAuthHandler(genWgToken))
|
||||
|
|
@ -37,12 +37,12 @@ func init() {
|
|||
router.DELETE("/api/wg/:token", apiAuthHandler(deleteWgTunnel))
|
||||
}
|
||||
|
||||
func showWgTunnel(student adlin.Student, ps httprouter.Params, body []byte) (interface{}, error) {
|
||||
func showWgTunnel(student *adlin.Student, ps httprouter.Params, body []byte) (interface{}, error) {
|
||||
// Get tunnels assigned to the student
|
||||
return student.GetTunnelTokens()
|
||||
}
|
||||
|
||||
func genWgToken(student adlin.Student, ps httprouter.Params, body []byte) (interface{}, error) {
|
||||
func genWgToken(student *adlin.Student, ps httprouter.Params, body []byte) (interface{}, error) {
|
||||
// Generate a token to access related wg info
|
||||
return student.NewTunnelToken(0)
|
||||
}
|
||||
|
|
@ -132,7 +132,7 @@ func getWgTunnelInfo(w http.ResponseWriter, r *http.Request, ps httprouter.Param
|
|||
|
||||
tinfo := getTunnelInfo(token.IdStudent)
|
||||
|
||||
var student adlin.Student
|
||||
var student *adlin.Student
|
||||
student, err = adlin.GetStudent(int(token.IdStudent))
|
||||
if err != nil {
|
||||
http.Error(w, fmt.Sprintf("{errmsg:%q}", err), http.StatusBadRequest)
|
||||
|
|
@ -152,7 +152,7 @@ PersistentKeepalive = 5
|
|||
`, base64.StdEncoding.EncodeToString(tinfo.SrvPubKey), "82.64.31.248", tinfo.SrvPort, tinfo.CltIPv6, token.SuffixIP, 64, tinfo.CltIPv6, tinfo.CltRange, tinfo.SrvGW6, student.Login)))
|
||||
}
|
||||
|
||||
func updateWgTunnel(student adlin.Student, ps httprouter.Params, body []byte) (interface{}, error) {
|
||||
func updateWgTunnel(student *adlin.Student, ps httprouter.Params, body []byte) (interface{}, error) {
|
||||
token, err := adlin.GetTunnelToken(adlin.TokenFromText(ps.ByName("token")))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
|
@ -180,7 +180,7 @@ func updateWgTunnel(student adlin.Student, ps httprouter.Params, body []byte) (i
|
|||
return true, err
|
||||
}
|
||||
|
||||
func deleteWgTunnel(student adlin.Student, ps httprouter.Params, body []byte) (interface{}, error) {
|
||||
func deleteWgTunnel(student *adlin.Student, ps httprouter.Params, body []byte) (interface{}, error) {
|
||||
token, err := adlin.GetTunnelToken(adlin.TokenFromText(ps.ByName("token")))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
|
|
|||
Reference in a new issue