(squash before merge) srvPort -> localhostPort

Author: yagil

tailscale.c

@@ -23,7 +23,7 @@ extern int TsnetGetIps(int sd, char *buf, size_t buflen);
 extern int TsnetGetRemoteAddr(int listener, int conn, char *buf, size_t buflen);
 extern int TsnetListen(int sd, char* net, char* addr, int* listenerOut);
 extern int TsnetLoopback(int sd, char* addrOut, size_t addrLen, char* proxyOut, char* localOut);
-extern int TsnetEnableFunnelToLocalhostPlaintextHttp1(int sd, int srvPort);
+extern int TsnetEnableFunnelToLocalhostPlaintextHttp1(int sd, int localhostPort);
 
 tailscale tailscale_new() {
 	return TsnetNewServer();
@@ -108,6 +108,6 @@ int tailscale_errmsg(tailscale sd, char* buf, size_t buflen) {
 	return TsnetErrmsg(sd, buf, buflen);
 }
 
-int tailscale_enable_funnel_to_localhost_plaintext_http1(tailscale sd, int srvPort) {
-	return TsnetEnableFunnelToLocalhostPlaintextHttp1(sd, srvPort);
+int tailscale_enable_funnel_to_localhost_plaintext_http1(tailscale sd, int localhostPort) {
+	return TsnetEnableFunnelToLocalhostPlaintextHttp1(sd, localhostPort);
 }

tailscale.go

@@ -535,7 +535,7 @@ func TsnetLoopback(sd C.int, addrOut *C.char, addrLen C.size_t, proxyOut *C.char
 }
 
 //export TsnetEnableFunnelToLocalhostPlaintextHttp1
-func TsnetEnableFunnelToLocalhostPlaintextHttp1(sd C.int, srvPort C.int) C.int {
+func TsnetEnableFunnelToLocalhostPlaintextHttp1(sd C.int, localhostPort C.int) C.int {
 	s, err := getServer(sd)
 	if err != nil {
 		return s.recErr(err)
@@ -554,7 +554,7 @@ func TsnetEnableFunnelToLocalhostPlaintextHttp1(sd C.int, srvPort C.int) C.int {
 	domain := st.CertDomains[0]
 
 	hp := ipn.HostPort(net.JoinHostPort(domain, strconv.Itoa(443)))
-	tcpForward := fmt.Sprintf("127.0.0.1:%d", srvPort)
+	tcpForward := fmt.Sprintf("127.0.0.1:%d", localhostPort)
 	sc := &ipn.ServeConfig{
 		TCP: map[uint16]*ipn.TCPPortHandler{
 			443: {

tailscale.h

@@ -189,7 +189,7 @@ extern int tailscale_loopback(tailscale sd, char* addr_out, size_t addrlen, char
 // Returns:
 // 	0     - success
 // 	-1    - other error, details printed to the tsnet logger
-extern int tailscale_enable_funnel_to_localhost_plaintext_http1(tailscale sd, int srvPort);
+extern int tailscale_enable_funnel_to_localhost_plaintext_http1(tailscale sd, int localhostPort);
 
 // tailscale_errmsg writes the details of the last error to buf.
 //