mirror of
https://github.com/v2rayA/v2rayA.git
synced 2026-11-20 23:02:25 +03:00
fix: nil pointer and empty options in a new machine
This commit is contained in:
1 parent
1f4b5a4ac7
commit
dd768f06c2
7 files changed
+24
-17
No files matched your search
@@ -153,6 +153,11 @@ func UpdateV2RayConfig() (err error) {
|
||||
if err == nil {
|
||||
if e := CheckAndSetupTransparentProxy(true); e != nil {
|
||||
err = newError(e).Base(err)
|
||||
if IsV2RayRunning() {
|
||||
if e = StopV2rayService(); e != nil {
|
||||
err = newError(e).Base(err)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}()
|
||||
@@ -278,6 +283,8 @@ func killV2ray() (err error) {
|
||||
|
||||
func StopV2rayService() (err error) {
|
||||
defer CheckAndStopTransparentProxy()
|
||||
defer plugin.GlobalPlugins.CloseAll()
|
||||
defer specialMode.StopDNSSupervisor()
|
||||
defer func() {
|
||||
if IsV2RayRunning() {
|
||||
msg := "failed to stop v2ray"
|
||||
|
||||
@@ -1216,7 +1216,7 @@ func (t *Template) SetOutboundSockopt(setting *configure.Setting) {
|
||||
checkAndSetMark(&t.Outbounds[i], mark)
|
||||
}
|
||||
}
|
||||
func (t *Template) SetInboundListenAddress(setting *configure.Setting) {
|
||||
func (t *Template) SetDualStack(setting *configure.Setting) {
|
||||
const (
|
||||
tag4Suffix = "_ipv4"
|
||||
tag6Suffix = "_ipv6"
|
||||
@@ -1399,9 +1399,8 @@ func NewTemplate(outboundInfos []OutboundInfo) (t Template, err error) {
|
||||
//置fakedns destOverride
|
||||
t.SetInboundFakeDnsDestOverride()
|
||||
|
||||
//置inbound listen address
|
||||
|
||||
t.SetInboundListenAddress(setting)
|
||||
//置inbound listening address和routing
|
||||
t.SetDualStack(setting)
|
||||
|
||||
//check dulplicated tags
|
||||
if err = t.CheckDuplicatedTags(); err != nil {
|
||||
|
||||
@@ -6,9 +6,7 @@ import (
|
||||
"fmt"
|
||||
jsoniter "github.com/json-iterator/go"
|
||||
"github.com/tidwall/gjson"
|
||||
"github.com/v2rayA/v2rayA/common/errors"
|
||||
"github.com/v2rayA/v2rayA/db"
|
||||
"github.com/xujiajun/nutsdb"
|
||||
"log"
|
||||
"strings"
|
||||
)
|
||||
@@ -68,13 +66,13 @@ func decode(b []byte) (result []byte) {
|
||||
}
|
||||
|
||||
func SetConfigure(cfg *Configure) error {
|
||||
if err := db.BucketClear("system"); errors.Cause(err) != nutsdb.ErrBucketEmpty {
|
||||
if err := db.BucketClear("system"); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := db.BucketClear("touch"); errors.Cause(err) != nutsdb.ErrBucketEmpty {
|
||||
if err := db.BucketClear("touch"); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := db.BucketClear("accounts"); errors.Cause(err) != nutsdb.ErrBucketEmpty {
|
||||
if err := db.BucketClear("accounts"); err != nil {
|
||||
return err
|
||||
}
|
||||
for username, password := range cfg.Accounts {
|
||||
@@ -142,9 +140,15 @@ func SetPortWhiteList(portWhiteList *PortWhiteList) (err error) {
|
||||
return db.Set("system", "portWhiteList", portWhiteList.Compressed())
|
||||
}
|
||||
func SetInternalDnsList(dnsList *string) (err error) {
|
||||
if dnsList == nil {
|
||||
return db.Set("system", "internalDnsList", nil)
|
||||
}
|
||||
return db.Set("system", "internalDnsList", strings.TrimSpace(*dnsList))
|
||||
}
|
||||
func SetExternalDnsList(dnsList *string) (err error) {
|
||||
if dnsList == nil {
|
||||
return db.Set("system", "externalDnsList", nil)
|
||||
}
|
||||
return db.Set("system", "externalDnsList", strings.TrimSpace(*dnsList))
|
||||
}
|
||||
func SetRoutingA(routingA *string) (err error) {
|
||||
|
||||
@@ -4,7 +4,6 @@ import (
|
||||
"bytes"
|
||||
"encoding/gob"
|
||||
jsoniter "github.com/json-iterator/go"
|
||||
"github.com/v2rayA/v2rayA/common/errors"
|
||||
"github.com/xujiajun/nutsdb"
|
||||
"log"
|
||||
"reflect"
|
||||
@@ -45,7 +44,7 @@ func Exists(bucket string, key string) bool {
|
||||
}
|
||||
return nil
|
||||
}); err != nil {
|
||||
if errors.Cause(err) != nutsdb.ErrBucketAndKey(bucket, []byte(key)) {
|
||||
if err.Error() != nutsdb.ErrBucketAndKey(bucket, []byte(key)).Error() {
|
||||
log.Println(newError("[ERROR] func Exists returns a new error type").Base(err))
|
||||
}
|
||||
return false
|
||||
|
||||
@@ -99,6 +99,7 @@ func migrate(jsonConfPath string) (err error) {
|
||||
}
|
||||
|
||||
func initDBValue() {
|
||||
log.Println("[Info] init DB")
|
||||
err := configure.SetConfigure(configure.New())
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
@@ -122,6 +123,7 @@ func initConfigure() {
|
||||
var success bool
|
||||
for _, jsonConfPath := range camp {
|
||||
if _, err := os.Stat(jsonConfPath); err == nil {
|
||||
log.Println("[Info] migrate from", jsonConfPath)
|
||||
err = migrate(jsonConfPath)
|
||||
if err == nil {
|
||||
success = true
|
||||
|
||||
@@ -3,17 +3,13 @@ package service
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/v2rayA/v2rayA/core/ipforward"
|
||||
"github.com/v2rayA/v2rayA/core/specialMode"
|
||||
"github.com/v2rayA/v2rayA/core/v2ray"
|
||||
"github.com/v2rayA/v2rayA/core/v2ray/asset"
|
||||
"github.com/v2rayA/v2rayA/db/configure"
|
||||
"github.com/v2rayA/v2rayA/plugin"
|
||||
"log"
|
||||
)
|
||||
|
||||
func StopV2ray() (err error) {
|
||||
plugin.GlobalPlugins.CloseAll()
|
||||
specialMode.StopDNSSupervisor()
|
||||
err = v2ray.StopV2rayService()
|
||||
if err != nil {
|
||||
return
|
||||
@@ -82,7 +78,7 @@ func Connect(which *configure.Which) (err error) {
|
||||
if setting.IntranetSharing != ipforward.IsIpForwardOn() {
|
||||
e := ipforward.WriteIpForward(setting.IntranetSharing)
|
||||
if e != nil {
|
||||
log.Println("[warning]", e)
|
||||
log.Println("[Warning]", e)
|
||||
}
|
||||
}
|
||||
//locate server
|
||||
|
||||
@@ -27,7 +27,7 @@ func UpdateSetting(setting *configure.Setting) (err error) {
|
||||
if setting.IntranetSharing != ipforward.IsIpForwardOn() {
|
||||
e := ipforward.WriteIpForward(setting.IntranetSharing)
|
||||
if e != nil {
|
||||
log.Println("[warning]", e)
|
||||
log.Println("[Warning]", e)
|
||||
}
|
||||
}
|
||||
err = configure.SetSetting(setting)
|
||||
|
||||
Reference in new issue
Block a user