From 89eca116571e0b96db7a7f4aecac1352d27e41fc Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Wed, 30 Jul 2014 13:54:37 +0200
Subject: [PATCH] uprava parametru -c <cidr>, uprava chybovych hlasek
---
src/warden-server/bin/registerReceiver.pl | 15 +++++++--------
src/warden-server/bin/registerSender.pl | 16 ++++++++--------
2 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/src/warden-server/bin/registerReceiver.pl b/src/warden-server/bin/registerReceiver.pl
index c521d1b..891d2a0 100755
--- a/src/warden-server/bin/registerReceiver.pl
+++ b/src/warden-server/bin/registerReceiver.pl
@@ -40,13 +40,13 @@ WardenCommon::loadConf($conf_file);
# FUNCTIONS
################################################################################
sub usage {
- print "Usage: $RealScript -n <hostname> -r <requestor> -t <type> -o -c <ip_net_client> [-i <client_id> -h -V]\n";
+ print "Usage: $RealScript -n <hostname> -r <requestor> -t <type> -o -c <cidr> [-i <client_id> -h -V]\n";
exit 1;
}
sub help {
- print "$RealScript -n <hostname> -r <requestor> -t <type> -o -c <ip_net_client> [-i <client_id> -h -V]\n";
+ print "$RealScript -n <hostname> -r <requestor> -t <type> -o -c <cidr> [-i <client_id> -h -V]\n";
print "-n hostname of receiver\n";
print "-r e-mail address of client registration requestor\n";
print "-t type of received events or '_any_' for receiving of all types of events\n";
@@ -114,11 +114,10 @@ if ($script_version) {
# check parameters definition
switch () {
- case {!defined $hostname} {WardenCommon::errMsg("Parameter 'hostname' is not defined!")}
- case {!defined $requestor} {WardenCommon::errMsg("Parameter 'requestor' is not defined!")}
- case {!defined $type} {WardenCommon::errMsg("Parameter 'type' is not defined!")}
- case {!defined $receive_own_events} {WardenCommon::errMsg("Parameter 'receive_own_events' is not defined!")}
- case {!defined $ip_net_client} {WardenCommon::errMsg("Parameter 'ip_net_client' is not defined!")}
+ case {!defined $hostname} {WardenCommon::errMsg("Parameter '-n <hostname>' is not defined!")}
+ case {!defined $requestor} {WardenCommon::errMsg("Parameter '-r <requestor>' is not defined!")}
+ case {!defined $type} {WardenCommon::errMsg("Parameter '-t <type>' is not defined!")}
+ case {!defined $ip_net_client} {WardenCommon::errMsg("Parameter '-c <cidr>' is not defined!")}
}
# check validity of IP address (CIDR format)
@@ -128,7 +127,7 @@ if ($ip_net_client !~ /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}(
# check client ID
if (defined $client_id && $client_id !~ /^\d+\z/) {
- WardenCommon::errMsg("Parameter 'client_id' is not a integer!");
+ WardenCommon::errMsg("Parameter '-i <client_id>' is not a integer!");
}
# defined variables by script
diff --git a/src/warden-server/bin/registerSender.pl b/src/warden-server/bin/registerSender.pl
index 725069d..fc7d48b 100755
--- a/src/warden-server/bin/registerSender.pl
+++ b/src/warden-server/bin/registerSender.pl
@@ -40,13 +40,13 @@ WardenCommon::loadConf($conf_file);
# FUNCTIONS
################################################################################
sub usage {
- print "Usage: $RealScript -n <hostname> -r <requestor> -s <service> -d <description_tags> -c <ip_net_client> [-i <client_id> -h -V]\n";
+ print "Usage: $RealScript -n <hostname> -r <requestor> -s <service> -d <description_tags> -c <cidr> [-i <client_id> -h -V]\n";
exit 1;
}
sub help {
- print "$RealScript -n <hostname> -r <requestor> -s <service> -d <description_tags> -c <ip_net_client> [-i <client_id> -h -V]\n";
+ print "$RealScript -n <hostname> -r <requestor> -s <service> -d <description_tags> -c <cidr> [-i <client_id> -h -V]\n";
print "-n hostname of sender\n";
print "-r e-mail address of client registration requestor\n";
print "-s name of service which sent events\n";
@@ -110,11 +110,11 @@ if ($script_version) {
# check parameters definition
switch () {
- case {!defined $hostname} {WardenCommon::errMsg("Parameter 'hostname' is not defined!")}
- case {!defined $requestor} {WardenCommon::errMsg("Parameter 'requestor' is not defined!")}
- case {!defined $service} {WardenCommon::errMsg("Parameter 'service' is not defined!")}
- case {!defined $description_tags} {WardenCommon::errMsg("Parameter 'description_tags' is not defined!")}
- case {!defined $ip_net_client} {WardenCommon::errMsg("Parameter 'ip_net_client' is not defined!")}
+ case {!defined $hostname} {WardenCommon::errMsg("Parameter '-n <hostname>' is not defined!")}
+ case {!defined $requestor} {WardenCommon::errMsg("Parameter '-r <requestor>' is not defined!")}
+ case {!defined $service} {WardenCommon::errMsg("Parameter '-s <service>' is not defined!")}
+ case {!defined $description_tags} {WardenCommon::errMsg("Parameter '-d <description_tags>' is not defined!")}
+ case {!defined $ip_net_client} {WardenCommon::errMsg("Parameter '-c <cidr>' is not defined!")}
}
# check validity of IP address (CIDR format)
@@ -124,7 +124,7 @@ if ($ip_net_client !~ /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}(
# check client ID
if (defined $client_id && $client_id !~ /^\d+\z/) {
- WardenCommon::errMsg("Parameter 'client_id' is not a integer!");
+ WardenCommon::errMsg("Parameter '-i <client_id>' is not a integer!");
}
# defined variables by method
--
GitLab