9 files changed, 6 insertions, 122 deletions
diff --git a/data/configd-include.json b/data/configd-include.json
index dc82b3dd7..ee939decd 100644
--- a/data/configd-include.json
+++ b/data/configd-include.json
@@ -26,7 +26,7 @@
 "interfaces-vxlan.py",
 "interfaces-wireguard.py",
 "interfaces-wireless.py",
-"interfaces-wirelessmodem.py",
+"interfaces-wwan.py",
 "ipsec-settings.py",
 "lldp.py",
 "nat.py",
diff --git a/data/templates/ipsec/ipsec.conf.tmpl b/data/templates/ipsec/ipsec.conf.tmpl
index 53cba44b9..18f6c0988 100644
--- a/data/templates/ipsec/ipsec.conf.tmpl
+++ b/data/templates/ipsec/ipsec.conf.tmpl
@@ -7,7 +7,7 @@ config setup
     uniqueids = {{ "no" if disable_uniqreqids is defined else "yes" }}
 
 {% if site_to_site is defined and site_to_site.peer is defined %}
-{%   for peer, peer_conf in site_to_site.peer.items() if peer not in dhcp_no_address %}
+{%   for peer, peer_conf in site_to_site.peer.items() if peer not in dhcp_no_address and peer_conf.disable is not defined %}
 {%     set peer_index = loop.index %}
 {%     set peer_ike = ike_group[peer_conf.ike_group] %}
 {%     set peer_esp = esp_group[peer_conf.default_esp_group] if peer_conf.default_esp_group is defined else None %}
@@ -60,7 +60,7 @@ conn peer-{{ peer }}-vti
 {%         endif %}
 {%       endif %}
 {%     elif peer_conf.tunnel is defined %}
-{%       for tunnel_id, tunnel_conf in peer_conf.tunnel.items() %}
+{%       for tunnel_id, tunnel_conf in peer_conf.tunnel.items() if tunnel_conf.disable is not defined %}
 {%         set tunnel_esp_name = tunnel_conf.esp_group if "esp_group" in tunnel_conf else peer_conf.default_esp_group %}
 {%         set tunnel_esp = esp_group[tunnel_esp_name] %}
 {%         set proto = tunnel_conf.protocol if "protocol" in tunnel_conf else '%any' %}
diff --git a/data/templates/ipsec/ipsec.secrets.tmpl b/data/templates/ipsec/ipsec.secrets.tmpl
index a1432de57..0d2654abc 100644
--- a/data/templates/ipsec/ipsec.secrets.tmpl
+++ b/data/templates/ipsec/ipsec.secrets.tmpl
@@ -2,7 +2,7 @@
 
 {%  if site_to_site is defined and "peer" in site_to_site %}
 {%      set ns = namespace(local_key_set=False) %}
