generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow killsockfilters() to take a 5th optional parameter that when provided

Browse Source 
indicates that only one of the two possible sockfilter processes should be
killed.  Valid values for this parameter are 'main' and 'data'.
This commit is contained in:
Yang Tse
2010-01-20 20:39:56 +00:00
parent 471e8eefb6
commit 422a7869be
1 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
tests/ftp.pm
View File

@@ -177,36 +177,43 @@ sub killpid {
# killsockfilters kills sockfilter processes for a given server.
#
sub killsockfilters {
my ($proto, $ipvnum, $idnum, $verbose) = @_;
my ($proto, $ipvnum, $idnum, $verbose, $which) = @_;
my $server;
my $pidfile;
my $pid;
return if($proto !~ /^(ftp|imap|pop3|smtp)$/);
die "unsupported sockfilter: $which"
if($which && ($which !~ /^(main|data)$/));
$server = servername_id($proto, $ipvnum, $idnum) if($verbose);
$pidfile = mainsockf_pidfilename($proto, $ipvnum, $idnum);
$pid = processexists($pidfile);
if($pid > 0) {
printf("* kill pid for %s-%s => %d\n", $server,
($proto eq 'ftp')?'ctrl':'filt', $pid) if($verbose);
kill("KILL", $pid);
waitpid($pid, 0);
if(!$which || ($which eq 'main')) {
$pidfile = mainsockf_pidfilename($proto, $ipvnum, $idnum);
$pid = processexists($pidfile);
if($pid > 0) {
printf("* kill pid for %s-%s => %d\n", $server,
($proto eq 'ftp')?'ctrl':'filt', $pid) if($verbose);
kill("KILL", $pid);
waitpid($pid, 0);
}
unlink($pidfile) if(-f $pidfile);
}
unlink($pidfile) if(-f $pidfile);
return if($proto ne 'ftp');
$pidfile = datasockf_pidfilename($proto, $ipvnum, $idnum);
$pid = processexists($pidfile);
if($pid > 0) {
printf("* kill pid for %s-data => %d\n", $server,
$pid) if($verbose);
kill("KILL", $pid);
waitpid($pid, 0);
if(!$which || ($which eq 'data')) {
$pidfile = datasockf_pidfilename($proto, $ipvnum, $idnum);
$pid = processexists($pidfile);
if($pid > 0) {
printf("* kill pid for %s-data => %d\n", $server,
$pid) if($verbose);
kill("KILL", $pid);
waitpid($pid, 0);
}
unlink($pidfile) if(-f $pidfile);
}
unlink($pidfile) if(-f $pidfile);
}
#######################################################################