External/grumble
1
0
Fork 1
mirror of https://github.com/mumble-voip/grumble.git synced 2025-12-26 20:51:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove temporary channels when the last client leaves.

Browse source
This commit is contained in:
Mikkel Krautz 2011-11-13 01:27:02 +01:00
parent f5008c12e5
commit 83fe0c737e
4 changed files with 31 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
message.go
View file

@ -136,7 +136,7 @@ func (server *Server) handleChannelRemoveMessage(client *Client, msg *Message) {
}
// Update datastore
if !channel.Temporary {
if !channel.IsTemporary() {
server.DeleteFrozenChannel(channel)
}
@ -244,7 +244,7 @@ func (server *Server) handleChannelStateMessage(client *Client, msg *Message) {
}
// We can't add channels to a temporary channel
if parent.Temporary {
if parent.IsTemporary() {
client.sendPermissionDeniedType(mumbleproto.PermissionDenied_TemporaryChannel)
return
}
@ -260,7 +260,7 @@ func (server *Server) handleChannelStateMessage(client *Client, msg *Message) {
// Add the new channel
channel = server.AddChannel(name)
channel.DescriptionBlob = key
channel.Temporary = *chanstate.Temporary
channel.temporary = *chanstate.Temporary
channel.Position = int(*chanstate.Position)
parent.AddChild(channel)
@ -307,7 +307,7 @@ func (server *Server) handleChannelStateMessage(client *Client, msg *Message) {
})
// If it's a temporary channel, move the creator in there.
if channel.Temporary {
if channel.IsTemporary() {
userstate := &mumbleproto.UserState{}
userstate.Session = proto.Uint32(client.Session)
userstate.ChannelId = proto.Uint32(uint32(channel.Id))
@ -362,7 +362,7 @@ func (server *Server) handleChannelStateMessage(client *Client, msg *Message) {
}
// A temporary channel must not have any subchannels, so deny it.
if parent.Temporary {
if parent.IsTemporary() {
client.sendPermissionDeniedType(mumbleproto.PermissionDenied_TemporaryChannel)
return
}
@ -473,7 +473,7 @@ func (server *Server) handleChannelStateMessage(client *Client, msg *Message) {
}
// Update channel in datastore
if !channel.Temporary {
if !channel.IsTemporary() {
server.UpdateFrozenChannel(channel, chanstate)
}
}
@ -592,7 +592,7 @@ func (server *Server) handleUserStateMessage(client *Client, msg *Message) {
}
maxChannelUsers := server.cfg.IntValue("MaxChannelUsers")
if len(dstChan.clients) >= maxChannelUsers {
if maxChannelUsers != 0 && len(dstChan.clients) >= maxChannelUsers {
client.sendPermissionDeniedFallback(mumbleproto.PermissionDenied_ChannelFull,
0x010201, "Channel is full")
return