-{%      for peer, peer_conf in site_to_site.peer.items() %}
+{%      for peer, peer_conf in site_to_site.peer.items() if peer not in dhcp_no_address and peer_conf.disable is not defined %}
 {%          if peer_conf.authentication.mode == 'pre-shared-secret' %}
 {{ (peer_conf.local_address if "local_address" in peer_conf else "%any") ~
     (" " ~ peer) ~
diff --git a/data/templates/ipsec/swanctl.conf.tmpl b/data/templates/ipsec/swanctl.conf.tmpl
index 0ce703f20..ce007c1fd 100644
--- a/data/templates/ipsec/swanctl.conf.tmpl
+++ b/data/templates/ipsec/swanctl.conf.tmpl
@@ -2,7 +2,7 @@
 
 {%  if profile is defined %}
 connections {
-{%      for name, profile_conf in profile.items() if "bind" in profile_conf and "tunnel" in profile_conf.bind %}
+{%      for name, profile_conf in profile.items() if profile_conf.disable is not defined and profile_conf.bind is defined and profile_conf.bind.tunnel is defined %}
 {%          set dmvpn_ike = ike_group[profile_conf.ike_group] %}
 {%          set dmvpn_esp = esp_group[profile_conf.esp_group] %}
 {%          for interface in profile_conf.bind.tunnel %}
@@ -41,7 +41,7 @@ connections {
 }
 
 secrets {
-{%      for name, profile_conf in profile.items() if "bind" in profile_conf and "tunnel" in profile_conf.bind %}
+{%      for name, profile_conf in profile.items() if profile_conf.disable is not defined and profile_conf.bind is defined and profile_conf.bind.tunnel is defined %}
 {%          if profile_conf.authentication.mode == 'pre-shared-secret' %}
 {%              for interface in profile_conf.bind.tunnel %}
     ike-dmvpn-{{ interface }} {
diff --git a/data/templates/wwan/chat.tmpl b/data/templates/wwan/chat.tmpl
deleted file mode 100644
index 386af37e6..000000000
--- a/data/templates/wwan/chat.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
-ABORT 'NO DIAL TONE' ABORT 'NO ANSWER' ABORT 'NO CARRIER' ABORT DELAYED
-'' AT
-OK ATZ
-{% if ipv6 is defined and ipv6.address is defined and ipv6.address.autoconf is defined %}
-OK 'AT+CGDCONT=1,"IPV4V6","{{ apn }}"'
-{% else %}
-OK 'AT+CGDCONT=1,"IP","{{ apn }}"'
-{% endif %}
-OK ATD*99#
-CONNECT ''
diff --git a/data/templates/wwan/ip-down.script.tmpl b/data/templates/wwan/ip-down.script.tmpl
deleted file mode 100644
index 9dc15ea99..000000000
--- a/data/templates/wwan/ip-down.script.tmpl
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# Script parameters will be like:
-# wlm0 /dev/serial/by-bus/usb0b1.3p1.3 115200 10.100.118.91 10.64.64.64 wlm0
-
-# Only applicable for Wireless Modems (WWAN)
-if [ -z $(echo $2 | egrep "(ttyS[0-9]+|usb[0-9]+b.*)$") ]; then
-    exit 0
-fi
-
-# Determine if we are running inside a VRF or not, required for proper routing table
-# NOTE: the down script can not be properly templated as we need the VRF name,
-# which is not present on deletion, thus we read it from the operating system.
-if [ -d /sys/class/net/{{ ifname }}/upper_* ]; then
-    # Determine upper (VRF) interface
-    VRF=$(basename $(ls -d /sys/class/net/{{ ifname }}/upper_*))
-    # Remove upper_ prefix from result string
-    VRF_NAME=${VRF#"upper_"}
-    # Remove default route from VRF routing table
-    vtysh -c "conf t" -c "vrf ${VRF_NAME}" -c "no ip route 0.0.0.0/0 {{ ifname }}"
-else
-    # Remove default route from GRT (global routing table)
-    vtysh -c "conf t" -c "no ip route 0.0.0.0/0 {{ ifname }}"
-fi
-
-DIALER_PID=$(cat /var/run/{{ ifname }}.pid)
-logger -t pppd[$DIALER_PID] "removed default route via {{ ifname }} metric {{ backup.distance }}"
diff --git a/data/templates/wwan/ip-pre-up.script.tmpl b/data/templates/wwan/ip-pre-up.script.tmpl
deleted file mode 100644
index 199150947..000000000
--- a/data/templates/wwan/ip-pre-up.script.tmpl
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# As WWAN is an "on demand" interface we need to re-configure it when it
-# becomes 'up'
-
-ipparam=$6
-
-# device name and metric are received using ipparam
-device=`echo "$ipparam"|awk '{ print $1 }'`
-
-if [ "$device" != "{{ ifname }}" ]; then
-    exit
-fi
-
-# add some info to syslog
-DIALER_PID=$(cat /var/run/{{ ifname }}.pid)
-logger -t pppd[$DIALER_PID] "executing $0"
-
-echo "{{ description }}" > /sys/class/net/{{ ifname }}/ifalias
-
-{% if vrf %}
-logger -t pppd[$DIALER_PID] "configuring interface {{ ifname }} for VRF {{ vrf }}"
-ip link set dev {{ ifname }} master {{ vrf }}
-{% endif %}
diff --git a/data/templates/wwan/ip-up.script.tmpl b/data/templates/wwan/ip-up.script.tmpl
deleted file mode 100644
index 2603a0286..000000000
--- a/data/templates/wwan/ip-up.script.tmpl
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# Script parameters will be like:
-# wlm0 /dev/serial/by-bus/usb0b1.3p1.3 115200 10.100.118.91 10.64.64.64 wlm0
-
-# Only applicable for Wireless Modems (WWAN)
-if [ -z $(echo $2 | egrep "(ttyS[0-9]+|usb[0-9]+b.*)$") ]; then
-    exit 0
-fi
-
-# Determine if we are running inside a VRF or not, required for proper routing table
-if [ -d /sys/class/net/{{ ifname }}/upper_* ]; then
-    # Determine upper (VRF) interface
-    VRF=$(basename $(ls -d /sys/class/net/{{ ifname }}/upper_*))
-    # Remove upper_ prefix from result string
-    VRF_NAME=${VRF#"upper_"}
-    # Remove default route from VRF routing table
-    vtysh -c "conf t" -c "vrf ${VRF_NAME}" -c "ip route 0.0.0.0/0 {{ ifname }} {{ backup.distance }}"
-else
-    # Remove default route from GRT (global routing table)
-    vtysh -c "conf t" -c "ip route 0.0.0.0/0 {{ ifname }} {{ backup.distance }}"
-fi
-
-DIALER_PID=$(cat /var/run/{{ ifname }}.pid)
-logger -t pppd[$DIALER_PID] "added default route via {{ ifname }} metric {{ backup.distance }} ${VRF_NAME}"
diff --git a/data/templates/wwan/peer.tmpl b/data/templates/wwan/peer.tmpl
deleted file mode 100644
index 2807a79a4..000000000
--- a/data/templates/wwan/peer.tmpl
+++ /dev/null
@@ -1,31 +0,0 @@
-### Autogenerated by interfaces-wirelessmodem.py ###
-
-{{ "# description: " + description if description is defined }}
-ifname {{ ifname }}
-ipparam {{ ifname }}
-linkname {{ ifname }}
-
-{{ "usepeerdns" if no_peer_dns is defined }}
-# physical device
-{{ device }}
-lcp-echo-failure 0
-115200
-debug
-mtu {{ mtu }}
-mru {{ mtu }}
-{% if ipv6 is defined and ipv6.address is defined and ipv6.address.autoconf is defined %}
-+ipv6
-ipv6cp-use-ipaddr
-{% endif %}
-nodefaultroute
-ipcp-max-failure 4
-ipcp-accept-local
-ipcp-accept-remote
-noauth
-crtscts
-lock
-persist
-{{ "demand" if connect_on_demand is defined }}
-
-connect '/usr/sbin/chat -v -t6 -f /etc/ppp/peers/chat.{{ ifname }}'
-