From e3673eee08f3fa2d09c2e1a7e41a39691a8419ed Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Thu, 18 Oct 2012 10:41:58 +0200
Subject: [PATCH] z registerSender odstaranen pri overovani jiz
zaregistrovaneho klienta a , z registerReceiver odstranen a
---
src/warden-server/lib/Warden.pm | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/warden-server/lib/Warden.pm b/src/warden-server/lib/Warden.pm
index cae6266..2aa48db 100755
--- a/src/warden-server/lib/Warden.pm
+++ b/src/warden-server/lib/Warden.pm
@@ -440,19 +440,19 @@ sub registerSender
my $ip_net_client = $data->{'IP_NET_CLIENT'};
# check if sender has been already registered
- $sth = $DBH->prepare("SELECT registered FROM clients WHERE hostname = ? AND requestor = ? AND service = ? AND client_type = ? AND description_tags = ? AND ip_net_client = ? LIMIT 1;");
+ $sth = $DBH->prepare("SELECT registered FROM clients WHERE hostname = ? AND service = ? AND client_type = ? AND ip_net_client = ? LIMIT 1;");
if (!defined $sth) {
sendMsg("err",
"Cannot prepare statement in function '$function_name': $DBH->errstr",
"Internal 'prepare' server error");
}
- $sth->execute($hostname, $requestor, $service, $client_type, $description_tags, $ip_net_client);
+ $sth->execute($hostname, $service, $client_type, $ip_net_client);
my $result = $sth->fetchrow();
# register new sender
if (defined $result) {
sendMsg("err",
- "Attempt to re-register the sender: {'$hostname', '$requestor', '$service', '$client_type', '$description_tags', '$ip_net_client'}",
+ "Attempt to re-register the sender: {hostname: '$hostname', service: '$service', cidr: '$ip_net_client'}",
"Sender has been already registered at '$result'");
} else {
$sth = $DBH->prepare("INSERT INTO clients VALUES (?,?,?,?,?,?,?,?,?,?);");
@@ -463,7 +463,7 @@ sub registerSender
}
$sth->execute(undef, $hostname, $registered, $requestor, $service, $client_type, $type, $receive_own_events, $description_tags, $ip_net_client);
sendMsg("info",
- "New sender '$hostname' {'$requestor', '$service', '$description_tags', '$ip_net_client'} was registered",
+ "New sender '$hostname' {service: '$service', cidr: '$ip_net_client'} was registered",
undef);
return 1;
}
@@ -505,19 +505,19 @@ sub registerReceiver
my $ip_net_client = $data->{'IP_NET_CLIENT'};
# check if receiver has been already registered
- $sth = $DBH->prepare("SELECT registered FROM clients WHERE hostname = ? AND requestor = ? AND client_type = ? AND type = ? AND receive_own_events = ? AND ip_net_client = ? LIMIT 1;");
+ $sth = $DBH->prepare("SELECT registered FROM clients WHERE hostname = ? AND client_type = ? AND type = ? AND ip_net_client = ? LIMIT 1;");
if (!defined $sth) {
sendMsg("err",
"Cannot prepare statement in function '$function_name': $DBH->errstr",
"Internal 'prepare' server error");
}
- $sth->execute($hostname, $requestor, $client_type, $type, $receive_own_events, $ip_net_client);
+ $sth->execute($hostname, $client_type, $type, $ip_net_client);
my $result = $sth->fetchrow();
# register new receiver
if (defined $result) {
sendMsg("err",
- "Attempt to re-register the receiver: {'$hostname', '$requestor', '$client_type', '$type', '$receive_own_events', '$ip_net_client'}",
+ "Attempt to re-register the receiver: {hostname: '$hostname', type: '$type', cidr: '$ip_net_client'}",
"Receiver has already been registered at '$result'");
} else {
$sth = $DBH->prepare("INSERT INTO clients VALUES (?,?,?,?,?,?,?,?,?,?);");
@@ -528,7 +528,7 @@ sub registerReceiver
}
$sth->execute(undef, $hostname, $registered, $requestor, $service, $client_type, $type, $receive_own_events, $description_tags, $ip_net_client);
sendMsg("info",
- "New receiver '$hostname' {'$requestor', '$type', '$ip_net_client', '$receive_own_events'} was registered",
+ "New receiver '$hostname' {type: '$type', cidr: '$ip_net_client'} was registered",
undef);
return 1;
}
--
GitLab