extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-01-03 12:09:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate duplicate function names between lib.cli and lib.cli-std

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2020-09-14 14:15:47 -07:00
parent f16e666858
commit e4c2122532
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
2 changed files with 47 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Shorewall-core/lib.cli
View File

@ -4019,9 +4019,15 @@ setup_dbl() {
# the Standard CLI by loading lib.cli-std # the Standard CLI by loading lib.cli-std
################################################################################ ################################################################################
# #
# Set the configuration variables from shorewall[6]-lite.conf. # Set the configuration variables from shorewall[6]-lite.conf. This function
# is replaced by the one in lib.cli-std (Shorewall product) when Shorewall or
# Shorewall6 is being run.
# #
get_config() { # $1 = Yes: read the params file
# $2 = Yes: check for STARTUP_ENABLED
# $3 = Yes: Check for LOGFILE
#
lite_get_config() {
local config local config
local lib local lib
@ -4183,10 +4189,22 @@ get_config() {
[ -f $lib ] && . $lib [ -f $lib ] && . $lib
} }
#
# get_config() -- calls the appropriate xxx_get_config()
#
get_config() {
if [ -z "$g_lite" ]; then
std_get_config $@
else
lite_get_config $@
fi
}
# #
# Start Command Executor # Start Command Executor
# #
start_command() { lite_start_command() {
local finished local finished
finished=0 finished=0
@ -4273,10 +4291,21 @@ start_command() {
do_it do_it
} }
#
# start_command() -- calls the appropriate xxx_start_command()
#
start_command() {
if [ -z "$g_lite" ]; then
std_start_command $@
else
lite_start_command $@
fi
}
# #
# Reload/Restart Command Executor # Reload/Restart Command Executor
# #
restart_command() { lite_restart_command() {
local finished local finished
finished=0 finished=0
local rc local rc
@ -4345,6 +4374,17 @@ restart_command() {
return $rc return $rc
} }
#
# restart_command() -- calls the appropriate xxx_restart_command()
#
restart_command() {
if [ -z "$g_lite" ]; then
std_restart_command $@
else
lite_restart_command $@
fi
}
run_command() { run_command() {
if [ -x $g_firewall ] ; then if [ -x $g_firewall ] ; then
run_it $g_firewall $@ run_it $g_firewall $@

6
Shorewall/lib.cli-std
View File

@ -29,7 +29,7 @@
# $2 = Yes: check for STARTUP_ENABLED # $2 = Yes: check for STARTUP_ENABLED
# $3 = Yes: Check for LOGFILE # $3 = Yes: Check for LOGFILE
# #
get_config() { std_get_config() {
local prog local prog
local lib local lib
@ -568,7 +568,7 @@ compiler() {
# #
# Start Command Executor # Start Command Executor
# #
start_command() { std_start_command() {
local finished local finished
finished=0 finished=0
local rc local rc
@ -967,7 +967,7 @@ update_command() {
# #
# Reload/Restart Command Executor # Reload/Restart Command Executor
# #
restart_command() { std_restart_command() {
local finished local finished
finished=0 finished=0
local rc local rc