From 51de023bdb0534332e82d5dac79c2b261939690e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?=
 <41315874+fumiama@users.noreply.github.com>
Date: Sat, 26 Nov 2022 00:43:57 +0800
Subject: [PATCH] fix

---
 portal.go | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/portal.go b/portal.go
index c61777b..b6fae0d 100644
--- a/portal.go
+++ b/portal.go
@@ -25,6 +25,12 @@ type Portal struct {
 	ip  net.IP
 }
 
+type rsp struct {
+	Challenge string `json:"challenge"`
+	Ecode     int    `json:"ecode"`
+	Msg       string `json:"error_msg"`
+}
+
 func NewPortal(name, password string, ipv4 net.IP) (*Portal, error) {
 	if len(ipv4) != 4 {
 		return nil, ErrIllegalIPv4
@@ -48,11 +54,6 @@ func (p *Portal) GetChallenge() (string, error) {
 	if len(data) < 12 {
 		return "", ErrUnexpectedChallengeResponse
 	}
-	type rsp struct {
-		Challenge string `json:"challenge"`
-		Ecode     int    `json:"ecode"`
-		Msg       string `json:"error_msg"`
-	}
 	var r rsp
 	err = json.Unmarshal(data[11:len(data)-1], &r)
 	if err != nil {
@@ -85,18 +86,15 @@ func (p *Portal) Login(challenge string) error {
 	if len(data) < 12 {
 		return ErrUnexpectedLoginResponse
 	}
-	type rsp struct {
-		Error string `json:"error"`
-	}
 	var r rsp
 	err = json.Unmarshal(data[11:len(data)-1], &r)
 	if err != nil {
 		return err
 	}
-	if r.Error == "ok" {
-		return nil
+	if r.Ecode != 0 {
+		return errors.New(r.Msg)
 	}
-	return errors.New(r.Error)
+	return nil
 }
 
 func (p *Portal) String() string {