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

Allow serverconfs Address and Port to override the server defaults.

Browse source
This commit is contained in:
Mikkel Krautz 2011-05-19 22:44:44 +02:00
parent d9ab7d2754
commit b4a9f706ec
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
server.go
View file

@ -864,7 +864,8 @@ func (server *Server) handleIncomingMessage(client *Client, msg *Message) {
func (s *Server) SetupUDP() (err os.Error) {
addr := &net.UDPAddr{
Port: s.port,
net.ParseIP(s.address),
s.port,
}
s.udpconn, err = net.ListenUDP("udp", addr)
if err != nil {
@ -1174,6 +1175,15 @@ func (s *Server) ListenAndMurmur() {
// Launch the event handler goroutine
go s.handler()
host := s.cfg.StringValue("Address")
if host != "" {
s.address = host
}
port := s.cfg.IntValue("Port")
if port != 0 {
s.port = port
}
s.running = true
// Setup our UDP listener and spawn our reader and writer goroutines
@ -1194,7 +1204,7 @@ func (s *Server) ListenAndMurmur() {
s.tlscfg = cfg
tl, err := net.ListenTCP("tcp", &net.TCPAddr{
net.ParseIP("0.0.0.0"),
net.ParseIP(s.address),
s.port,
})
if err != nil {