From 91c95a5a8c0fa154726dd3a2431097471aa8f8e2 Mon Sep 17 00:00:00 2001 From: Zack Scholl Date: Sun, 1 Jul 2018 18:52:56 -0700 Subject: [PATCH] fix address bug --- src/client.go | 3 ++- src/server.go | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/client.go b/src/client.go index bdd6a0c7..c2efd797 100644 --- a/src/client.go +++ b/src/client.go @@ -63,7 +63,7 @@ func (c *Croc) client(role int, channel string) (err error) { log.Debugf("sender read error:", err) return } - // log.Debugf("recv: %s", cd.String2()) + log.Debugf("recv: %s", cd.String2()) err = c.processState(cd) if err != nil { log.Warn(err) @@ -225,6 +225,7 @@ func (c *Croc) processState(cd channelData) (err error) { c.cs.channel.Addresses = cd.Addresses if c.cs.channel.Role == 0 && c.isLocal { c.cs.channel.Addresses[0] = getLocalIP() + log.Debugf("local IP: %s", c.cs.channel.Addresses[0]) } c.bothConnected = cd.Addresses[0] != "" && cd.Addresses[1] != "" diff --git a/src/server.go b/src/server.go index 8952b4a1..2204cb61 100644 --- a/src/server.go +++ b/src/server.go @@ -105,6 +105,7 @@ func (c *Croc) updateChannel(cd channelData) (err error) { c.rs.channel[cd.Channel].Pake.Xᵥ = cd.Pake.Xᵥ c.rs.channel[cd.Channel].Pake.Yᵤ = cd.Pake.Yᵤ c.rs.channel[cd.Channel].Pake.Yᵥ = cd.Pake.Yᵥ + c.rs.channel[cd.Channel].Addresses = cd.Addresses return }