From f34d71eb88a46bac880163733096de04d35f9562 Mon Sep 17 00:00:00 2001
From: Kr328 <39107975+Kr328@users.noreply.github.com>
Date: Thu, 11 Jun 2020 15:57:34 +0800
Subject: [PATCH] refactor clash bridge

---
 core/src/main/cpp/query.cpp     |  4 +++-
 core/src/main/golang/proxies.go | 21 ++++++++++++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/core/src/main/cpp/query.cpp b/core/src/main/cpp/query.cpp
index 68c36a4..dc8c70a 100644
--- a/core/src/main/cpp/query.cpp
+++ b/core/src/main/cpp/query.cpp
@@ -1,5 +1,7 @@
 #include "main.h"
 
+#include <android/log.h>
+
 extern "C"
 JNIEXPORT jobject JNICALL
 Java_com_github_kr328_clash_core_bridge_Bridge_queryGeneral(JNIEnv *env, jclass clazz) {
@@ -90,7 +92,7 @@ Java_com_github_kr328_clash_core_bridge_Bridge_queryProxyGroups(JNIEnv *env, jcl
                     group_name,
                     group->base.proxy_type,
                     now,
-                    context->createProxyArray(group->proxies_size, jproxies));
+                    context->createProxyArray(group->proxies_size, jproxies);
 
             delete[] jproxies;
 
diff --git a/core/src/main/golang/proxies.go b/core/src/main/golang/proxies.go
index 810af30..a807449 100644
--- a/core/src/main/golang/proxies.go
+++ b/core/src/main/golang/proxies.go
@@ -6,6 +6,7 @@ import (
 	"github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/log"
 	"github.com/Dreamacro/clash/tunnel"
+	"strings"
 	"unsafe"
 )
 
@@ -88,7 +89,7 @@ func queryProxyGroups() *C.proxy_group_list_t {
 			ps = append(ps, provider.Proxies()...)
 		}
 
-		g := allocCProxyGroup(len(proxies))
+		g := allocCProxyGroup(len(ps))
 
 		g.base.name_index = C.long(len(stringPool))
 		g.base.proxy_type = typeToProxyTypeC(group.Type())
@@ -98,7 +99,7 @@ func queryProxyGroups() *C.proxy_group_list_t {
 		stringPool = append(stringPool, 0)
 
 		proxyIndex := 0
-		for _, proxy := range proxies {
+		for _, proxy := range ps {
 			p := indexCProxyGroupElement(g, proxyIndex)
 
 			p.name_index = C.long(len(stringPool))
@@ -120,6 +121,8 @@ func queryProxyGroups() *C.proxy_group_list_t {
 		groupIndex++
 	}
 
+	log.Infoln("string_pool = %s", strings.Replace(string(stringPool), "\000", "|", -1))
+
 	result.string_pool = (*C.char)(C.CBytes(stringPool))
 
 	return result
@@ -164,11 +167,19 @@ func typeToProxyTypeC(t constant.AdapterType) C.proxy_type_t {
 }
 
 func allocCProxyGroup(proxiesSize int) *C.proxy_group_t {
-	return (*C.proxy_group_t)(C.malloc(C.sizeof_proxy_group_t + C.sizeof_proxy_t * C.size_t(proxiesSize)))
+	result := (*C.proxy_group_t)(C.malloc(C.sizeof_proxy_group_t + C.sizeof_proxy_t * C.size_t(proxiesSize)))
+
+	result.proxies_size = C.int(proxiesSize)
+
+	return result
 }
 
 func allocCProxyGroupList(groupSize int) *C.proxy_group_list_t {
-	return (*C.proxy_group_list_t)(C.malloc(C.sizeof_proxy_group_list_t + C.sizeof_long * C.size_t(groupSize)))
+	result := (*C.proxy_group_list_t)(C.malloc(C.sizeof_proxy_group_list_t + C.sizeof_long * C.size_t(groupSize)))
+
+	result.size = C.int(groupSize)
+
+	return result
 }
 
 //noinspection GoVetUnsafePointer
@@ -184,7 +195,7 @@ func setCProxyGroupListElement(list *C.proxy_group_list_t, index int, element *C
 func indexCProxyGroupElement(group *C.proxy_group_t, index int) *C.proxy_t {
 	address := uintptr(unsafe.Pointer(group))
 
-	offset := address + uintptr(C.sizeof_proxy_group_list_t) + uintptr(index) * uintptr(C.sizeof_proxy_t)
+	offset := address + uintptr(C.sizeof_proxy_group_t) + uintptr(index) * uintptr(C.sizeof_proxy_t)
 
 	return (*C.proxy_t)(unsafe.Pointer(offset))
 }
\ No newline at end of file