Move saving of connections to those that work.

Also amends the idle timeout test to run faster.

Author: martinthomson

Diff for: packet.go

@@ -80,7 +80,7 @@ func (pt packetType) isProtected() bool {
 
 // kCidDefaultLength is the length of connection ID we generate.
 // TODO: make this configurable.
-const kCidDefaultLength = 8
+const kCidDefaultLength = 5
 
 // ConnectionId identifies the connection that a packet belongs to.
 type ConnectionId []byte

Diff for: server.go

@@ -67,20 +67,24 @@ func (s *Server) Input(addr *net.UDPAddr, data []byte) (*Connection, error) {
 		}
 		conn = NewConnection(trans, RoleServer, s.tls, nil)
 		newConn = true
-		s.idTable[conn.serverConnectionId.String()] = conn
-		s.addrTable[addr.String()] = conn
 	}
 
 	err = conn.Input(data)
 	if isFatalError(err) {
 		logf(logTypeServer, "Fatal Error %v killing connection %v", err, conn)
-		delete(s.idTable, conn.serverConnectionId.String())
-		delete(s.addrTable, addr.String())
 		return nil, nil
 	}
 
-	if newConn && s.handler != nil {
-		s.handler.NewConnection(conn)
+	if newConn {
+		// Wait until handling the first packet before the connection is added
+		// to the table.  Firstly, to avoid having to remove it if there is an
+		// error, but also because the server-chosen connection ID isn't set
+		// until after the Initial is handled.
+		s.idTable[conn.serverConnectionId.String()] = conn
+		s.addrTable[addr.String()] = conn
+		if s.handler != nil {
+			s.handler.NewConnection(conn)
+		}
 	}
 
 	return conn, nil

Diff for: server_test.go

@@ -110,18 +110,19 @@ func TestServerIdleTimeout(t *testing.T) {
 	assertEquals(t, 1, n)
 	assertNotError(t, err, "Couldn't send client initial")
 
-	_, err = serverInputAll(t, sTrans, server, *u)
+	sconn, err := serverInputAll(t, sTrans, server, *u)
 	assertNotError(t, err, "Couldn't consume client initial")
+	assertNotNil(t, sconn, "no server connection")
 
 	assertEquals(t, 1, server.ConnectionCount())
 
-	// Now wait 6 seconds to make sure that the connection
-	// gets garbage collected.
-
-	time.Sleep(time.Second * 6)
+	// This pokes into internal state of the server to avoid having to include
+	// sleep calls in tests.  Don't do this at home kids.
+	// Wind the timer on the connection back to short-circuit the idle timeout.
+	sconn.lastInput = sconn.lastInput.Add(-1 - sconn.idleTimeout)
 	server.CheckTimer()
 	// A second nap to allow for draining period.
-	time.Sleep(time.Second)
+	sconn.closingEnd = sconn.closingEnd.Add(-1 - time.Second)
 	server.CheckTimer()
 
 	assertEquals(t, 0, server.ConnectionCount())