Merge branch 'switch_livetv'

Conflicts:
	HISTORY
	server/connection.c

1 files changed, 13 insertions, 0 deletions

diff --git a/server/server.c b/server/server.c
index 1bdb20a..c7fa96f 100644
--- a/server/server.c
+++ b/server/server.c
@@ -121,7 +121,9 @@ void cStreamdevServer::Action(void)
 				cServerConnection *client = c->Accept();
 				if (!client)
 					continue;
+				Lock();
 				m_Clients.Add(client);
+				Unlock();
 
 				if (m_Clients.Count() > StreamdevServerSetup.MaxClients) {
 					esyslog("streamdev: too many clients, rejecting %s:%d",
@@ -153,17 +155,21 @@ void cStreamdevServer::Action(void)
 				isyslog("streamdev: closing streamdev connection to %s:%d", 
 				        s->RemoteIp().c_str(), s->RemotePort());
 				s->Close();
+				Lock();
 				m_Clients.Del(s);
+				Unlock();
 			}
 			s = next;
 		}
 	}
 	
+	Lock();
 	while (m_Clients.Count() > 0) {
 		cServerConnection *s = m_Clients.First();
 		s->Close();
 		m_Clients.Del(s);
 	}
+	Unlock();
 
 	while (m_Servers.Count() > 0) {
 		cServerComponent *c = m_Servers.First();
@@ -171,3 +177,10 @@ void cStreamdevServer::Action(void)
 		m_Servers.Del(c);
 	}
 }
+
+void cStreamdevServer::MainThreadHook(void) 
+{
+	cThreadLock lock(m_Instance);
+	for (cServerConnection *s = m_Clients.First(); s; s = m_Clients.Next(s))
+		s->MainThreadHook();
+}