Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use switch with default for RemoteAddr parsing #200

Merged
merged 1 commit into from
Jul 19, 2023
Merged

Use switch with default for RemoteAddr parsing #200

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 29 additions & 7 deletions cmd/application/conns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,30 @@ func (cm *connManager) handleNewConn(regManager *cj.RegistrationManager, clientC
cm.handleNewTCPConn(regManager, clientConn, originalDstIP)
}

func getRemoteAsIP(conn net.Conn) (remoteIP net.IP) {
remoteAddr := conn.RemoteAddr()
switch addr := remoteAddr.(type) {
case *net.TCPAddr:
remoteIP = addr.IP
case *net.UDPAddr:
remoteIP = addr.IP
default:
a := remoteAddr.String()
// try parsing the returned address string as host:port
host, _, err := net.SplitHostPort(a)
if err != nil {
// try parsing the returned address string as just an IP address
remoteIP = net.ParseIP(a)
break
} else {
// try parsing the returned host portion of the address as an IP address as opposed to a
// domain name or other string.
remoteIP = net.ParseIP(host)
}
}
return
}

func (cm *connManager) handleNewTCPConn(regManager *cj.RegistrationManager, clientConn net.Conn, originalDstIP net.IP) {
isIPv4 := originalDstIP.To4() != nil
var originalDst, originalSrc string
Expand All @@ -125,15 +149,13 @@ func (cm *connManager) handleNewTCPConn(regManager *cj.RegistrationManager, clie
flowDescription := fmt.Sprintf("%s -> %s ", originalSrc, originalDst)
logger := log.New(os.Stdout, "[CONN] "+flowDescription, golog.Ldate|golog.Lmicroseconds)

remoteAddr := clientConn.RemoteAddr()
var remoteIP net.IP
if addr, ok := remoteAddr.(*net.TCPAddr); ok {
remoteIP = addr.IP
} else if addr, ok := remoteAddr.(*net.UDPAddr); ok {
remoteIP = addr.IP
} else {
remoteIP := getRemoteAsIP(clientConn)
if remoteIP == nil {
// Socket returned non-IP Remote Address - we can't really use that. If testing w/ pipe try
// wrapping with struct to provide mock RemoteAddr which return a real IP address.
return
}

var asn uint = 0
var cc string
var err error
Expand Down
Loading