@@ -10,15 +10,12 @@ package main
1010import "C"
1111
1212import (
13- "bufio"
14- "bytes"
15- "log"
13+ "fmt"
1614 "math"
1715 "net"
1816 "os"
1917 "os/signal"
2018 "runtime"
21- "strings"
2219 "unsafe"
2320
2421 "golang.org/x/sys/unix"
@@ -29,13 +26,21 @@ import (
2926)
3027
3128type AndroidLogger struct {
32- level C.int
33- interfaceName string
29+ level C.int
30+ tag * C. char
3431}
3532
36- func (l AndroidLogger ) Write (p []byte ) (int , error ) {
37- C .__android_log_write (l .level , C .CString ("WireGuard/GoBackend/" + l .interfaceName ), C .CString (string (p )))
38- return len (p ), nil
33+ func cstring (s string ) * C.char {
34+ b , err := unix .BytePtrFromString (s )
35+ if err != nil {
36+ b := [1 ]C.char {}
37+ return & b [0 ]
38+ }
39+ return (* C .char )(unsafe .Pointer (b ))
40+ }
41+
42+ func (l AndroidLogger ) Printf (format string , args ... interface {}) {
43+ C .__android_log_write (l .level , l .tag , cstring (fmt .Sprintf (format , args ... )))
3944}
4045
4146type TunnelHandle struct {
@@ -55,39 +60,38 @@ func init() {
5560 select {
5661 case <- signals :
5762 n := runtime .Stack (buf , true )
63+ if n == len (buf ) {
64+ n --
65+ }
5866 buf [n ] = 0
59- C .__android_log_write (C .ANDROID_LOG_ERROR , C . CString ("WireGuard/GoBackend/Stacktrace" ), (* C .char )(unsafe .Pointer (& buf [0 ])))
67+ C .__android_log_write (C .ANDROID_LOG_ERROR , cstring ("WireGuard/GoBackend/Stacktrace" ), (* C .char )(unsafe .Pointer (& buf [0 ])))
6068 }
6169 }
6270 }()
6371}
6472
6573//export wgTurnOn
66- func wgTurnOn (ifnameRef string , tunFd int32 , settings string ) int32 {
67- interfaceName := string ([]byte (ifnameRef ))
68-
74+ func wgTurnOn (interfaceName string , tunFd int32 , settings string ) int32 {
75+ tag := cstring ("WireGuard/GoBackend/" + interfaceName )
6976 logger := & device.Logger {
70- Debug : log .New (& AndroidLogger {level : C .ANDROID_LOG_DEBUG , interfaceName : interfaceName }, "" , 0 ),
71- Info : log .New (& AndroidLogger {level : C .ANDROID_LOG_INFO , interfaceName : interfaceName }, "" , 0 ),
72- Error : log .New (& AndroidLogger {level : C .ANDROID_LOG_ERROR , interfaceName : interfaceName }, "" , 0 ),
77+ Verbosef : AndroidLogger {level : C .ANDROID_LOG_DEBUG , tag : tag }.Printf ,
78+ Errorf : AndroidLogger {level : C .ANDROID_LOG_ERROR , tag : tag }.Printf ,
7379 }
7480
75- logger .Debug .Println ("Debug log enabled" )
76-
7781 tun , name , err := tun .CreateUnmonitoredTUNFromFD (int (tunFd ))
7882 if err != nil {
7983 unix .Close (int (tunFd ))
80- logger .Error . Println ( err )
84+ logger .Errorf ( "CreateUnmonitoredTUNFromFD: %v" , err )
8185 return - 1
8286 }
8387
84- logger .Info . Println ("Attaching to interface" , name )
88+ logger .Verbosef ("Attaching to interface %v " , name )
8589 device := device .NewDevice (tun , logger )
8690
87- setError : =device .IpcSetOperation ( bufio . NewReader ( strings . NewReader ( settings )) )
88- if setError != nil {
91+ err = device .IpcSet ( settings )
92+ if err != nil {
8993 unix .Close (int (tunFd ))
90- logger .Error . Println ( setError )
94+ logger .Errorf ( "IpcSet: %v" , err )
9195 return - 1
9296 }
9397 device .DisableSomeRoamingForBrokenMobileSemantics ()
@@ -96,12 +100,12 @@ func wgTurnOn(ifnameRef string, tunFd int32, settings string) int32 {
96100
97101 uapiFile , err := ipc .UAPIOpen (name )
98102 if err != nil {
99- logger .Error . Println ( err )
103+ logger .Errorf ( "UAPIOpen: %v" , err )
100104 } else {
101105 uapi , err = ipc .UAPIListen (name , uapiFile )
102106 if err != nil {
103107 uapiFile .Close ()
104- logger .Error . Println ( err )
108+ logger .Errorf ( "UAPIListen: %v" , err )
105109 } else {
106110 go func () {
107111 for {
@@ -116,7 +120,7 @@ func wgTurnOn(ifnameRef string, tunFd int32, settings string) int32 {
116120 }
117121
118122 device .Up ()
119- logger .Info . Println ("Device started" )
123+ logger .Verbosef ("Device started" )
120124
121125 var i int32
122126 for i = 0 ; i < math .MaxInt32 ; i ++ {
@@ -185,14 +189,11 @@ func wgGetConfig(tunnelHandle int32) *C.char {
185189 if ! ok {
186190 return nil
187191 }
188- settings := new (bytes.Buffer )
189- writer := bufio .NewWriter (settings )
190- err := handle .device .IpcGetOperation (writer )
192+ settings , err := handle .device .IpcGet ()
191193 if err != nil {
192194 return nil
193195 }
194- writer .Flush ()
195- return C .CString (settings .String ())
196+ return C .CString (settings )
196197}
197198
198199//export wgVersion
0 commit comments