lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

workarounds

Xe/tsnet-funnel
Shayne Sweeney 2022-12-16 11:46:13 -05:00
parent ea86fc127a
commit 12720007ce
No known key found for this signature in database
GPG Key ID: 69DA13E86BF403B0
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ipn/ipnlocal/peerapi.go
View File

@ -574,6 +574,7 @@ func (pln *peerAPIListener) ServeConn(src netip.AddrPort, c net.Conn) {
c.Close()
return
}
logf("remoteAddr=%v", src)
h := &peerAPIHandler{
ps: pln.ps,
isSelf: nm.SelfNode.User == peerNode.User,
@ -1022,6 +1023,8 @@ func (h *peerAPIHandler) canIngress() bool {
}
func (h *peerAPIHandler) peerHasCap(wantCap string) bool {
h.logf("h.remoteAddr.Addr()=%v", h.remoteAddr.Addr())
h.logf("h.ps.b.PeerCaps(h.remoteAddr.Addr())=%v", h.ps.b.PeerCaps(h.remoteAddr.Addr()))
for _, hasCap := range h.ps.b.PeerCaps(h.remoteAddr.Addr()) {
if hasCap == wantCap {
return true

7
tsnet/tsnet.go
View File

@ -765,13 +765,12 @@ func (s *Server) ExposeHTTPS() (net.Listener, error) {
srvConfig := &ipn.ServeConfig{
TCP: map[uint16]*ipn.TCPPortHandler{
443: &ipn.TCPPortHandler{
TCPForward: ln.Addr().String(),
HTTPS: true,
},
},
Web: map[ipn.HostPort]*ipn.WebServerConfig{
hp: &ipn.WebServerConfig{
Handlers: map[string]*ipn.HTTPHandler {
Handlers: map[string]*ipn.HTTPHandler{
"/": &ipn.HTTPHandler{Proxy: ln.Addr().String()},
},
},
@ -793,11 +792,11 @@ type funnelListenerWrapper struct {
s *Server
}
func (flw *funnelListenerWrapper) Accept() (net.Conn, error) {
func (flw *funnelListenerWrapper) Accept() (net.Conn, error) {
conn, err := flw.Listener.Accept()
flw.s.logf("got connection from %s", conn.RemoteAddr())
return conn, err
}