Don't export internal structures to outside world - gomobile picks them up

Author: tadovas

gomobile_ios.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
-#Only works with patched gomobile version
+
 CGO_LDFLAGS_ALLOW="-fobjc-arc" \
 gomobile bind -target=ios/arm64 $@ -iosversion=10.3 -v github.com/mysteriumnetwork/go-openvpn/openvpn3

openvpn3/c_args.go

@@ -4,39 +4,39 @@ package openvpn3
 import "C"
 import "unsafe"
 
-type CCharPointer struct {
+type cCharPointer struct {
 	Ptr *C.char
 }
 
-func NewCharPointer(str string) *CCharPointer {
-	return &CCharPointer{
+func newCharPointer(str string) *cCharPointer {
+	return &cCharPointer{
 		Ptr: C.CString(str),
 	}
 }
 
-func (ptr *CCharPointer) Delete() {
+func (ptr *cCharPointer) delete() {
 	C.free(unsafe.Pointer(ptr.Ptr))
 }
 
-type CCharPointerArray struct {
+type cCharPointerArray struct {
 	pointers []*C.char
 }
 
-func (a *CCharPointerArray) AddAll(args ...string) {
+func (a *cCharPointerArray) addAll(args ...string) {
 	for _, arg := range args {
 		a.pointers = append(a.pointers, C.CString(arg))
 	}
 }
 
-func (a *CCharPointerArray) cPointer() **C.char {
+func (a *cCharPointerArray) cPointer() **C.char {
 	return (**C.char)(&a.pointers[0])
 }
 
-func (a *CCharPointerArray) cCount() C.int {
+func (a *cCharPointerArray) cCount() C.int {
 	return C.int(len(a.pointers))
 }
 
-func (a *CCharPointerArray) Free() {
+func (a *cCharPointerArray) free() {
 	for _, arg := range a.pointers {
 		C.free(unsafe.Pointer(arg))
 	}

openvpn3/callback_bridge.go

@@ -14,22 +14,22 @@ extern void goEventCallback(user_callback_data usrData, conn_event event);
 */
 import "C"
 
-var callbacks = NewCallbackRegistry()
+var callbacks = newCallbackRegistry()
 
 //export goStatsCallback
 func goStatsCallback(ptr C.user_callback_data, cStats C.conn_stats) {
 	id := int(ptr)
 	var stats Statistics
 	stats.BytesIn = int(cStats.bytes_in)
 	stats.BytesOut = int(cStats.bytes_out)
-	callbacks.Stats(id, stats)
+	callbacks.stats(id, stats)
 }
 
 //export goLogCallback
 func goLogCallback(ptr C.user_callback_data, cStr *C.char) {
 	goStr := C.GoString(cStr)
 	id := int(ptr)
-	callbacks.Log(id, goStr)
+	callbacks.log(id, goStr)
 }
 
 //export goEventCallback
@@ -40,7 +40,7 @@ func goEventCallback(ptr C.user_callback_data, cEvent C.conn_event) {
 	e.Fatal = bool(cEvent.fatal)
 	e.Name = C.GoString(cEvent.name)
 	e.Info = C.GoString(cEvent.info)
-	callbacks.Event(id, e)
+	callbacks.event(id, e)
 }
 
 func SelfCheck(logger Logger) {

openvpn3/callback_registry.go

@@ -26,15 +26,15 @@ type StatsConsumer interface {
 	OnStats(*Statistics)
 }
 
-type Unregister func()
+type unregister func()
 
-type CallbackRegistry struct {
+type callbackRegistry struct {
 	lock   sync.Locker
 	idMap  map[int]interface{}
 	lastId int
 }
 
-func (cr *CallbackRegistry) register(callbacks interface{}) (int, Unregister) {
+func (cr *callbackRegistry) register(callbacks interface{}) (int, unregister) {
 	cr.lock.Lock()
 	defer cr.lock.Unlock()
 
@@ -48,13 +48,13 @@ func (cr *CallbackRegistry) register(callbacks interface{}) (int, Unregister) {
 	}
 }
 
-func (cr *CallbackRegistry) unregister(id int) {
+func (cr *callbackRegistry) unregister(id int) {
 	cr.lock.Lock()
 	defer cr.lock.Unlock()
 	delete(cr.idMap, id)
 }
 
-func (cr *CallbackRegistry) Log(id int, text string) {
+func (cr *callbackRegistry) log(id int, text string) {
 	cr.lock.Lock()
 	defer cr.lock.Unlock()
 	callback, ok := cr.idMap[id]
@@ -68,7 +68,7 @@ func (cr *CallbackRegistry) Log(id int, text string) {
 	logCallback.Log(text)
 }
 
-func (cr *CallbackRegistry) Event(id int, event Event) {
+func (cr *callbackRegistry) event(id int, event Event) {
 	cr.lock.Lock()
 	defer cr.lock.Unlock()
 	callback, ok := cr.idMap[id]
@@ -83,7 +83,7 @@ func (cr *CallbackRegistry) Event(id int, event Event) {
 
 }
 
-func (cr *CallbackRegistry) Stats(id int, stats Statistics) {
+func (cr *callbackRegistry) stats(id int, stats Statistics) {
 	cr.lock.Lock()
 	defer cr.lock.Unlock()
 	callback, ok := cr.idMap[id]
@@ -98,8 +98,8 @@ func (cr *CallbackRegistry) Stats(id int, stats Statistics) {
 
 }
 
-func NewCallbackRegistry() *CallbackRegistry {
-	return &CallbackRegistry{
+func newCallbackRegistry() *callbackRegistry {
+	return &callbackRegistry{
 		lastId: 0,
 		idMap:  make(map[int]interface{}),
 		lock:   &sync.Mutex{},

openvpn3/callback_registry_test.go

@@ -6,7 +6,7 @@ import (
 )
 
 func TestTwoCallbacksAreAdded(t *testing.T) {
-	registry := NewCallbackRegistry()
+	registry := newCallbackRegistry()
 
 	id1, _ := registry.register("abc")
 	id2, _ := registry.register("def")
@@ -16,7 +16,7 @@ func TestTwoCallbacksAreAdded(t *testing.T) {
 }
 
 func TestCallbackRemovedOnUnregister(t *testing.T) {
-	registry := NewCallbackRegistry()
+	registry := newCallbackRegistry()
 	id, unregister := registry.register("abc")
 
 	assert.Contains(t, registry.idMap, id)
@@ -25,32 +25,32 @@ func TestCallbackRemovedOnUnregister(t *testing.T) {
 }
 
 func TestLogCallbackCalled(t *testing.T) {
-	registry := NewCallbackRegistry()
+	registry := newCallbackRegistry()
 
 	callback := &mockedCallback{}
 	id, _ := registry.register(callback)
 
-	registry.Log(id, "test")
+	registry.log(id, "test")
 
 	assert.True(t, callback.logCalled)
 }
 
 func TestEventCallbackCalled(t *testing.T) {
-	registry := NewCallbackRegistry()
+	registry := newCallbackRegistry()
 	callback := &mockedCallback{}
 
 	id, _ := registry.register(callback)
-	registry.Event(id, Event{})
+	registry.event(id, Event{})
 
 	assert.True(t, callback.eventCalled)
 }
 
 func TestStatsCallbackCalled(t *testing.T) {
-	registry := NewCallbackRegistry()
+	registry := newCallbackRegistry()
 	callback := &mockedCallback{}
 
 	id, _ := registry.register(callback)
-	registry.Stats(id, Statistics{})
+	registry.stats(id, Statistics{})
 
 	assert.True(t, callback.statsCalled)
 }

openvpn3/session.go

@@ -54,14 +54,14 @@ func (session *Session) Start(profile string, creds *Credentials) {
 	go func() {
 		defer session.finished.Done()
 
-		profileContent := NewCharPointer(profile)
-		defer profileContent.Delete()
+		profileContent := newCharPointer(profile)
+		defer profileContent.delete()
 
-		cUsername := NewCharPointer(creds.Username)
-		defer cUsername.Delete()
+		cUsername := newCharPointer(creds.Username)
+		defer cUsername.delete()
 
-		cPassword := NewCharPointer(creds.Password)
-		defer cPassword.Delete()
+		cPassword := newCharPointer(creds.Password)
+		defer cPassword.delete()
 
 		cCreds := expCredentials{
 			username: cUsername.Ptr,

openvpn3/tun_setup_bridge.go

@@ -262,7 +262,7 @@ var tunnelSetupRegistry = tunSetupRegistry{
 }
 
 func registerTunnelSetupDelegate(delegate TunnelSetup) (C.tun_builder_callbacks, func()) {
-	id, unregister := tunnelSetupRegistry.Register(delegate)
+	id, unregister := tunnelSetupRegistry.register(delegate)
 	return C.tun_builder_callbacks{
 		usrData: C.user_callback_data(id),
 		//delegates to go callbacks

openvpn3/tun_setup_registry.go

@@ -8,7 +8,7 @@ type tunSetupRegistry struct {
 	lastId int
 }
 
-func (registry *tunSetupRegistry) Register(delegate TunnelSetup) (int, func()) {
+func (registry *tunSetupRegistry) register(delegate TunnelSetup) (int, func()) {
 	registry.lock.Lock()
 	defer registry.lock.Unlock()