From d5309702072c5c44cf897a2c22c9a92617ccdc52 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 3 Jun 2011 19:54:41 +0000
Subject: [PATCH] Remove red_db_* functions.

---
 functions.ppp     |  4 +--
 functions.red     | 77 -----------------------------------------------
 hooks/zones/modem |  8 ++---
 hooks/zones/pppoe |  8 ++---
 4 files changed, 10 insertions(+), 87 deletions(-)

diff --git a/functions.ppp b/functions.ppp
index c10e7e7c..00015aef 100644
--- 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 849e6a0a..71cd5ad0 100644
--- 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 fa6d85b0..d7582846 100755
--- 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 bc14d820..895e1edd 100755
--- 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
-- 
2.39.2