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: go vet run.

Browse source
This commit is contained in:
Mikkel Krautz 2012-12-08 21:50:50 +01:00
parent 06bfb5949a
commit 12381e89c4
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
grumble.go
View file

@ -55,11 +55,11 @@ func main() {
blobDir := filepath.Join(Args.DataDir, "blob") blobDir := filepath.Join(Args.DataDir, "blob")
err = os.Mkdir(blobDir, 0700) err = os.Mkdir(blobDir, 0700)
if err != nil && !os.IsExist(err) { if err != nil && !os.IsExist(err) {
log.Fatal("Unable to create blob directory: %v", err.Error()) log.Fatalf("Unable to create blob directory: %v", err)
} }
err = blobstore.Open(blobDir) err = blobstore.Open(blobDir)
if err != nil { if err != nil {
log.Fatalf("Unable to initialize blobstore: %v", err.Error()) log.Fatalf("Unable to initialize blobstore: %v", err)
} }
// Check whether we should regenerate the default global keypair // Check whether we should regenerate the default global keypair
@ -152,7 +152,7 @@ func main() {
serversDirPath := filepath.Join(Args.DataDir, "servers") serversDirPath := filepath.Join(Args.DataDir, "servers")
err = os.Mkdir(serversDirPath, 0700) err = os.Mkdir(serversDirPath, 0700)
if err != nil && !os.IsExist(err) { if err != nil && !os.IsExist(err) {
log.Fatal("Unable to create servers directory: %v", err.Error()) log.Fatalf("Unable to create servers directory: %v", err)
} }
// Read all entries of the servers directory. // Read all entries of the servers directory.
@ -163,7 +163,7 @@ func main() {
} }
names, err := serversDir.Readdirnames(-1) names, err := serversDir.Readdirnames(-1)
if err != nil { if err != nil {
log.Fatal("Unable to read file from data directory: %v", err.Error()) log.Fatalf("Unable to read file from data directory: %v", err.Error())
} }
// The data dir file descriptor. // The data dir file descriptor.
err = serversDir.Close() err = serversDir.Close()

8
server.go
View file

@ -378,7 +378,7 @@ func (server *Server) handlerLoop() {
if client != vb.client { if client != vb.client {
err := client.SendUDP(vb.buf) err := client.SendUDP(vb.buf)
if err != nil { if err != nil {
client.Panic("Unable to send UDP: %v", err.Error()) client.Panicf("Unable to send UDP: %v", err)
} }
} }
} }
@ -563,7 +563,7 @@ func (server *Server) finishAuthenticate(client *Client) {
// Warn clients without CELT support that they might not be able to talk to everyone else. // Warn clients without CELT support that they might not be able to talk to everyone else.
if len(client.codecs) == 0 { if len(client.codecs) == 0 {
client.codecs = []int32{CeltCompatBitstream} client.codecs = []int32{CeltCompatBitstream}
server.Printf("Client %i connected without CELT codecs. Faking compat bitstream.", client.Session) server.Printf("Client %v connected without CELT codecs. Faking compat bitstream.", client.Session)
if server.Opus && !client.opus { if server.Opus && !client.opus {
client.sendMessage(&mumbleproto.TextMessage{ client.sendMessage(&mumbleproto.TextMessage{
Session: []uint32{client.Session}, Session: []uint32{client.Session},
@ -1373,7 +1373,7 @@ func (server *Server) Start() (err error) {
port := server.Port() port := server.Port()
// Setup our UDP listener // Setup our UDP listener
server.udpconn, err = net.ListenUDP("udp", &net.UDPAddr{net.ParseIP(host), port}) server.udpconn, err = net.ListenUDP("udp", &net.UDPAddr{IP: net.ParseIP(host), Port: port})
if err != nil { if err != nil {
return err return err
} }
@ -1385,7 +1385,7 @@ func (server *Server) Start() (err error) {
*/ */
// Set up our TCP connection // Set up our TCP connection
server.tcpl, err = net.ListenTCP("tcp", &net.TCPAddr{net.ParseIP(host), port}) server.tcpl, err = net.ListenTCP("tcp", &net.TCPAddr{IP: net.ParseIP(host), Port: port})
if err != nil { if err != nil {
return err return err
} }