diff options
| author | fukachan <fukachan> | 2008-08-02 21:51:28 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2008-08-02 21:51:28 +0000 |
| commit | 84e22ce2c53ba164279bf769dac62603ed87532b (patch) | |
| tree | fa703f40ad8f4fed5622308dee2e93fe1b067d4b /fml/lib/FML/Process | |
| parent | d1c3a01aab4416f5b4b3e4d204ab0461b4eb2db6 (diff) | |
| download | fml8-84e22ce2c53ba164279bf769dac62603ed87532b.tar.gz fml8-84e22ce2c53ba164279bf769dac62603ed87532b.tar.bz2 fml8-84e22ce2c53ba164279bf769dac62603ed87532b.zip | |
fixed that isolate operation works.
Diffstat (limited to 'fml/lib/FML/Process')
| -rw-r--r-- | fml/lib/FML/Process/Command.pm | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/fml/lib/FML/Process/Command.pm b/fml/lib/FML/Process/Command.pm index 00402a0a..e10c9127 100644 --- a/fml/lib/FML/Process/Command.pm +++ b/fml/lib/FML/Process/Command.pm @@ -3,7 +3,7 @@ # Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2008 Ken'ichi Fukamachi # All rights reserved. # -# $FML: Command.pm,v 1.121 2006/07/09 12:11:13 fukachan Exp $ +# $FML: Command.pm,v 1.122 2008/07/20 09:15:55 fukachan Exp $ # package FML::Process::Command; @@ -584,14 +584,25 @@ sub _check_effective_command_contained # if no effective command, # ignore or reply warning determined by matched rule. unless ($num_processed) { - my $rule = $curproc->restriction_state_get_ignore_reason() || ''; + my $rule; + + $rule = $curproc->restriction_state_get_ignore_reason() || ''; if ($rule eq 'ignore_invalid_request' || $rule eq 'ignore') { $curproc->log("no effective command, ignore reply"); $curproc->reply_message_delete(); + return; } - else { - $curproc->log("no effective command, send warning"); + + $rule = $curproc->restriction_state_get_isolate_reason() || ''; + if ($rule eq 'isolate_invalid_request' || $rule eq 'isolate') { + $curproc->log("no effective command, isolate and ignore request"); + $curproc->incoming_message_isolate_content(); + $curproc->reply_message_delete(); + return; } + + # not matched, send warning. + $curproc->log("no effective command, send warning"); } } |
