Robot
/
croc
mirror of https://github.com/schollz/croc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compute addresses

This commit is contained in:
Zack Scholl 2018-07-01 11:31:26 -07:00
parent 816c25b05b
commit 3d24c0e258
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/server.go
View File

@ -20,6 +20,7 @@ func (c *Croc) startServer() (err error) {
var upgrader = websocket.Upgrader{} // use default options
http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
// incoming websocket request
log.Debugf("connecting remote addr: %+v", r)
ws, err := upgrader.Upgrade(w, r, nil)
log.Debugf("connecting remote addr: %s", ws.RemoteAddr().String())
if err != nil {
@ -150,7 +151,7 @@ func (c *Croc) joinChannel(ws *websocket.Conn, cd channelData) (channel string,
}
c.rs.channel[cd.Channel].websocketConn[cd.Role] = ws
// assign the name
c.rs.channel[cd.Channel].Addresses[cd.Role] = ws.RemoteAddr().Network()
c.rs.channel[cd.Channel].Addresses[cd.Role] = ws.RemoteAddr().String()
log.Debugf("assigned role %d in channel '%s'", cd.Role, cd.Channel)
return
}