Skip to content

Fixed MISS/CS2 address resolving #2222

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

Open
egormanga wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −4
Open

Fixed MISS/CS2 address resolving #2222

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
8 changes: 4 additions & 4 deletions pkg/xiaomi/miss/cs2/conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,9 +304,9 @@ func newUDPConn(host string, port int) (net.Conn, error) {
return nil, err
}

addr, err := net.ResolveUDPAddr("udp", host)
addr, err := net.ResolveUDPAddr("udp", fmt.Sprintf("%s:%d", host, port))
if err != nil {
addr = &net.UDPAddr{IP: net.ParseIP(host), Port: port}
return nil, err
}

return &udpConn{UDPConn: conn, addr: addr}, nil
Expand All @@ -325,7 +325,7 @@ func (c *udpConn) Read(b []byte) (n int, err error) {
return 0, err
}

if string(addr.IP) == string(c.addr.IP) || n >= 8 {
if n >= 8 || addr.IP.Equal(c.addr.IP) {
//log.Printf("<- %x", b[:n])
return
}
Expand Down Expand Up @@ -358,7 +358,7 @@ func (c *udpConn) WriteUntil(req []byte, ok func(res []byte) bool) ([]byte, erro
return nil, err
}

if string(addr.IP) != string(c.addr.IP) || n < 16 {
if n < 16 || !addr.IP.Equal(c.addr.IP) {
continue // skip messages from another IP
}

Expand Down