holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

More shared library changes

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4403 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-08-22 23:31:27 +00:00
parent 38ad4b8db3
commit 56d8d5e2f1
2 changed files with 45 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
Shorewall/compiler
View File

@ -53,7 +53,7 @@ fatal_error() # $* = Error Message
} }
# #
# Load a compile-time library # Load a library functions
# #
clib_load() # $1 = library name, $2=name of 'loaded' symbol, $3-n = Fatal Error Message clib_load() # $1 = library name, $2=name of 'loaded' symbol, $3-n = Fatal Error Message
{ {
@ -71,6 +71,30 @@ clib_load() # $1 = library name, $2=name of 'loaded' symbol, $3-n = Fatal Error
fi fi
} }
strip_file_and_clib_load() # $1 = logical file, $2 = library to load if logical file non-empty, $3 = name of 'loaded' symbol
{
local f=$(find_file $1)
strip_file $1 $f
if [ -s $TMP_DIR/$1 ]; then
shift
clib_load $2 $3 "Entries in the $f file require the Shorewall compiler module ${SHAREDIR}/clib.$2 which is not installed"
fi
}
strip_file_and_lib_load() # $1 = logical file, $2 = library to load if logical file non-empty, $3 = name of 'loaded' symbol, $4-n = Fatal Error Message
{
local f=$(find_file $1)
strip_file $1 $f
if [ -s $TMP_DIR/$1 ]; then
shift
lib_load $2 $3 "Entries in the $f file require the Shorewall library ${SHAREDIR}/lib.$2 which is not installed"
fi
}
try_clib_load() # $1 = library name, $2=name of 'loaded' symbol try_clib_load() # $1 = library name, $2=name of 'loaded' symbol
{ {
eval local loaded="\$${2}" eval local loaded="\$${2}"
@ -6849,36 +6873,24 @@ do_initialize() {
strip_file masq strip_file masq
strip_file blacklist strip_file blacklist
strip_file rules strip_file rules
strip_file proxyarp strip_file rfc1918
[ -s $TMP_DIR/proxyarp ] && clib_load proxyarp CLIB_PROXYARP_LOADED "Use of the proxyarp file requires the Shorewall compiler module clib.proxyarp which is not installed" strip_file_and_clib_load proxyarp proxyarp CLIB_PROXYARP_LOADED
strip_file maclist strip_file_and_clib_load maclist maclist CLIB_MACLIST_LOADED
[ -s $TMP_DIR/maclist ] && clib_load maclist CLIB_MACLIST_LOADED "Use of the maclist file requires the Shorewall compiler module clib.maclist module which is not installed" strip_file_and_clib_load nat nat CLIB_NAT_LOADED
strip_file nat strip_file_and_clib_load netmap nat CLIB_NAT_LOADED
strip_file netmap strip_file_and_clib_load tcrules tcrules CLIB_TCRULES_LOADED
if [ -s $TMP_DIR/nat -o -s $TMP_DIR/netmap ]; then strip_file_and_clib_load accounting accounting CLIB_ACCOUNTING_LOADED
clib_load nat CLIB_NAT_LOADED "Use of the nat or netmap files requires the Shorewall compiler module clib.nat which is not installed" strip_file_and_clib_load ecn ecn CLIB_ECN_LOADED
fi strip_file_and_clib_load providers providers CLIB_PROVIDERS_LOADED
strip_file tcrules strip_file_and_clib_load tos tos CLIB_TOS_LOADED
if [ -s $TMP_DIR/tcrules ]; then strip_file_and_clib_load ipsec tunnels CLIB_TUNNELS_LOADED
clib_load tcrules CLIB_TCRULES_LOADED "Entries in the tcrules file require Shorewall compiler module clib.tcrules which is not installed" strip_file_and_clib_load tunnels tunnels CLIB_TUNNELS_LOADED
strip_file_and_lib_load tcdevices tc LIB_TC_LOADED
strip_file_and_lib_load tcclasses tc LIB_TC_LOADED
if [ -n "$CLIB_TCRULES_LOADED" ]; then
lib_load tcrules LIB_TCRULES_LOADED "Entries in the tcrules file require Shorewall library module lib.tcrules which is not installed" lib_load tcrules LIB_TCRULES_LOADED "Entries in the tcrules file require Shorewall library module lib.tcrules which is not installed"
fi fi
strip_file rfc1918
strip_file accounting
[ -s $TMP_DIR/accounting ] && clib_load accounting CLIB_ACCOUNTING_LOADED "Entries in the accounting file require Shorewall compiler module clib.accounting which is not installed"
strip_file ecn
[ -s $TMP_DIR/ecn ] && clib_load ecn CLIB_ECN_LOADED "Entries in the ecn file require Shorewall compiler module clib.ecn which is not installed"
strip_file providers
[ -s $TMP_DIR/providers ] && clib_load providers CLIB_PROVIDERS_LOADED "Entries in the providers file require Shorewall compiler module clib.providers which is not installed"
strip_file tos
[ -s $TMP_DIR/tos ] && clib_load tos CLIB_TOS_LOADED "Entries in the tos file require Shorewall compiler module clib.tos which is not installed"
strip_file ipsec
[ -s $TMP_DIR/ipsec ] && clib_load tunnels CLIB_TUNNELS_LOADED "Entries in the ipsec file require Shorewall compiler module clib.tunnels which is not installed"
strip_file tunnels
[ -s $TMP_DIR/tunnels ] && clib_load tunnels CLIB_TUNNELS_LOADED "Entries in the tunnels file require Shorewall compiler module clib.tunnels which is not installed"
strip_file tcdevices $devfile
[ -s $TMP_DIR/tcdevices ] && lib_load tc LIB_TC_LOADED "Entries in the tcdevices file require Shorewall library module lib.tc which is not installed"
strip_file tcclasses $classfile
# #
# Check out the user's shell # Check out the user's shell
# #

5
Shorewall/functions
View File

@ -30,9 +30,10 @@ lib_load() # $1 = library name, $2=name of 'loaded' symbol, $3-n = Fatal Error M
{ {
eval local loaded="\$${2}" eval local loaded="\$${2}"
if [ -z "$loaded" ]; then
local lib=${SHAREDIR}/lib.${1} local lib=${SHAREDIR}/lib.${1}
if [ -z "$loaded" ]; then
if [ -x $lib ]; then if [ -x $lib ]; then
. $lib . $lib
else else
@ -48,4 +49,4 @@ lib_load() # $1 = library name, $2=name of 'loaded' symbol, $3-n = Fatal Error M
SHOREWALL_LIBRARY=Loaded SHOREWALL_LIBRARY=Loaded
lib_load base base LIB_BASE_LOADED "Installation Error: ${SHAREDIR}/lib.base not found" lib_load base LIB_BASE_LOADED "Installation Error: ${SHAREDIR}/lib.base not found"