fix: bugs and issues

This commit is contained in:
Hiddify
2024-03-09 21:07:15 +01:00
parent d05deef499
commit 8ecd0d9644
13 changed files with 79 additions and 60 deletions

View File

@@ -5,7 +5,6 @@ package main
*/
import "C"
import (
"fmt"
"unsafe"
"github.com/hiddify/libcore/cmd"
@@ -15,7 +14,7 @@ import (
func parseCli(argc C.int, argv **C.char) *C.char {
args := make([]string, argc)
for i := 0; i < int(argc); i++ {
fmt.Println("parseCli", C.GoString(*argv))
// fmt.Println("parseCli", C.GoString(*argv))
args[i] = C.GoString(*argv)
argv = (**C.char)(unsafe.Pointer(uintptr(unsafe.Pointer(argv)) + uintptr(unsafe.Sizeof(*argv))))
}
@@ -23,5 +22,5 @@ func parseCli(argc C.int, argv **C.char) *C.char {
if err != nil {
return C.CString(err.Error())
}
return C.CString("Ok")
return C.CString("")
}

View File

@@ -200,7 +200,7 @@ func stop() (CErr *C.char) {
stopAndAlert("Unexpected Error in Stop!", err)
CErr = C.CString(err.Error())
})
config.DeactivateTunnelService()
if v2.CoreState != pb.CoreState_STARTED {
stopAndAlert("Already Stopped", nil)
return C.CString("")
@@ -209,6 +209,7 @@ func stop() (CErr *C.char) {
return C.CString("instance not found")
}
propagateStatus(pb.CoreState_STOPPING)
config.DeactivateTunnelService()
commandServer.SetService(nil)
err := v2.Box.Close()

View File

@@ -54,7 +54,7 @@ func stopAndAlert(alert string, err error) (resultErr error) {
msg, _ := json.Marshal(StatusMessage{Status: convert2OldState(v2.CoreState), Alert: &alert, Message: &message})
bridge.SendStringToPort(statusPropagationPort, string(msg))
config.DeactivateTunnelService()
go config.DeactivateTunnelService()
if commandServer != nil {
commandServer.SetService(nil)
}