Skip to content

Commit

Permalink
feat: add android
Browse files Browse the repository at this point in the history
  • Loading branch information
Mythologyli committed Nov 2, 2023
1 parent 52998a7 commit 467a1df
Show file tree
Hide file tree
Showing 7 changed files with 249 additions and 20 deletions.
9 changes: 9 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ jobs:
goarch: riscv64
- goos: windows
goarch: arm64
- goos: android
goarch: arm64
# BEGIN MIPS
- goos: linux
goarch: mips64
Expand Down Expand Up @@ -97,10 +99,17 @@ jobs:
run: go mod download

- name: Build
if: matrix.goos != 'android'
run: |
mkdir -p build_assets
go build -v -o build_assets/zju-connect -trimpath -ldflags "-s -w -buildid=" .
- name: Build Android AAR
if: matrix.goos == 'android'
run: |
mkdir -p build_assets
docker run --rm -v "$PWD":/module mythologyli/gomobile-android@latest bind -target=android/arm -o build_assets/zju-connect.aar ./mobile
- name: Rename Windows zju-connect
if: matrix.goos == 'windows'
run: |
Expand Down
19 changes: 7 additions & 12 deletions client/rvpn_conn.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package client

import (
"errors"
"github.com/mythologyli/zju-connect/log"
"io"
)
Expand All @@ -15,7 +16,6 @@ type RvpnConn struct {
recvErrCount int
}

