From 3b10bbdb085c69bc18d6ce30fb69e7666661ded8 Mon Sep 17 00:00:00 2001 From: div0 Date: Mon, 25 May 2009 15:36:38 +0000 Subject: [PATCH] same rcon change git-svn-id: svn://svn.icculus.org/nexuiz/trunk@6771 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- server/rcon2irc/rbiserver.pl | 3 ++- server/rcon2irc/rcon2irc.pl | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/rcon2irc/rbiserver.pl b/server/rcon2irc/rbiserver.pl index d651d0584..9bfbcbfb1 100644 --- a/server/rcon2irc/rbiserver.pl +++ b/server/rcon2irc/rbiserver.pl @@ -77,7 +77,8 @@ sub markmap($$$$;$) [ dp => q{pure: -(\S+) (.*)} => sub { my ($status, $nick) = @_; $nick = color_dp2irc $nick; - out irc => 0, "PRIVMSG $config{irc_channel} :\001ACTION thinks $nick is $status\001"; + out irc => 0, "PRIVMSG $config{irc_channel} :\001ACTION thinks $nick is $status\001" + unless $status eq 'MODIFIED'; # in this case, either DETAIL_TIMEOUT or DETAIL_MISMATCH follows return 0; } ], [ dp => q{pure: \*DETAIL_MISMATCH (.*) (\S+)$} => sub { diff --git a/server/rcon2irc/rcon2irc.pl b/server/rcon2irc/rcon2irc.pl index 127998446..02f1069f2 100755 --- a/server/rcon2irc/rcon2irc.pl +++ b/server/rcon2irc/rcon2irc.pl @@ -466,7 +466,7 @@ sub send($$$) my ($self, $line, $nothrottle) = @_; if($self->{secure}) { - my $t = sprintf "%ld", time(); + my $t = sprintf "%ld.%06d", time(), int rand 1000000; my $key = Digest::HMAC::hmac("$t $line", $self->{password}, \&Digest::MD4::md4); return $self->{connector}->send("\377\377\377\377srcon HMAC-MD4 TIME $key $t $line"); } -- 2.39.2