Attachment 5088 Details for Bug 12883 – Difference between the 2 perl modules

Difference between the 2 perl modules

shorewallpm_diffs.txt (text/plain), 4.88 KB, created by Robert Courtright on 2014-04-02 05:27:51 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Courtright

Created: 2014-04-02 05:27:51 CEST

Size: 4.88 KB

patch

obsolete

>22c22
><     my ($file, @l) = @_;
>---
>>     my ($file, $ver, @l) = @_;
>35c35
><     } "$::prefix${shorewall_root}/$file";
>---
>>     } "$::prefix${shorewall_root}${ver}/$file";
>39,40c39,40
><     my ($file) = @_;
><     map { [ split ' ' ] } grep { !/^#/ } cat_("$::prefix${shorewall_root}/$file");
>---
>>     my ($file, $o_ver) = @_;
>>     map { [ split ' ' ] } grep { !/^#/ } cat_("$::prefix${shorewall_root}${o_ver}/$file");
>42a43,44
>> # Note: Called from drakguard and drakfirewall.pm...
>> # Deliberately not adding shorewall6 support here for now
>54c56
><     } "$::prefix/etc/shorewall/$file";
>---
>>     } "$::prefix${shorewall_root}/$file";
>65c67
><     my ($_net, $all_intf) = @_;
>---
>>     my ($interfacesfile, $_net, $all_intf) = @_;
>67c69
><     my @interfaces = map { $_->[1] } grep { $_->[0] eq 'net' } get_config_file('interfaces');
>---
>>     my @interfaces = map { $_->[1] } grep { $_->[0] eq 'net' } $interfacesfile;
>73a76
>>     my $interfacesfile = get_config_file('interfaces', $conf->{version} || '');
>79c82
><     $net_zone{$_} = 1 foreach get_net_zone_interfaces($net, \@all_intf);
>---
>>     $net_zone{$_} = 1 foreach get_net_zone_interfaces($interfacesfile, $net, \@all_intf);
>109c112,114
><     my ($o_in) = @_;
>---
>>     my ($o_in, $o_ver) = @_;
>>     my $ver = '';
>>     $ver = $o_ver if $o_ver;
>111c116
><     my @rules = get_config_file(-f "$::prefix${shorewall_root}/rules.drakx" ? 'rules.drakx' : 'rules');
>---
>>     my @rules = get_config_file(-f "$::prefix${shorewall_root}${ver}/rules.drakx" ? 'rules.drakx' : 'rules', $ver);
>113c118,119
><     my %conf = (disabled => !services::starts_on_boot("shorewall"),
>---
>>     my %conf = (disabled => !services::starts_on_boot("shorewall${ver}"),
>>                 version => $ver,
>122c128
><     if (my ($e) = get_config_file('masq')) {
>---
>>     if (my ($e) = get_config_file('masq', $ver)) {
>126c132
><     my @policy = get_config_file('policy');
>---
>>     my @policy = get_config_file('policy', $ver);
>130c136
><     get_config_file('zones') && \%conf;
>---
>>     get_config_file('zones', $ver) && \%conf;
>143,154d148
>< sub upgrade_to_shorewall3() {
><     #- the 'FW' option has been removed from shorewall.conf as of shorewall 3.0
><     my $ipsecfile_ok;
><     substInFile {
><         undef $_ if /^\s*FW=/;
><         if ((/^\s*IPSECFILE=/ || eof) && !$ipsecfile_ok) {
><             $ipsecfile_ok = 1;
><             $_ = "IPSECFILE=zones\n";
><         }
><     } "$::prefix${shorewall_root}/shorewall.conf";
>< }
>< 
>156a151
>>     my $ver = $conf->{version} || '';
>161c156
><     my ($include_drakx, $other_rules) = partition { $_ eq "INCLUDE\trules.drakx\n" } grep { !/^(#|SECTION)/ } cat_("$::prefix${shorewall_root}/rules");
>---
>>     my ($include_drakx, $other_rules) = partition { $_ eq "INCLUDE\trules.drakx\n" } grep { !/^(#|SECTION)/ } cat_("$::prefix${shorewall_root}${ver}/rules");
>184c179
><         [ $zone, $interface, 'detect', if_(detect_devices::is_bridge_interface($interface), 'routeback') ];
>---
>>         [ $zone, $interface, 'detect', if_(detect_devices::is_bridge_interface($interface), 'bridge') ];
>187,189c182,184
><     set_config_file("zones",
><                     if_($has_loc_zone, [ 'loc', 'ipv4' ]),
><                     [ 'net', 'ipv4' ],
>---
>>     set_config_file('zones', $ver,
>>                     if_($has_loc_zone, [ 'loc', 'ipv' . ($ver || '4') ]),
>>                     [ 'net', 'ipv' . ($ver || '4') ],
>192c187
><     set_config_file('interfaces',
>---
>>     set_config_file('interfaces',  $ver,
>196c191
><     set_config_file('policy',
>---
>>     set_config_file('policy', $ver,
>204c199
><         set_config_file('rules', [ 'INCLUDE', 'rules.drakx' ]);
>---
>>         set_config_file('rules', $ver, [ 'INCLUDE', 'rules.drakx' ]);
>206c201
><     output_with_perm("$::prefix${shorewall_root}/" . 'rules.drakx', 0600, map { join("\t", @$_) . "\n" } (
>---
>>     output_with_perm("$::prefix${shorewall_root}${ver}/" . 'rules.drakx', 0600, map { join("\t", @$_) . "\n" } (
>222,224c217
><     set_config_file('masq', if_(exists $conf->{masq}, [ $conf->{masq}{net_interface}, $conf->{masq}{subnet} ]));
>< 
><     upgrade_to_shorewall3();
>---
>>     set_config_file('masq', $ver, if_(exists $conf->{masq}, [ $conf->{masq}{net_interface}, $conf->{masq}{subnet} ]));
>248,250c241,248
><     $o_intf && member($o_intf, map { $_->[1] } get_config_file('interfaces')) and return;
><     my $shorewall = network::shorewall::read();
><     $shorewall && !$shorewall->{disabled} and network::shorewall::write($shorewall);
>---
>>     if (!$o_intf || !member($o_intf, map { $_->[1] } get_config_file('interfaces'))) {
>>         my $shorewall = network::shorewall::read();
>>         $shorewall && !$shorewall->{disabled} and network::shorewall::write($shorewall);
>>     }
>>     if (!$o_intf || !member($o_intf, map { $_->[1] } get_config_file('interfaces', 6))) {
>>         my $shorewall6 = network::shorewall::read(undef, 6);
>>         $shorewall6 && !$shorewall6->{disabled} and network::shorewall::write($shorewall6);
>>     }

22c22
<     my ($file, @l) = @_;
---
>     my ($file, $ver, @l) = @_;
35c35
<     } "$::prefix${shorewall_root}/$file";
---
>     } "$::prefix${shorewall_root}${ver}/$file";
39,40c39,40
<     my ($file) = @_;
<     map { [ split ' ' ] } grep { !/^#/ } cat_("$::prefix${shorewall_root}/$file");
---
>     my ($file, $o_ver) = @_;
>     map { [ split ' ' ] } grep { !/^#/ } cat_("$::prefix${shorewall_root}${o_ver}/$file");
42a43,44
> # Note: Called from drakguard and drakfirewall.pm...
> # Deliberately not adding shorewall6 support here for now
54c56
<     } "$::prefix/etc/shorewall/$file";
---
>     } "$::prefix${shorewall_root}/$file";
65c67
<     my ($_net, $all_intf) = @_;
---
>     my ($interfacesfile, $_net, $all_intf) = @_;
67c69
<     my @interfaces = map { $_->[1] } grep { $_->[0] eq 'net' } get_config_file('interfaces');
---
>     my @interfaces = map { $_->[1] } grep { $_->[0] eq 'net' } $interfacesfile;
73a76
>     my $interfacesfile = get_config_file('interfaces', $conf->{version} || '');
79c82
<     $net_zone{$_} = 1 foreach get_net_zone_interfaces($net, \@all_intf);
---
>     $net_zone{$_} = 1 foreach get_net_zone_interfaces($interfacesfile, $net, \@all_intf);
109c112,114
<     my ($o_in) = @_;
---
>     my ($o_in, $o_ver) = @_;
>     my $ver = '';
>     $ver = $o_ver if $o_ver;
111c116
<     my @rules = get_config_file(-f "$::prefix${shorewall_root}/rules.drakx" ? 'rules.drakx' : 'rules');
---
>     my @rules = get_config_file(-f "$::prefix${shorewall_root}${ver}/rules.drakx" ? 'rules.drakx' : 'rules', $ver);
113c118,119
<     my %conf = (disabled => !services::starts_on_boot("shorewall"),
---
>     my %conf = (disabled => !services::starts_on_boot("shorewall${ver}"),
>                 version => $ver,
122c128
<     if (my ($e) = get_config_file('masq')) {
---
>     if (my ($e) = get_config_file('masq', $ver)) {
126c132
<     my @policy = get_config_file('policy');
---
>     my @policy = get_config_file('policy', $ver);
130c136
<     get_config_file('zones') && \%conf;
---
>     get_config_file('zones', $ver) && \%conf;
143,154d148
< sub upgrade_to_shorewall3() {
<     #- the 'FW' option has been removed from shorewall.conf as of shorewall 3.0
<     my $ipsecfile_ok;
<     substInFile {
<         undef $_ if /^\s*FW=/;
<         if ((/^\s*IPSECFILE=/ || eof) && !$ipsecfile_ok) {
<             $ipsecfile_ok = 1;
<             $_ = "IPSECFILE=zones\n";
<         }
<     } "$::prefix${shorewall_root}/shorewall.conf";
< }
< 
156a151
>     my $ver = $conf->{version} || '';
161c156
<     my ($include_drakx, $other_rules) = partition { $_ eq "INCLUDE\trules.drakx\n" } grep { !/^(#|SECTION)/ } cat_("$::prefix${shorewall_root}/rules");
---
>     my ($include_drakx, $other_rules) = partition { $_ eq "INCLUDE\trules.drakx\n" } grep { !/^(#|SECTION)/ } cat_("$::prefix${shorewall_root}${ver}/rules");
184c179
<         [ $zone, $interface, 'detect', if_(detect_devices::is_bridge_interface($interface), 'routeback') ];
---
>         [ $zone, $interface, 'detect', if_(detect_devices::is_bridge_interface($interface), 'bridge') ];
187,189c182,184
<     set_config_file("zones",
<                     if_($has_loc_zone, [ 'loc', 'ipv4' ]),
<                     [ 'net', 'ipv4' ],
---
>     set_config_file('zones', $ver,
>                     if_($has_loc_zone, [ 'loc', 'ipv' . ($ver || '4') ]),
>                     [ 'net', 'ipv' . ($ver || '4') ],
192c187
<     set_config_file('interfaces',
---
>     set_config_file('interfaces',  $ver,
196c191
<     set_config_file('policy',
---
>     set_config_file('policy', $ver,
204c199
<         set_config_file('rules', [ 'INCLUDE', 'rules.drakx' ]);
---
>         set_config_file('rules', $ver, [ 'INCLUDE', 'rules.drakx' ]);
206c201
<     output_with_perm("$::prefix${shorewall_root}/" . 'rules.drakx', 0600, map { join("\t", @$_) . "\n" } (
---
>     output_with_perm("$::prefix${shorewall_root}${ver}/" . 'rules.drakx', 0600, map { join("\t", @$_) . "\n" } (
222,224c217
<     set_config_file('masq', if_(exists $conf->{masq}, [ $conf->{masq}{net_interface}, $conf->{masq}{subnet} ]));
< 
<     upgrade_to_shorewall3();
---
>     set_config_file('masq', $ver, if_(exists $conf->{masq}, [ $conf->{masq}{net_interface}, $conf->{masq}{subnet} ]));
248,250c241,248
<     $o_intf && member($o_intf, map { $_->[1] } get_config_file('interfaces')) and return;
<     my $shorewall = network::shorewall::read();
<     $shorewall && !$shorewall->{disabled} and network::shorewall::write($shorewall);
---
>     if (!$o_intf || !member($o_intf, map { $_->[1] } get_config_file('interfaces'))) {
>         my $shorewall = network::shorewall::read();
>         $shorewall && !$shorewall->{disabled} and network::shorewall::write($shorewall);
>     }
>     if (!$o_intf || !member($o_intf, map { $_->[1] } get_config_file('interfaces', 6))) {
>         my $shorewall6 = network::shorewall::read(undef, 6);
>         $shorewall6 && !$shorewall6->{disabled} and network::shorewall::write($shorewall6);
>     }

Actions: View

Attachments on bug 12883: 5019 | 5088 | 5190 | 5191