From 76abe9a5aad69eb7e67295588c6825cdae0341af Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Tue, 1 Sep 2015 18:32:22 +0200
Subject: use clock() as source for SRV randomness
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Initializing a random number generator with the time since epoch could
be good enough, but reaches its limits in test code as the 100
iterations might very well happen in the same second and hence the seed
number is always the same… clock() has a way lower resolution so it
changes more often and not unimportant: If many users start the update
at the same time it isn't to unlikely the SRV record will be ordered in
the same second choosing the same for them all, but it seems less likely
that the exact same clock() time has passed for them.

And if I have to touch this, lets change a few other things as well to
make me and/or compilers a bit happier (clang complained about the usage
of a GNU extension in the testcase for example).
---
 cmdline/apt-helper.cc | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'cmdline')

diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc
index 3c49bf149..2d24a8aee 100644
--- a/cmdline/apt-helper.cc
+++ b/cmdline/apt-helper.cc
@@ -82,25 +82,27 @@ static bool DoDownloadFile(CommandLine &CmdL)
 static bool DoSrvLookup(CommandLine &CmdL)
 {
    if (CmdL.FileSize() < 1)
-      return _error->Error(_("Must specifc at least one srv record"));
+      return _error->Error("Must specify at least one SRV record");
 
-   std::vector<SrvRec> srv_records;
-   c1out << "# target priority weight port" << std::endl;
-   for(int i=1; CmdL.FileList[i] != NULL; i++)
+   for(size_t i = 1; CmdL.FileList[i] != NULL; ++i)
    {
-      if(GetSrvRecords(CmdL.FileList[i], srv_records) == false)
-         _error->Warning(_("GetSrvRec failed for %s"), CmdL.FileList[i]);
-      for (std::vector<SrvRec>::const_iterator I = srv_records.begin();
-           I != srv_records.end(); ++I)
+      std::vector<SrvRec> srv_records;
+      std::string const name = CmdL.FileList[i];
+      c0out << "# Target\tPriority\tWeight\tPort # for " << name << std::endl;
+      size_t const found = name.find(":");
+      if (found != std::string::npos)
       {
-         c1out << (*I).target.c_str() << " "
-               << (*I).priority << " "
-               << (*I).weight << " "
-               << (*I).port << " "
-               << std::endl;
+	 std::string const host = name.substr(0, found);
+	 size_t const port = atoi(name.c_str() + found + 1);
+	 if(GetSrvRecords(host, port, srv_records) == false)
+	    _error->Warning(_("GetSrvRec failed for %s"), name.c_str());
       }
-   }
+      else if(GetSrvRecords(name, srv_records) == false)
+	 _error->Warning(_("GetSrvRec failed for %s"), name.c_str());
 
+      for (SrvRec const &I : srv_records)
+	 c1out << I.target << "\t" << I.priority << "\t" << I.weight << "\t" << I.port << std::endl;
+   }
    return true;
 }
 
-- 
cgit v1.2.3