Remove red_db_* functions.

diff --git a/functions.ppp b/functions.ppp
index c10e7e7cbbd3973e0a1bbfeb0068510cc90f620a..00015aef97d6ce8d632c6cc578add3d8e71cce2a 100644 (file)
--- a/functions.ppp
+++ b/functions.ppp
@@ -34,7 +34,7 @@ function ppp_common_ip_pre_up() {
                return ${EXIT_ERROR}
        fi
 
-       red_db_from_ppp ${zone}
+       routing_db_from_ppp ${zone}
 
        # Request firewall reload
        event_firewall_reload
@@ -51,7 +51,7 @@ function ppp_common_ip_up() {
                return ${EXIT_ERROR}
        fi
 
-       red_db_set ${zone} active 1
+       routing_db_set ${zone} active 1
        red_routing_update ${zone}
 
        # Emit interface-up event

diff --git a/functions.red b/functions.red
index 849e6a0a58061d49d7fd72b7a5ad9cd4f468ea20..71cd5ad06454986951771beaf4cc67f9511307d3 100644 (file)
--- a/functions.red
+++ b/functions.red
@@ -18,80 +18,3 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
-
-function red_db_path() {
-       local zone=${1}
-
-       echo "${RED_DB_DIR}/${zone}"
-}
-
-function red_db_exists() {
-       local zone=${1}
-
-       [ -d "$(red_db_path ${zone})" ]
-}
-
-function red_db_create() {
-       local zone=${1}
-
-       red_db_exists ${zone} && return ${EXIT_OK}
-
-       mkdir -p $(red_db_path ${zone})
-}
-
-function red_db_remove() {
-       local zone=${1}
-
-       [ -z "${zone}" ] && return ${EXIT_ERROR}
-
-       rm -rf ${RED_DB_DIR}
-}
-
-function red_db_set() {
-       local zone=${1}
-       local parameter=${2}
-       shift 2
-
-       local value="$@"
-
-       red_db_create ${zone}
-
-       echo "${value}" > $(red_db_path ${zone})/${parameter}
-}
-
-function red_db_get() {
-       local zone=${1}
-       local parameter=${2}
-       shift 2
-
-       cat $(red_db_path ${zone})/${parameter} 2>/dev/null
-}
-
-function red_db_from_ppp() {
-       local zone=${1}
-
-       # Save ppp configuration
-       red_db_set ${zone} type "ppp"
-       red_db_set ${zone} local-ip-address ${PPP_IPLOCAL}
-       red_db_set ${zone} remote-ip-address ${PPP_IPREMOTE}
-
-       red_db_set ${zone} dns ${PPP_DNS1} ${PPP_DNS2}
-
-       red_db_set ${zone} remote-address ${PPP_MACREMOTE,,}
-}
-
-function red_routing_update() {
-       local zone=${1}
-
-       local table=${zone}
-
-       # Create routing table if not exists
-       routing_table_create ${table}
-
-       local remote_ip_address=$(red_db_get ${zone} remote-ip-address)
-       local local_ip_address=$(red_db_get ${zone} local-ip-address)
-
-       ip route replace table ${table} default nexthop via ${remote_ip_address}
-
-       ip rule add from ${local_ip_address} lookup ${table}
-}

diff --git a/hooks/zones/modem b/hooks/zones/modem
index fa6d85b0d8b19af67e8c81bf42b6056d9096e998..d7582846e76d5f2a109049b13374b3ba0f24a94c 100755 (executable)
--- a/hooks/zones/modem
+++ b/hooks/zones/modem
@@ -218,11 +218,11 @@ function _status() {
        # XXX display time since connection started
 
        cli_headline "    Point-to-Point-over-Ethernet protocol:"
-       echo "        IP-Address            : $(red_db_get ${zone} local-ip-address)"
-       echo "        Gateway               : $(red_db_get ${zone} remote-ip-address)"
-       echo "        DNS-Server            : $(red_db_get ${zone} dns)"
+       echo "        IP-Address            : $(routing_db_get ${zone} local-ip-address)"
+       echo "        Gateway               : $(routing_db_get ${zone} remote-ip-address)"
+       echo "        DNS-Server            : $(routing_db_get ${zone} dns)"
        echo
-       echo "        MAC-Remote            : $(red_db_get ${zone} remote-address)"
+       echo "        MAC-Remote            : $(routing_db_get ${zone} remote-address)"
        echo
        echo "        MTU                   : $(device_get_mtu ${zone})"
        echo # Empty line

diff --git a/hooks/zones/pppoe b/hooks/zones/pppoe
index bc14d820cb1174721660b4f1f1f774ee1dab6bb8..895e1edd0c5bb02987fe83c72bc97ff591a14e4f 100755 (executable)
--- a/hooks/zones/pppoe
+++ b/hooks/zones/pppoe
@@ -258,11 +258,11 @@ function _status() {
        # XXX display time since connection started
 
        cli_headline "    Point-to-Point-over-Ethernet protocol:"
-       echo "        IP-Address            : $(red_db_get ${zone} local-ip-address)"
-       echo "        Gateway               : $(red_db_get ${zone} remote-ip-address)"
-       echo "        DNS-Server            : $(red_db_get ${zone} dns)"
+       echo "        IP-Address            : $(routing_db_get ${zone} local-ip-address)"
+       echo "        Gateway               : $(routing_db_get ${zone} remote-ip-address)"
+       echo "        DNS-Server            : $(routing_db_get ${zone} dns)"
        echo
-       echo "        MAC-Remote            : $(red_db_get ${zone} remote-address)"
+       echo "        MAC-Remote            : $(routing_db_get ${zone} remote-address)"
        echo
        echo "        MTU                   : $(device_get_mtu ${zone})"
        echo # Empty line