Commit 80ce60c

authored

fix: Fix port forwarding error issues (1Panel-dev#9700)

1 parent 2758ab0 commit 80ce60cCopy full SHA for 80ce60c

File tree

-14

lines changed

-14

lines changed

Lines changed: 3 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"regexp"`
`6`	`6`	`"strings"`
	`7`	`+ "time"`
`7`	`8`
`8`	`9`	`"github.com/1Panel-dev/1Panel/agent/app/model"`
`9`	`10`	`"github.com/1Panel-dev/1Panel/agent/global"`
`@@ -38,20 +39,9 @@ func NewIptables() (*Iptables, error) {`
`38`	`39`	`return iptables, nil`
`39`	`40`	`}`
`40`	`41`
`41`		`-func (iptables *Iptables) run(rule string) error {`
`42`		`- stdout, err := cmd.RunDefaultWithStdoutBashCf("%s iptables -t nat %s", iptables.CmdStr, rule)`
`43`		`- if err != nil {`
`44`		`- return fmt.Errorf("%s, %s", err, stdout)`
`45`		`- }`
`46`		`- if stdout != "" {`
`47`		`- return fmt.Errorf("iptables error: %s", stdout)`
`48`		`- }`
`49`		`-`
`50`		`- return nil`
`51`		`-}`
`52`		`-`
`53`	`42`	`func (iptables *Iptables) outf(tab, rule string, a ...any) (stdout string, err error) {`
`54`		`- stdout, err = cmd.RunDefaultWithStdoutBashCf("%s iptables -t %s %s", iptables.CmdStr, tab, fmt.Sprintf(rule, a...))`
	`43`	`+ cmdMgr := cmd.NewCommandMgr(cmd.WithIgnoreExist1(), cmd.WithTimeout(20*time.Second))`
	`44`	`+ stdout, err = cmdMgr.RunWithStdoutBashCf("%s iptables -t %s %s", iptables.CmdStr, tab, fmt.Sprintf(rule, a...))`
`55`	`45`	`if err != nil && stdout != "" {`
`56`	`46`	`global.LOG.Errorf("iptables failed, err: %s", stdout)`
`57`	`47`	`}`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import (`
`5`	`5`	`"strings"`
`6`	`6`
`7`	`7`	`"github.com/1Panel-dev/1Panel/agent/buserr"`
	`8`	`+ "github.com/1Panel-dev/1Panel/agent/global"`
`8`	`9`	`"github.com/1Panel-dev/1Panel/agent/utils/cmd"`
`9`	`10`	`)`
`10`	`11`
`@@ -99,7 +100,9 @@ func (f *Ufw) ListPort() ([]FireInfo, error) {`
`99`	`100`	`}`
`100`	`101`
`101`	`102`	`func (f *Ufw) ListForward() ([]FireInfo, error) {`
`102`		`- _ = f.EnableForward()`
	`103`	`+ if err := f.EnableForward(); err != nil {`
	`104`	`+ global.LOG.Errorf("init port forward failed, err: %v", err)`
	`105`	`+ }`
`103`	`106`	`iptables, err := NewIptables()`
`104`	`107`	`if err != nil {`
`105`	`108`	`return nil, err`

Comments

(0)