[2007] in Moira Commits
/svn/moira r4146 - trunk/moira/clients/mrtest
daemon@ATHENA.MIT.EDU (Garry Zacheiss)
Tue Sep 24 20:21:21 2013
Date: Tue, 24 Sep 2013 20:21:13 -0400
From: Garry Zacheiss <zacheiss@MIT.EDU>
Message-Id: <201309250021.r8P0LDnj017446@drugstore.mit.edu>
To: moira-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: zacheiss
Date: 2013-09-24 20:21:13 -0400 (Tue, 24 Sep 2013)
New Revision: 4146
Modified:
trunk/moira/clients/mrtest/qy
Log:
Make subnet queries slightly less hostile to use.
Modified: trunk/moira/clients/mrtest/qy
===================================================================
--- trunk/moira/clients/mrtest/qy 2013-09-25 00:20:53 UTC (rev 4145)
+++ trunk/moira/clients/mrtest/qy 2013-09-25 00:21:13 UTC (rev 4146)
@@ -5,6 +5,7 @@
use IPC::Open2;
use FileHandle;
+use Socket;
# use vars qw( @connect @auth @query $debug $align );
# use vars qw( $mrtest @help @argl @retl @fields @qret $i );
# use strict;
@@ -152,6 +153,16 @@
if ($name) { $query[1] = $name; }
}
+if ($query[0] eq "asnt" || $query[0] eq "add_subnet" || $query[0] eq "usnt" || $query[0] eq "update_subnet") {
+ my ($decimal_form, $idx);
+ $idx = 0;
+ if ($query[0] eq "usnt" || $query[0] eq "update_subnet") { $idx = 1 };
+ foreach $arg (6..9) {
+ $decimal_form = unpack('N', inet_aton($query[$arg + $idx]));
+ if ($decimal_form) { $query[$arg + $idx] = $decimal_form; }
+ }
+}
+
# send the query to the Moira server
@qret = command "qy @query";
(pop(@qret) =~ /^\d+ tuple/) || die "Unexpected last line from 'qy @query'";
