Synchronize voice broadcast.

client.go

@@ -140,15 +140,23 @@ func (client *Client) udpreceiver() {
 
 			outgoing.PutUint32(client.Session)
 			outgoing.PutBytes(buf[1 : 1+(len(buf)-1)])
+			outbuf[0] = kind
 
-			// Sever loopback
+			// VoiceTarget
-			if target == 0x1f {
+			if target != 0x1f {
-				outbuf[0] = kind
+				client.server.voicebroadcast <- &VoiceBroadcast{
+					client: client,
+					buf:    outbuf[0 : 1+outgoing.Size()],
+					target: target,
+				}
+			// Server loopback
+			} else {
 				client.sendUdp(&Message{
 					buf:    outbuf[0 : 1+outgoing.Size()],
 					client: client,
 				})
 			}
+
 		case UDPMessagePing:
 			client.server.udpsend <- &Message{
 				buf:    buf,

message.go

@@ -65,6 +65,15 @@ type Message struct {
 	address net.Addr
 }
 
+type VoiceBroadcast struct {
+	// The client who is performing the broadcast
+	client *Client
+	// The VoiceTarget identifier.
+	target byte
+	// The voice packet itself.
+	buf []byte
+}
+
 func (server *Server) handleCryptSetup(client *Client, msg *Message) {
 	cs := &mumbleproto.CryptSetup{}
 	err := proto.Unmarshal(msg.buf, cs)

server.go

@@ -41,9 +41,10 @@ type Server struct {
 	port     int
 	udpconn  *net.UDPConn
 
-	incoming chan *Message
+	incoming       chan *Message
-	outgoing chan *Message
+	outgoing       chan *Message
-	udpsend  chan *Message
+	udpsend        chan *Message
+	voicebroadcast chan *VoiceBroadcast
 
 	// Config-related
 	MaxUsers     int
@@ -90,6 +91,7 @@ func NewServer(addr string, port int) (s *Server, err os.Error) {
 	s.outgoing = make(chan *Message)
 	s.incoming = make(chan *Message)
 	s.udpsend = make(chan *Message)
+	s.voicebroadcast = make(chan *VoiceBroadcast)
 
 	s.MaxBandwidth = 300000
 	s.MaxUsers = 10
@@ -157,13 +159,20 @@ func (server *Server) RemoveClient(client *Client) {
 // to keep server state synchronized.
 func (server *Server) handler() {
 	for {
-		msg := <-server.incoming
+		select {
-		client := msg.client
+		// Control channel messages
-
+		case msg := <-server.incoming:
-		if client.state == StateClientAuthenticated {
+			client := msg.client
-			server.handleIncomingMessage(client, msg)
+			if client.state == StateClientAuthenticated {
-		} else if client.state == StateClientSentVersion {
+				server.handleIncomingMessage(client, msg)
-			server.handleAuthenticate(client, msg)
+			} else if client.state == StateClientSentVersion {
+				server.handleAuthenticate(client, msg)
+			}
+		// Voice broadcast
+		case vb := <-server.voicebroadcast:
+			log.Printf("VoiceBroadcast!")
+			if vb.target == 0 {
+			}
 		}
 	}
 }
@@ -445,7 +454,7 @@ func (s *Server) SendUDP() {
 		} else if msg.address != nil {
 			s.udpconn.WriteTo(msg.buf, msg.address)
 		} else {
-			// Skipping
+		// Skipping
 		}
 	}
 }