// always success or panic
func (r *RvpnConn) Read(p []byte) (n int, err error) {
for n, err = r.recvConn.Read(p); err != nil && r.recvErrCount < 5; {
log.Printf("Error occurred while receiving, retrying: %v", err)
Expand All @@ -24,18 +24,16 @@ func (r *RvpnConn) Read(p []byte) (n int, err error) {
_ = r.recvConn.Close()
r.recvConn, err = r.easyConnectClient.RecvConn()
if err != nil {
// TODO graceful shutdown
panic(err)
return 0, err
}
r.recvErrCount++
if r.recvErrCount >= 5 {
panic("recv retry limit exceeded.")
return 0, errors.New("recv error count exceeded")
}
}
return
}

// always success or panic
func (r *RvpnConn) Write(p []byte) (n int, err error) {
for n, err = r.sendConn.Write(p); err != nil && r.sendErrCount < 5; {
log.Printf("Error occurred while sending, retrying: %v", err)
Expand All @@ -44,12 +42,11 @@ func (r *RvpnConn) Write(p []byte) (n int, err error) {
_ = r.sendConn.Close()
r.sendConn, err = r.easyConnectClient.SendConn()
if err != nil {
// TODO graceful shutdown
panic(err)
return 0, err
}
r.sendErrCount++
if r.sendErrCount >= 5 {
panic("send retry limit exceeded.")
return 0, errors.New("send error count exceeded")
}
}
return
Expand All @@ -75,14 +72,12 @@ func NewRvpnConn(ec *EasyConnectClient) (*RvpnConn, error) {
var err error
c.sendConn, err = ec.SendConn()
if err != nil {
log.Printf("Error occurred while creating sendConn: %v", err)
panic(err)
return nil, err
}

c.recvConn, err = ec.RecvConn()
if err != nil {
log.Printf("Error occurred while creating recvConn: %v", err)
panic(err)
return nil, err
}
return c, nil
}
45 changes: 45 additions & 0 deletions mobile/mobile.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package mobile

import (
"github.com/mythologyli/zju-connect/client"
"github.com/mythologyli/zju-connect/log"
"github.com/mythologyli/zju-connect/stack/tun"
)

var vpnClient *client.EasyConnectClient

func Login(server string, username string, password string) string {
log.Init()

vpnClient = client.NewEasyConnectClient(
server,
username,
password,
"",
false,
false,
)
err := vpnClient.Setup()
if err != nil {
return ""
}

log.Printf("EasyConnect client started")

clientIP, err := vpnClient.IP()
if err != nil {
return ""
}

return clientIP.String()
}

func StartStack(fd int) {
vpnTUNStack, err := tun.NewStack(vpnClient, "")
if err != nil {
return
}

vpnTUNStack.SetupTun(fd)
vpnTUNStack.Run()
}
18 changes: 14 additions & 4 deletions stack/gvisor/stack.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,10 @@ func (ep *Endpoint) WritePackets(list stack.PacketBufferList) (int, tcpip.Error)
}

if ep.rvpnConn != nil {
n, _ := ep.rvpnConn.Write(buf)
n, err := ep.rvpnConn.Write(buf)
if err != nil {
panic(err)
}

log.DebugPrintf("Send: wrote %d bytes", n)
log.DebugDumpHex(buf[:n])
Expand Down Expand Up @@ -133,13 +136,20 @@ func NewStack(easyConnectClient *client.EasyConnectClient) (*Stack, error) {
}

func (s *Stack) Run() {

s.endpoint.rvpnConn, _ = client.NewRvpnConn(s.endpoint.easyConnectClient)
var err error
s.endpoint.rvpnConn, err = client.NewRvpnConn(s.endpoint.easyConnectClient)
if err != nil {
log.Printf("Error occurred while creating sendConn: %v", err)
panic(err)
}

// Read from VPN server and send to gVisor stack
for {
buf := make([]byte, 1500)
n, _ := s.endpoint.rvpnConn.Read(buf)
n, err := s.endpoint.rvpnConn.Read(buf)
if err != nil {
panic(err)
}

log.DebugPrintf("Recv: read %d bytes", n)
log.DebugDumpHex(buf[:n])
Expand Down
21 changes: 17 additions & 4 deletions stack/tun/stack.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
//go:build !android

package tun

import (
Expand All @@ -14,18 +16,26 @@ type Stack struct {
}

func (s *Stack) Run() {
s.rvpnConn, _ = client.NewRvpnConn(s.endpoint.easyConnectClient)
var err error
s.rvpnConn, err = client.NewRvpnConn(s.endpoint.easyConnectClient)
if err != nil {
log.Printf("Error occurred while creating sendConn: %v", err)
panic(err)
}

// Read from VPN server and send to TUN stack
go func() {
for {
buf := make([]byte, 1500)
n, _ := s.rvpnConn.Read(buf)
n, err := s.rvpnConn.Read(buf)
if err != nil {
panic(err)
}

log.DebugPrintf("Recv: read %d bytes", n)
log.DebugDumpHex(buf[:n])

err := s.endpoint.Write(buf[:n])
err = s.endpoint.Write(buf[:n])
if err != nil {
log.Printf("Error occurred while writing to TUN stack: %v", err)
panic(err)
Expand Down Expand Up @@ -57,7 +67,10 @@ func (s *Stack) Run() {
continue
}

_, _ = s.rvpnConn.Write(buf[:n])
_, err = s.rvpnConn.Write(buf[:n])
if err != nil {
panic(err)
}

log.DebugPrintf("Send: wrote %d bytes", n)
log.DebugDumpHex(buf[:n])
Expand Down
155 changes: 155 additions & 0 deletions stack/tun/stack_android.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
package tun

import (
"context"
"github.com/mythologyli/zju-connect/client"
"github.com/mythologyli/zju-connect/log"
"golang.org/x/net/ipv4"
"io"
"net"
"os"
"syscall"
)

type Stack struct {
endpoint *Endpoint
rvpnConn io.ReadWriteCloser
}

func (s *Stack) Run() {
var err error
s.rvpnConn, err = client.NewRvpnConn(s.endpoint.easyConnectClient)
if err != nil {
log.Printf("Error occurred while creating sendConn: %v", err)
return
}

ctxRead, cancelRead := context.WithCancel(context.Background())
ctxWrite, cancelWrite := context.WithCancel(context.Background())

// Read from VPN server and send to TUN stack
go func() {
for {
select {
case <-ctxRead.Done():
cancelWrite()
return
default:
buf := make([]byte, 1500)
n, err := s.rvpnConn.Read(buf)
if err != nil {
cancelWrite()
return
}

log.DebugPrintf("Recv: read %d bytes", n)
log.DebugDumpHex(buf[:n])

err = s.endpoint.Write(buf[:n])
if err != nil {
log.Printf("Error occurred while writing to TUN stack: %v", err)
cancelWrite()
return
}
}
}
}()

// Read from TUN stack and send to VPN server
for {
select {
case <-ctxWrite.Done():
cancelRead()
return
default:
buf := make([]byte, 1500)
n, err := s.endpoint.Read(buf)
if err != nil {
log.Printf("Error occurred while reading from TUN stack: %v", err)
cancelRead()
return
}

if n < 20 {
continue
}

header, err := ipv4.ParseHeader(buf[:n])
if err != nil {
continue
}

// Filter out non-TCP/UDP packets otherwise error may occur
if header.Protocol != syscall.IPPROTO_TCP && header.Protocol != syscall.IPPROTO_UDP {
continue
}

_, err = s.rvpnConn.Write(buf[:n])
if err != nil {
cancelRead()
return
}

log.DebugPrintf("Send: wrote %d bytes", n)
log.DebugDumpHex(buf[:n])
}
}
}

type Endpoint struct {
easyConnectClient *client.EasyConnectClient

readWriteCloser io.ReadWriteCloser
ip net.IP

tcpDialer *net.Dialer
udpDialer *net.Dialer
}

func (ep *Endpoint) Write(buf []byte) error {
_, err := ep.readWriteCloser.Write(buf)
return err
}

func (ep *Endpoint) Read(buf []byte) (int, error) {
return ep.readWriteCloser.Read(buf)
}

func (s *Stack) AddRoute(target string) error {
return nil
}

func NewStack(easyConnectClient *client.EasyConnectClient, dnsServer string) (*Stack, error) {
s := &Stack{}

s.endpoint = &Endpoint{
easyConnectClient: easyConnectClient,
}

var err error
s.endpoint.ip, err = easyConnectClient.IP()
if err != nil {
return nil, err
}

// We need this dialer to bind to device otherwise packets will not be sent via TUN
s.endpoint.tcpDialer = &net.Dialer{
LocalAddr: &net.TCPAddr{
IP: s.endpoint.ip,
Port: 0,
},
}

s.endpoint.udpDialer = &net.Dialer{
LocalAddr: &net.UDPAddr{
IP: s.endpoint.ip,
Port: 0,
},
}

return s, nil
}

func (s *Stack) SetupTun(fd int) {
s.endpoint.readWriteCloser = os.NewFile(uintptr(fd), "tun")
}
2 changes: 2 additions & 0 deletions stack/tun/stack_linux.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
//go:build !android

package tun

import (
Expand Down

0 comments on commit 467a1df

Please sign in to comment.