diff --git a/hosts/yate-dialup/configuration.nix b/hosts/yate-dialup/configuration.nix index 9e34013..fd6b328 100644 --- a/hosts/yate-dialup/configuration.nix +++ b/hosts/yate-dialup/configuration.nix @@ -56,8 +56,8 @@ tcp dport 22 accept tcp dport { ${tcpPorts} } accept - udp dport 5060 ip saddr { 10.42.10.6, 217.10.68.150 } accept - udp dport 5060 ip6 saddr { 2a01:4f8:1c0c:8221::6, 2001:ab7::0/64 } accept + ip saddr { 10.42.10.6, 217.10.68.150 } accept + ip6 saddr { 2a01:4f8:1c0c:8221::6, 2001:ab7::0/64 } accept } } ''; diff --git a/hosts/yate-dialup/voip.nix b/hosts/yate-dialup/voip.nix index 427e3d5..1d6a7e4 100644 --- a/hosts/yate-dialup/voip.nix +++ b/hosts/yate-dialup/voip.nix @@ -12,6 +12,9 @@ [dialout] \${username}^$=-;error=noauth ^.*$=sip/sip:\\0;line=sipgate;osip_P-Preferred-Identity=;caller=3400888t0;domain=sipconnect.sipgate.de;"; + ysipchan.general = { + ignorevia = "yes"; + }; }; }; @@ -20,6 +23,8 @@ restartUnits = [ "yate.service" ]; }; + #networking.hosts."2001:ab7::9" = [ "sipconnect.sipgate.de" ]; + systemd.services.yate = { preStart = let accfile = pkgs.writeText "accfile.conf" (lib.generators.toINI { } { diff --git a/hosts/yate/voip.nix b/hosts/yate/voip.nix index 820a60b..bce76a8 100644 --- a/hosts/yate/voip.nix +++ b/hosts/yate/voip.nix @@ -48,6 +48,28 @@ [dialin] \${sip_x-called}^.*$=lateroute/\\1"; + ysipchan = { + general = { + ignorevia = "yes"; + }; + #"listener general".enable = "no"; + #"listener dect" = { + # type = "udp"; + # addr = "10.42.132.1"; + # port = "5060"; + #}; + #"listener sip" = { + # type = "udp"; + # addr = "10.42.133.1"; + # port = "5060"; + #}; + #"listener voip" = { + # type = "udp"; + # addr = "10.42.10.6"; + # port = "5060"; + # default = "yes"; + #}; + }; }; environment.systemPackages = with pkgs; [ diff --git a/modules/yate/default.nix b/modules/yate/default.nix index 40edbd6..f58df5f 100644 --- a/modules/yate/default.nix +++ b/modules/yate/default.nix @@ -34,7 +34,7 @@ in { serviceConfig = { Type = "forking"; ExecStart = - "${pkgs.yate}/bin/yate -d -p /run/yate/yate.pid -c /etc/yate -F -s -q -DF -r -l /var/lib/yate/yate.log"; + "${pkgs.yate}/bin/yate -d -p /run/yate/yate.pid -c /etc/yate -F -s -vvv -DF -r -l /var/lib/yate/yate.log"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; User = "yate"; Group = "yate";