jmb/smtpd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix client IP in Received line for IPv6 IP addresses

Browse source
This commit is contained in:
Bernhard Froehlich 2018-12-14 11:08:42 +00:00
parent 9fccea2351
commit e7d1686eae
No known key found for this signature in database
GPG key ID: 4DD88C3F9F3B8333
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
envelope.go
View file

@ -3,7 +3,7 @@ package smtpd
import ( import (
"crypto/tls" "crypto/tls"
"fmt" "fmt"
"strings" "net"
"time" "time"
) )
@ -34,10 +34,15 @@ func (env *Envelope) AddReceivedLine(peer Peer) {
) )
} }
peerIP := ""
if addr, ok := peer.Addr.(*net.TCPAddr); ok {
peerIP = addr.IP.String()
}
line := wrap([]byte(fmt.Sprintf( line := wrap([]byte(fmt.Sprintf(
"Received: from %s [%s] by %s with %s;%s\r\n\t%s\r\n", "Received: from %s [%s] by %s with %s;%s\r\n\t%s\r\n",
peer.HeloName, peer.HeloName,
strings.Split(peer.Addr.String(), ":")[0], peerIP,
peer.ServerName, peer.ServerName,
peer.Protocol, peer.Protocol,
tlsDetails, tlsDetails,