README.md

@@ -38,28 +38,6 @@ You can also use HTTP.
 curl http://localhost:4080
 ```
 
-## Testing Beyond Localhost
-
-You can use [Telebit](https://telebit.cloud) to share the experience with friends and loved ones:
-
-Completely userspace installation:
-
-```
-curl -fsSL https://get.telebit.cloud | bash
-```
-
-Easy configuration:
-
-```
-~/telebit http 4080
-> Forwarding https://lucky-duck-42.telebit.fun => localhost:4080
-
-~/telebit tcp 4080
-> Forwarding telebit.cloud:1234 => localhost:4080
-```
-
-Caveat: Due to a bug in telebit you must send 'hello' in telnet to establish a connection.
-
 # API Docs
 
 The API docs and examples can be seen at <http://localhost:4080>
@@ -115,7 +93,7 @@ Not Implemented
 
 I don't think these things would be difficult to add,
 but I was having fun learning lots of other things
-and I figured they're not that important.
+and I figured Some of these things I didn't implement
 
 * [ ] local log file
 * [ ] Rooms

chatserver.go

@@ -92,7 +92,7 @@ var broadcastMsg chan chatMsg
 // Telnet
 var wantsServerHello chan bufferedConn
 var authTelnet chan telnetUser
-var cleanTelnet chan telnetUser // intentionally blocking
+var cleanTelnet chan telnetUser
 
 // HTTP
 var demuxHttpClient chan bufferedConn
@@ -101,7 +101,7 @@ var valAuthReqs chan authReq
 var delAuthReqs chan authReq
 
 func usage() {
-	fmt.Fprintf(os.Stderr, "\nusage: go run chatserver*.go\n")
+	fmt.Fprintf(os.Stderr, "\nusage: go run chatserver.go\n")
 	flag.PrintDefaults()
 	fmt.Println()
 
@@ -301,7 +301,7 @@ func main() {
 	virginConns = make(chan net.Conn, 128)
 
 	// TCP & Authentication
-	telnetConns := make(map[string]telnetUser)
+	telnetConns := make(map[bufferedConn]telnetUser)
 	wantsServerHello = make(chan bufferedConn, 128)
 	authTelnet = make(chan telnetUser, 128)
 
@@ -389,12 +389,7 @@ func main() {
 		case u := <-authTelnet:
 			// allow to receive messages
 			// (and be counted among the users)
-			_, ok := telnetConns[u.email]
+			telnetConns[u.bufConn] = u
-			if ok {
-				// this is a blocking channel, and that's important
-				cleanTelnet <- telnetConns[u.email]
-			}
-			telnetConns[u.email] = u
 			// is chan chan the right way to handle this?
 			u.userCount <- len(telnetConns)
 			broadcastMsg <- chatMsg{
@@ -427,7 +422,7 @@ func main() {
 			close(u.newMsg)
 			// we can safely ignore this error, if any
 			u.bufConn.Close()
-			delete(telnetConns, u.email)
+			delete(telnetConns, u.bufConn)
 		case bufConn := <-gotClientHello:
 			go muxTcp(bufConn)
 		case bufConn := <-demuxHttpClient: