moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

Make sockfilter kill messages look alike server ones

This commit is contained in:
Yang Tse 2010-01-12 14:01:44 +00:00
parent 3fd67b5f36
commit 82f5ffff8f
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/ftp.pm
View File

@ -25,7 +25,7 @@ use strict;
use warnings;
use serverhelp qw(
servername_str
servername_id
mainsockf_pidfilename
datasockf_pidfilename
);
@ -178,19 +178,19 @@ sub killpid {
#
sub killsockfilters {
my ($proto, $ipvnum, $idnum, $verbose) = @_;
my $srvrname;
my $server;
my $pidfile;
my $pid;
return if($proto !~ /^(ftp|imap|pop3|smtp)$/);
$srvrname = servername_str($proto, $ipvnum, $idnum) if($verbose);
$server = servername_id($proto, $ipvnum, $idnum) if($verbose);
$pidfile = "./". mainsockf_pidfilename($proto, $ipvnum, $idnum);
$pidfile = mainsockf_pidfilename($proto, $ipvnum, $idnum);
$pid = processexists($pidfile);
if($pid > 0) {
printf("* kill pid for %s => %d\n", "${srvrname}-CTRL", $pid)
if($verbose);
printf("* kill pid for %s-%s => %d\n", $server,
($proto eq 'ftp')?'ctrl':'filt', $pid) if($verbose);
kill("KILL", $pid);
waitpid($pid, 0);
}
@ -198,11 +198,11 @@ sub killsockfilters {
return if($proto ne 'ftp');
$pidfile = "./". datasockf_pidfilename($proto, $ipvnum, $idnum);
$pidfile = datasockf_pidfilename($proto, $ipvnum, $idnum);
$pid = processexists($pidfile);
if($pid > 0) {
printf("* kill pid for %s => %d\n", "${srvrname}-DATA", $pid)
if($verbose);
printf("* kill pid for %s-data => %d\n", $server,
$pid) if($verbose);
kill("KILL", $pid);
waitpid($pid, 0);
}