ndncatchunks: Reduce initial timeout of iterative version discovery

Reduce the default timeout to 300ms.
Provide a parameter '--discovery-timeout' to raise it, if necessary.
Reduce the number of timeouts for version discovery from 2 to 1.

refs: #4291

Change-Id: I459645ab074ed9b15a74baed39f45903fcb31ff1
diff --git a/tools/chunks/catchunks/discover-version-iterative.cpp b/tools/chunks/catchunks/discover-version-iterative.cpp
index 98ca5dd..9d38cfe 100644
--- a/tools/chunks/catchunks/discover-version-iterative.cpp
+++ b/tools/chunks/catchunks/discover-version-iterative.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2016,  Regents of the University of California,
+/*
+ * Copyright (c) 2016-2017,  Regents of the University of California,
  *                      Colorado State University,
  *                      University Pierre & Marie Curie, Sorbonne University.
  *
@@ -23,6 +23,7 @@
  * @author Wentao Shang
  * @author Steve DiBenedetto
  * @author Andrea Tosatto
+ * @author Klaus Schneider
  */
 
 #include "discover-version-iterative.hpp"
@@ -92,6 +93,7 @@
   Interest newInterest(interest);
   newInterest.refreshNonce();
   newInterest.setExclude(exclude);
+  newInterest.setInterestLifetime(discoveryTimeout);
 
   if (m_foundVersion)
     expressInterest(newInterest, maxRetriesOnTimeoutOrNack, maxRetriesAfterVersionFound);