Validate audio configuration values

This commit is contained in:
Brandon McGinty (chatgpt)
2026-08-09 14:22:46 -04:00
committed by Brandon McGinty
parent 82440b7670
commit 626608c997
4 changed files with 43 additions and 3 deletions
+3
View File
@@ -110,6 +110,9 @@ func Dial(config *Config) (*Client, error) {
// min(time.Now() + dialer.Timeout, dialer.Deadline), or if the server rejects
// the client.
func DialWithDialer(dialer *net.Dialer, config *Config, tlsConfig *tls.Config) (*Client, error) {
if err := config.Validate(); err != nil {
return nil, err
}
start := time.Now()
conn, err := tls.DialWithDialer(dialer, "tcp", config.Address, tlsConfig)
+17
View File
@@ -1,6 +1,7 @@
package gumble
import (
"fmt"
"time"
)
@@ -43,6 +44,22 @@ func NewConfig() *Config {
}
}
// Validate checks values that are used by the audio ticker and encoder.
func (c *Config) Validate() error {
switch c.AudioInterval {
case 10 * time.Millisecond, 20 * time.Millisecond, 40 * time.Millisecond, 60 * time.Millisecond:
default:
return fmt.Errorf("gumble: AudioInterval must be 10ms, 20ms, 40ms, or 60ms")
}
if c.AudioDataBytes <= 0 {
return fmt.Errorf("gumble: AudioDataBytes must be positive")
}
if c.Buffers <= 0 {
return fmt.Errorf("gumble: Buffers must be positive")
}
return nil
}
// Attach is an alias of c.Listeners.Attach.
func (c *Config) Attach(l EventListener) Detacher {
return c.Listeners.Attach(l)
+20
View File
@@ -0,0 +1,20 @@
package gumble
import (
"testing"
"time"
)
// Regression: arbitrary intervals were truncated to 10 ms frames while the
// ticker kept the original duration, producing malformed audio timing.
func TestConfigValidateRejectsUnsupportedAudioInterval(t *testing.T) {
config := NewConfig()
config.AudioInterval = 15 * time.Millisecond
if err := config.Validate(); err == nil {
t.Fatal("invalid audio interval was accepted")
}
config.AudioInterval = 60 * time.Millisecond
if err := config.Validate(); err != nil {
t.Fatalf("valid audio interval rejected: %v", err)
}
}