X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=cb49f7980b39d2daadc002f044fba35619917e2a;hb=f5028d38602385a6614c6234fa4165ee4f9e159c;hp=d6a81ec4328ff0e4d8db67eda6010474df64bca2;hpb=1fd948e7dfd70949e959dd0a633d4e5b762d07e0;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index d6a81ec4..cb49f798 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -256,6 +256,7 @@ sub start
 	# set unbuffered and no echo
 	$self->send_now('B',"0");
 	$self->send_now('E',"0");
+	$self->conn->echo(0) if $self->conn->can('echo');
 	
 	# ping neighbour node stuff
 	my $ping = $user->pingint;
@@ -415,7 +416,7 @@ sub normal
 			}
 
 			# is it 'baddx'
-			if ($baddx->in($field[2])) {
+			if ($baddx->in($field[2]) || BadWords::check($field[2]) || $field[2] =~ /COCK/) {
 				dbg("PCPROT: Bad DX spot, ignored") if isdbg('chanerr');
 				return;
 			}
@@ -957,6 +958,7 @@ sub normal
 		}
 
 		if (($pcno >= 28 && $pcno <= 33) || $pcno == 40 || $pcno == 42 || $pcno == 49) { # mail/file handling
+			return if $pcno == 49 && eph_dup($line);
 			if ($pcno == 49 || $field[1] eq $main::mycall) {
 				DXMsg::process($self, $line);
 			} else {