Mobile bindings

Makefile

@@ -10,4 +10,22 @@ doc: checklist
 	find lib cmd -type d -exec $(HERE)/doc.sh {} \;
 
 checklist:
-	find . -name '*.go' -exec grep --color -C 1 -Hn 'panic("unimplemented")' {} \;
+	find . -name '*.go' -exec grep --color -C 1 -Hn 'panic("unimplemented")' {} \;
+
+mobile:
+	go install golang.org/x/mobile/cmd/gomobile@latest
+	gomobile init
+
+bindSetupMobile: mobile
+	go get -u golang.org/x/mobile/bind
+
+mobileLibs:
+	gomobile bind -target=android ./lib/tcp/client
+	gomobile bind -target=android ./lib/tcp/server
+	gomobile bind -target=android ./lib/udp/client
+	gomobile bind -target=android ./lib/udp/server
+	gomobile bind -target=android ./lib/irc/client
+	gomobile bind -target=android ./lib/irc/server
+	gomobile bind -target=android ./lib/http/client
+	gomobile bind -target=android ./lib/http/server
+	gomobile bind -target=android ./lib/socks/client

lib/core/types.go

@@ -37,5 +37,5 @@ type I2PTunnel interface {
 	// Get the tunnel's error message
 	Error() error
 	// Get the tunnel's local host:port
-	LocalAddress() (string, string, error)
+	LocalAddress() (string, error)
 }

lib/http/client/httpclient.go

@@ -23,6 +23,7 @@ Key features:
 **/
 
 import (
+	"net"
 	"strconv"
 
 	httpinspector "github.com/go-i2p/go-connfilter/http"
@@ -67,8 +68,9 @@ func (h *HTTPClient) Error() error {
 }
 
 // Get the tunnel's local host:port
-func (h *HTTPClient) LocalAddress() (string, string, error) {
+func (h *HTTPClient) LocalAddress() (string, error) {
-	return h.TunnelConfig.Interface, strconv.Itoa(h.TunnelConfig.Port), nil
+	addr := net.JoinHostPort(h.TunnelConfig.Interface, strconv.Itoa(h.TunnelConfig.Port))
+	return addr, nil
 }
 
 // Get the tunnel's name

lib/http/server/httpserver.go

@@ -76,8 +76,9 @@ func (h *HTTPServer) Error() error {
 }
 
 // Get the tunnel's local host:port
-func (h *HTTPServer) LocalAddress() (string, string, error) {
+func (h *HTTPServer) LocalAddress() (string, error) {
-	return h.TunnelConfig.Interface, strconv.Itoa(h.TunnelConfig.Port), nil
+	addr := net.JoinHostPort(h.TunnelConfig.Interface, strconv.Itoa(h.TunnelConfig.Port))
+	return addr, nil
 }
 
 // Get the tunnel's name

lib/irc/client/client.go

@@ -13,6 +13,7 @@ The IRC Client implements a SOCKS-compatible proxy that enables local IRC client
 **/
 
 import (
+	"net"
 	"strconv"
 
 	ircinspector "github.com/go-i2p/go-connfilter/irc"
@@ -60,8 +61,9 @@ func (i *IRCClient) Error() error {
 }
 
 // Get the tunnel's local host:port
-func (i *IRCClient) LocalAddress() (string, string, error) {
+func (i *IRCClient) LocalAddress() (string, error) {
-	return i.TunnelConfig.Interface, strconv.Itoa(i.TunnelConfig.Port), nil
+	addr := net.JoinHostPort(i.TunnelConfig.Interface, strconv.Itoa(i.TunnelConfig.Port))
+	return addr, nil
 }
 
 // Get the tunnel's name

lib/irc/server/server.go

@@ -66,8 +66,9 @@ func (i *IRCServer) Error() error {
 }
 
 // Get the tunnel's local host:port
-func (i *IRCServer) LocalAddress() (string, string, error) {
+func (i *IRCServer) LocalAddress() (string, error) {
-	return i.TunnelConfig.Interface, strconv.Itoa(i.TunnelConfig.Port), nil
+	addr := net.JoinHostPort(i.TunnelConfig.Interface, strconv.Itoa(i.TunnelConfig.Port))
+	return addr, nil
 }
 
 // Get the tunnel's name

lib/socks/client/socks.go

@@ -92,8 +92,9 @@ func (s *SOCKS) Error() error {
 }
 
 // Get the tunnel's local host:port
-func (s *SOCKS) LocalAddress() (string, string, error) {
+func (s *SOCKS) LocalAddress() (string, error) {
-	return s.TunnelConfig.Interface, strconv.Itoa(s.TunnelConfig.Port), nil
+	addr := net.JoinHostPort(s.TunnelConfig.Interface, strconv.Itoa(s.TunnelConfig.Port))
+	return addr, nil
 }
 
 // Get the tunnel's name

lib/tcp/client/tcpclient.go

@@ -69,8 +69,9 @@ func (t *TCPClient) Error() error {
 }
 
 // Get the tunnel's local host:port
-func (t *TCPClient) LocalAddress() (string, string, error) {
+func (t *TCPClient) LocalAddress() (string, error) {
-	return t.TunnelConfig.Interface, strconv.Itoa(t.TunnelConfig.Port), nil
+	addr := net.JoinHostPort(t.TunnelConfig.Interface, strconv.Itoa(t.TunnelConfig.Port))
+	return addr, nil
 }
 
 // Get the tunnel's name

lib/tcp/server/tcpserver.go

@@ -16,6 +16,7 @@ When an I2P peer connects to the tunnel's destination, the traffic flows:
 import (
 	"context"
 	"net"
+	"strconv"
 
 	"github.com/go-i2p/go-forward/config"
 	"github.com/go-i2p/go-forward/stream"
@@ -63,9 +64,9 @@ func (t *TCPServer) Error() error {
 }
 
 // Get the tunnel's local host:port
-func (t *TCPServer) LocalAddress() (string, string, error) {
+func (t *TCPServer) LocalAddress() (string, error) {
-	addr := t.Addr.String()
+	addr := net.JoinHostPort(t.TunnelConfig.Interface, strconv.Itoa(t.TunnelConfig.Port))
-	return net.SplitHostPort(addr)
+	return addr, nil
 }
 
 // Get the tunnel's name

lib/udp/client/udpclient.go

@@ -71,8 +71,9 @@ func (u *UDPClient) Error() error {
 }
 
 // Get the tunnel's local host:port
-func (u *UDPClient) LocalAddress() (string, string, error) {
+func (u *UDPClient) LocalAddress() (string, error) {
-	return u.TunnelConfig.Interface, strconv.Itoa(u.TunnelConfig.Port), nil
+	addr := net.JoinHostPort(u.TunnelConfig.Interface, strconv.Itoa(u.TunnelConfig.Port))
+	return addr, nil
 }
 
 // Get the tunnel's name

lib/udp/server/udpserver.go

@@ -71,8 +71,9 @@ func (u *UDPServer) Error() error {
 }
 
 // Get the tunnel's local host:port
-func (u *UDPServer) LocalAddress() (string, string, error) {
+func (u *UDPServer) LocalAddress() (string, error) {
-	return u.TunnelConfig.Interface, strconv.Itoa(u.TunnelConfig.Port), nil
+	addr := net.JoinHostPort(u.TunnelConfig.Interface, strconv.Itoa(u.TunnelConfig.Port))
+	return addr, nil
 }
 
 // Get the tunnel's name