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

Send correct channel tree. Update mumbleproto. Add comments regarding UserState permission handling.

Browse source
This commit is contained in:
Mikkel Krautz 2010-11-20 23:05:44 +01:00
parent 8a836ac3af
commit 1e67afca46
5 changed files with 141 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

29
client.go
View file

@ -285,20 +285,29 @@ func (client *Client) receiver() {
}
}
// Send the channel list to a client.
func (client *Client) sendChannelList() {
server := client.server
root := server.root
client.sendChannelTree(client.server.root)
}
func (client *Client) sendChannelTree(channel *Channel) {
// Start at the root channel.
err := client.sendProtoMessage(MessageChannelState, &mumbleproto.ChannelState{
ChannelId: proto.Uint32(uint32(root.Id)),
Name: proto.String(root.Name),
Description: proto.String(root.Description),
})
log.Printf("sending channel ID=%i, NAME=%s", channel.Id, channel.Name)
chanstate := &mumbleproto.ChannelState{
ChannelId: proto.Uint32(uint32(channel.Id)),
Name: proto.String(channel.Name),
Description: proto.String(channel.Description),
}
if channel.parent != nil {
chanstate.Parent = proto.Uint32(uint32(channel.parent.Id))
}
err := client.sendProtoMessage(MessageChannelState, chanstate)
if err != nil {
// panic!
log.Printf("poanic!")
client.Panic(err.String())
}
for _, subchannel := range channel.children {
client.sendChannelTree(subchannel)
}
}