make media and signaling possible use different ips (#323)

Author: zusrut

pkg/config/config.go

@@ -78,6 +78,10 @@ type Config struct {
 	NAT1To1IP     string `yaml:"nat_1_to_1_ip"`
 	ListenIP      string `yaml:"listen_ip"`
 
+	// if different from signaling IP
+	MediaUseExternalIP bool   `yaml:"media_use_external_ip"`
+	MediaNAT1To1IP     string `yaml:"media_nat_1_to_1_ip"`
+
 	MediaTimeout        time.Duration   `yaml:"media_timeout"`
 	MediaTimeoutInitial time.Duration   `yaml:"media_timeout_initial"`
 	Codecs              map[string]bool `yaml:"codecs"`
@@ -151,6 +155,10 @@ func (c *Config) Init() error {
 		return fmt.Errorf("use_external_ip and nat_1_to_1_ip can not both be set")
 	}
 
+	if c.MediaUseExternalIP && c.MediaNAT1To1IP != "" {
+		return fmt.Errorf("media_use_external_ip and media_nat_1_to_1_ip can not both be set")
+	}
+
 	return nil
 }
 

pkg/sip/config.go

@@ -48,6 +48,19 @@ func GetServiceConfig(conf *config.Config) (*ServiceConfig, error) {
 		}
 		s.SignalingIPLocal = s.SignalingIP
 	}
+	if conf.MediaUseExternalIP && !conf.UseExternalIP {
+		if s.MediaIP, err = getPublicIP(); err != nil {
+			return nil, err
+		}
+	} else if conf.MediaNAT1To1IP != "" && conf.MediaNAT1To1IP != conf.NAT1To1IP {
+		ip, err := netip.ParseAddr(conf.MediaNAT1To1IP)
+		if err != nil {
+			return nil, err
+		}
+		s.MediaIP = ip
+	} else {
+		s.MediaIP = s.SignalingIP
+	}
 	return s, nil
 }
 

pkg/sip/inbound.go

@@ -541,7 +541,7 @@ func (c *inboundCall) runMediaConn(offerData []byte, conf *config.Config, featur
 	c.log.Debugw("SDP offer", "sdp", string(offerData))
 
 	mp, err := NewMediaPort(c.log, c.mon, &MediaConfig{
-		IP:                  c.s.sconf.SignalingIP,
+		IP:                  c.s.sconf.MediaIP,
 		Ports:               conf.RTPPort,
 		MediaTimeoutInitial: c.s.conf.MediaTimeoutInitial,
 		MediaTimeout:        c.s.conf.MediaTimeout,

pkg/sip/outbound.go

@@ -118,7 +118,7 @@ func (c *Client) newCall(ctx context.Context, conf *config.Config, log logger.Lo
 	var err error
 
 	call.media, err = NewMediaPort(call.log, call.mon, &MediaConfig{
-		IP:                  c.sconf.SignalingIP,
+		IP:                  c.sconf.MediaIP,
 		Ports:               conf.RTPPort,
 		MediaTimeoutInitial: c.conf.MediaTimeoutInitial,
 		MediaTimeout:        c.conf.MediaTimeout,

pkg/sip/service.go

@@ -39,6 +39,7 @@ import (
 type ServiceConfig struct {
 	SignalingIP      netip.Addr
 	SignalingIPLocal netip.Addr
+	MediaIP          netip.Addr
 }
 
 type Service struct {