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

grumble: add Debugf print method to Client and Server.

Browse source
This commit is contained in:
Mikkel Krautz 2013-05-25 13:14:53 +02:00
parent e6d4e0c453
commit c4e05027f8
2 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client.go
View file

@ -91,6 +91,11 @@ type Client struct {
PluginIdentity string PluginIdentity string
} }
// Debugf implements debug-level printing for Clients.
func (client *Client) Debugf(format string, v ...interface{}) {
client.Printf(format, v...)
}
// Is the client a registered user? // Is the client a registered user?
func (client *Client) IsRegistered() bool { func (client *Client) IsRegistered() bool {
return client.user != nil return client.user != nil
@ -627,6 +632,7 @@ func (client *Client) sendChannelTree(channel *Channel) {
// Try to do a crypto resync // Try to do a crypto resync
func (client *Client) cryptResync() { func (client *Client) cryptResync() {
client.Debugf("requesting crypt resync")
goodElapsed := time.Now().Unix() - client.crypt.LastGoodTime goodElapsed := time.Now().Unix() - client.crypt.LastGoodTime
if goodElapsed > 5 { if goodElapsed > 5 {
requestElapsed := time.Now().Unix() - client.lastResync requestElapsed := time.Now().Unix() - client.lastResync

7
server.go
View file

@ -153,6 +153,11 @@ func NewServer(id int64) (s *Server, err error) {
return return
} }
// Debugf implements debug-level printing for Servers.
func (server *Server) Debugf(format string, v ...interface{}) {
server.Printf(format, v...)
}
// Get a pointer to the root channel // Get a pointer to the root channel
func (server *Server) RootChannel() *Channel { func (server *Server) RootChannel() *Channel {
root, exists := server.Channels[0] root, exists := server.Channels[0]
@ -996,6 +1001,7 @@ func (server *Server) handleUdpPacket(udpaddr *net.UDPAddr, buf []byte) {
if ok { if ok {
err := client.crypt.Decrypt(plain, buf) err := client.crypt.Decrypt(plain, buf)
if err != nil { if err != nil {
client.Debugf("unable to decrypt incoming packet, requesting resync: %v", err)
client.cryptResync() client.cryptResync()
return return
} }
@ -1006,6 +1012,7 @@ func (server *Server) handleUdpPacket(udpaddr *net.UDPAddr, buf []byte) {
for _, client := range hostclients { for _, client := range hostclients {
err := client.crypt.Decrypt(plain[0:], buf) err := client.crypt.Decrypt(plain[0:], buf)
if err != nil { if err != nil {
client.Debugf("unable to decrypt incoming packet, requesting resync: %v", err)
client.cryptResync() client.cryptResync()
return return
} else { } else {