apps/kubevpn
1
0
Fork 0
mirror of https://github.com/kubenetworks/kubevpn.git synced 2025-12-24 11:51:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: optimize chinese display issue on Windows

Browse Source
This commit is contained in:
wencaiwulue
2023-01-19 20:47:56 +08:00
parent 17bc64559b
commit 1ae99e42f5
1 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
pkg/util/networkpolicy.go
View File

@@ -40,7 +40,14 @@ func AddFirewallRule() {
"remoteip=" + config.CIDR.String() + ",LocalSubnet",
}...)
if out, err := cmd.CombinedOutput(); err != nil {
log.Infof("error while exec command: %s, out: %s, err: %v", cmd.Args, string(out), err)
var s string
var b []byte
if b, err = decode(out); err == nil {
s = string(b)
} else {
s = string(out)
}
log.Infof("error while exec command: %s, out: %s", cmd.Args, s)
}
}
@@ -53,7 +60,14 @@ func DeleteFirewallRule() {
"name=" + config.ConfigMapPodTrafficManager,
}...)
if out, err := cmd.CombinedOutput(); err != nil {
log.Errorf("error while exec command: %s, out: %s, err: %v", cmd.Args, string(out), err)
var s string
var b []byte
if b, err = decode(out); err == nil {
s = string(b)
} else {
s = string(out)
}
log.Errorf("error while exec command: %s, out: %s", cmd.Args, s)
}
}
@@ -68,12 +82,7 @@ func FindRule() bool {
if out, err := cmd.CombinedOutput(); err != nil {
s := string(out)
var b []byte
b, err = simplifiedchinese.GB18030.NewDecoder().Bytes(out)
if err == nil {
s = string(b)
}
b, err = simplifiedchinese.GBK.NewDecoder().Bytes(out)
if err == nil {
if b, err = decode(out); err == nil {
s = string(b)
}
log.Debugf("find route out: %s", s)
@@ -82,3 +91,16 @@ func FindRule() bool {
return true
}
}
func decode(in []byte) (out []byte, err error) {
out = in
out, err = simplifiedchinese.GB18030.NewDecoder().Bytes(in)
if err == nil {
return
}
out, err = simplifiedchinese.GBK.NewDecoder().Bytes(in)
if err == nil {
return
}
return
}