forked from extern/shorewall_code
Call the Proxyarp initializer in an INIT block; add other missing initializer calls
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6540 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
be8013a8b2
commit
20ab9d7cfa
@ -54,18 +54,23 @@ our $reused = 0;
|
||||
use constant { EXPORT => 0x01 ,
|
||||
TIMESTAMP => 0x02 };
|
||||
|
||||
sub initialize() {
|
||||
#
|
||||
# Reinitilize the package-globals in the other modules
|
||||
#
|
||||
sub reinitialize() {
|
||||
Shorewall::Common::initialize;
|
||||
Shorewall::Config::initialize;
|
||||
Shorewall::Chains::initialize;
|
||||
Shorewall::Zones::initialize;
|
||||
Shorewall::Interfaces::initialize;
|
||||
Shorewall::Accounting::initialize;
|
||||
Shorewall::Actions::initialize;
|
||||
Shorewall::Nat::initialize;
|
||||
Shorewall::Providers::initialize;
|
||||
Shorewall::Rules::initialize;
|
||||
Shorewall::Tc::initialize;
|
||||
Shorewall::Zones::initialize;
|
||||
Shorewall::Macros::initialize;
|
||||
Shorewall::Actions::initialize;
|
||||
Shorewall::Accounting::initialize;
|
||||
Shorewall::Rules::initialize;
|
||||
Shorewall::Proxyarp::initialize;
|
||||
}
|
||||
|
||||
#
|
||||
@ -675,7 +680,7 @@ sub compiler( $$$$ ) {
|
||||
|
||||
$export = 0;
|
||||
|
||||
initialize if $reused++;
|
||||
reinitialize if $reused++;
|
||||
|
||||
if ( $directory ne '' ) {
|
||||
fatal_error "$directory is not an existing directory" unless -d $directory;
|
||||
|
@ -39,7 +39,7 @@ our @EXPORT = qw( find_macro
|
||||
merge_macro_column
|
||||
|
||||
%macros );
|
||||
our @EXPORT_OK = qw( );
|
||||
our @EXPORT_OK = qw( initialize );
|
||||
our @VERSION = 1.00;
|
||||
|
||||
|
||||
|
@ -35,7 +35,7 @@ our @EXPORT = qw(
|
||||
dump_proxy_arp
|
||||
);
|
||||
|
||||
our @EXPORT_OK = qw( );
|
||||
our @EXPORT_OK = qw( initialize );
|
||||
our @VERSION = 1.00;
|
||||
|
||||
our @proxyarp;
|
||||
@ -44,6 +44,10 @@ sub initialize() {
|
||||
@proxyarp = ();
|
||||
}
|
||||
|
||||
INIT {
|
||||
initialize;
|
||||
}
|
||||
|
||||
sub setup_one_proxy_arp( $$$$$ ) {
|
||||
my ( $address, $interface, $external, $haveroute, $persistent) = @_;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user