CEF/grumble
1
0
Fork 0
forked from External/grumble
Code Pull requests Activity

Get rid of Server's SendUDP goroutine.

Browse source
This commit is contained in:
Mikkel Krautz 2011-11-11 21:31:15 +01:00
parent 875cc89b9e
commit 03932c13cf
2 changed files with 31 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

34
client.go
View file

@ -298,37 +298,41 @@ func (client *Client) udpreceiver() {
outgoing.PutBytes(buf[1 : 1+(len(buf)-1)])
outbuf[0] = kind
// VoiceTarget
if target != 0x1f {
if target != 0x1f { // VoiceTarget
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,
})
} else { // Server loopback
buf := outbuf[0 : 1+outgoing.Size()]
err := client.SendUDP(buf)
if err != nil {
client.Panicf("Unable to send UDP message: %v", err.Error())
}
}
case mumbleproto.UDPMessagePing:
client.server.udpsend <- &Message{
buf: buf,
client: client,
err := client.SendUDP(buf)
if err != nil {
client.Panicf("Unable to send UDP message: %v", err.Error())
}
}
}
}
func (client *Client) sendUdp(msg *Message) {
// Send buf as a UDP message. If the client does not have
// an established UDP connection, the datagram will be tunelled
// through the client's control channel (TCP).
func (client *Client) SendUDP(buf []byte) error {
if client.udp {
client.Printf("Sent UDP!")
client.server.udpsend <- msg
crypted := make([]byte, len(buf)+4)
client.crypt.Encrypt(crypted, buf)
return client.server.SendUDP(crypted, client.udpaddr)
} else {
client.sendMessage(msg.buf)
return client.sendMessage(buf)
}
panic("unreachable")
}
// Send a Message to the client. The Message in msg to the client's

37
server.go
View file

@ -64,7 +64,6 @@ type Server struct {
running bool
incoming chan *Message
udpsend chan *Message
voicebroadcast chan *VoiceBroadcast
cfgUpdate chan *KeyValuePair
@ -150,7 +149,6 @@ func NewServer(id int64, addr string, port int) (s *Server, err error) {
s.hpclients = make(map[string]*Client)
s.incoming = make(chan *Message)
s.udpsend = make(chan *Message)
s.voicebroadcast = make(chan *VoiceBroadcast)
s.cfgUpdate = make(chan *KeyValuePair)
s.clientAuthenticated = make(chan *Client)
@ -362,10 +360,10 @@ func (server *Server) handler() {
channel := vb.client.Channel
for _, client := range channel.clients {
if client != vb.client {
client.sendUdp(&Message{
buf: vb.buf,
client: client,
})
err := client.SendUDP(vb.buf)
if err != nil {
client.Panic("Unable to send UDP: %v", err.Error())
}
}
}
}
@ -878,21 +876,10 @@ func (s *Server) SetupUDP() (err error) {
return
}
func (s *Server) SendUDP() {
for {
msg := <-s.udpsend
// Encrypted
if msg.client != nil {
crypted := make([]byte, len(msg.buf)+4)
msg.client.crypt.Encrypt(crypted, msg.buf)
s.udpconn.WriteTo(crypted, msg.client.udpaddr)
// Non-encrypted
} else if msg.address != nil {
s.udpconn.WriteTo(msg.buf, msg.address)
} else {
// Skipping
}
}
// Send the content of buf as a UDP packet to addr.
func (s *Server) SendUDP(buf []byte, addr *net.UDPAddr) (err error) {
_, err = s.udpconn.WriteTo(buf, addr)
return
}
// Listen for and handle UDP packets.
@ -928,10 +915,11 @@ func (server *Server) ListenUDP() {
_ = binary.Write(buffer, binary.BigEndian, server.cfg.Uint32Value("MaxUsers"))
_ = binary.Write(buffer, binary.BigEndian, server.cfg.Uint32Value("MaxBandwidth"))
server.udpsend <- &Message{
buf: buffer.Bytes(),
address: udpaddr,
err = server.SendUDP(buffer.Bytes(), udpaddr)
if err != nil {
server.Print("Unable to write UDP packet: %v", err.Error())
}
} else {
server.handleUdpPacket(udpaddr, buf, nread)
}
@ -1183,7 +1171,6 @@ func (s *Server) ListenAndMurmur() {
// Setup our UDP listener and spawn our reader and writer goroutines
s.SetupUDP()
go s.ListenUDP()
go s.SendUDP()
// Create a new listening TLS socket.
certFn := filepath.Join(Args.DataDir, "cert.pem")