Avoid the need for another mutex in Client by moving cleanup client checks to Hub.

src/app/spreed-webrtc-server/channelling_api.go

@@ -32,7 +32,7 @@ const (
 
 type ChannellingAPI interface {
 	OnConnect(Client, *Session)
-	OnDisconnect(string)
+	OnDisconnect(Client, *Session)
 	OnIncoming(ResponseSender, *Session, *DataIncoming)
 }
 
@@ -65,8 +65,8 @@ func (api *channellingAPI) OnConnect(client Client, session *Session) {
 	api.SendSelf(client, session)
 }
 
-func (api *channellingAPI) OnDisconnect(sessionID string) {
+func (api *channellingAPI) OnDisconnect(client Client, session *Session) {
-	api.Unicaster.OnDisconnect(sessionID)
+	api.Unicaster.OnDisconnect(client, session)
 }
 
 func (api *channellingAPI) OnIncoming(c ResponseSender, session *Session, msg *DataIncoming) {

src/app/spreed-webrtc-server/client.go

@@ -50,12 +50,11 @@ type client struct {
 	Codec
 	ChannellingAPI
 	Connection
-	session  *Session
+	session *Session
-	replaced bool
 }
 
 func NewClient(codec Codec, api ChannellingAPI, session *Session) *client {
-	return &client{codec, api, nil, session, false}
+	return &client{codec, api, nil, session}
 }
 
 func (client *client) OnConnect(conn Connection) {
@@ -65,11 +64,7 @@ func (client *client) OnConnect(conn Connection) {
 
 func (client *client) OnDisconnect() {
 	client.session.Close()
-	if client.replaced {
+	client.ChannellingAPI.OnDisconnect(client, client.session)
-		log.Printf("Not cleaning up session %s as client %d was replaced\n", client.session.Id, client.Index())
-		return
-	}
-	client.ChannellingAPI.OnDisconnect(client.session.Id)
 }
 
 func (client *client) OnText(b Buffer) {
@@ -94,7 +89,6 @@ func (client *client) Session() *Session {
 }
 
 func (client *client) ReplaceAndClose() {
-	client.replaced = true
 	client.session.Close()
 	if client.Connection != nil {
 		client.Connection.Close()

src/app/spreed-webrtc-server/hub.go

@@ -48,8 +48,8 @@ type SessionStore interface {
 type Unicaster interface {
 	SessionStore
 	OnConnect(Client, *Session)
+	OnDisconnect(Client, *Session)
 	Unicast(to string, outgoing *DataOutgoing)
-	OnDisconnect(sessionID string)
 }
 
 type ContactManager interface {
@@ -161,10 +161,16 @@ func (h *hub) OnConnect(client Client, session *Session) {
 	h.mutex.Unlock()
 }
 
-func (h *hub) OnDisconnect(sessionID string) {
+func (h *hub) OnDisconnect(client Client, session *Session) {
-	log.Printf("Cleaning up session id %s\n", sessionID)
 	h.mutex.Lock()
-	delete(h.clients, sessionID)
+	if ec, ok := h.clients[session.Id]; ok {
+		if ec == client {
+			log.Printf("Cleaning up client %d for session id %s\n", ec.Index(), session.Id)
+			delete(h.clients, session.Id)
+		} else {
+			log.Printf("Not cleaning up session %s as client %d was replaced with %d\n", session.Id, client.Index(), ec.Index())
+		}
+	}
 	h.mutex.Unlock()
 }