Compile with the ndn-cxx version 0.6.2
Change-Id: If474dafb9638d7308f566b1264aa5704ba88baac
diff --git a/.waf-tools/default-compiler-flags.py b/.waf-tools/default-compiler-flags.py
index bba2b1e..2be9d90 100644
--- a/.waf-tools/default-compiler-flags.py
+++ b/.waf-tools/default-compiler-flags.py
@@ -1,44 +1,45 @@
# -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
-from waflib import Logs, Configure, Utils
+from waflib import Configure, Logs, Utils
def options(opt):
- opt.add_option('--debug', '--with-debug', action='store_true', default=False, dest='debug',
- help='''Compile in debugging mode with minimal optimizations (-O0 or -Og)''')
+ opt.add_option('--debug', '--with-debug', action='store_true', default=False,
+ help='Compile in debugging mode with minimal optimizations (-O0 or -Og)')
def configure(conf):
conf.start_msg('Checking C++ compiler version')
- cxx = conf.env['CXX_NAME'] # CXX_NAME is the generic name of the compiler
- ccver = tuple(int(i) for i in conf.env['CC_VERSION'])
+ cxx = conf.env.CXX_NAME # generic name of the compiler
+ ccver = tuple(int(i) for i in conf.env.CC_VERSION)
+ ccverstr = '.'.join(conf.env.CC_VERSION)
errmsg = ''
warnmsg = ''
if cxx == 'gcc':
- if ccver < (4, 8, 2):
+ if ccver < (5, 3, 0):
errmsg = ('The version of gcc you are using is too old.\n'
- 'The minimum supported gcc version is 4.8.2.')
+ 'The minimum supported gcc version is 5.3.0.')
conf.flags = GccFlags()
elif cxx == 'clang':
- if ccver < (3, 4, 0):
+ if ccver < (3, 6, 0):
errmsg = ('The version of clang you are using is too old.\n'
- 'The minimum supported clang version is 3.4.0.')
+ 'The minimum supported clang version is 3.6.0.')
conf.flags = ClangFlags()
else:
warnmsg = 'Note: %s compiler is unsupported' % cxx
conf.flags = CompilerFlags()
if errmsg:
- conf.end_msg('.'.join(conf.env['CC_VERSION']), color='RED')
+ conf.end_msg(ccverstr, color='RED')
conf.fatal(errmsg)
elif warnmsg:
- conf.end_msg('.'.join(conf.env['CC_VERSION']), color='YELLOW')
+ conf.end_msg(ccverstr, color='YELLOW')
Logs.warn(warnmsg)
else:
- conf.end_msg('.'.join(conf.env['CC_VERSION']))
+ conf.end_msg(ccverstr)
conf.areCustomCxxflagsPresent = (len(conf.env.CXXFLAGS) > 0)
- # General flags are always applied (e.g., selecting C++11 mode)
+ # General flags are always applied (e.g., selecting C++ language standard)
generalFlags = conf.flags.getGeneralFlags(conf)
conf.add_supported_cxxflags(generalFlags['CXXFLAGS'])
conf.add_supported_linkflags(generalFlags['LINKFLAGS'])
@@ -53,10 +54,10 @@
extraFlags = conf.flags.getDebugFlags(conf)
if conf.areCustomCxxflagsPresent:
missingFlags = [x for x in extraFlags['CXXFLAGS'] if x not in conf.env.CXXFLAGS]
- if len(missingFlags) > 0:
- Logs.warn("Selected debug mode, but CXXFLAGS is set to a custom value '%s'"
- % " ".join(conf.env.CXXFLAGS))
- Logs.warn("Default flags '%s' are not activated" % " ".join(missingFlags))
+ if missingFlags:
+ Logs.warn('Selected debug mode, but CXXFLAGS is set to a custom value "%s"'
+ % ' '.join(conf.env.CXXFLAGS))
+ Logs.warn('Default flags "%s" will not be used' % ' '.join(missingFlags))
else:
extraFlags = conf.flags.getOptimizedFlags(conf)
@@ -106,6 +107,9 @@
class CompilerFlags(object):
+ def getCompilerVersion(self, conf):
+ return tuple(int(i) for i in conf.env.CC_VERSION)
+
def getGeneralFlags(self, conf):
"""Get dict of CXXFLAGS, LINKFLAGS, and DEFINES that are always needed"""
return {'CXXFLAGS': [], 'LINKFLAGS': [], 'DEFINES': []}
@@ -124,7 +128,7 @@
"""
def getGeneralFlags(self, conf):
flags = super(GccBasicFlags, self).getGeneralFlags(conf)
- flags['CXXFLAGS'] += ['-std=c++11']
+ flags['CXXFLAGS'] += ['-std=c++14']
return flags
def getDebugFlags(self, conf):
@@ -160,25 +164,19 @@
class GccFlags(GccBasicFlags):
def getDebugFlags(self, conf):
flags = super(GccFlags, self).getDebugFlags(conf)
- version = tuple(int(i) for i in conf.env['CC_VERSION'])
- if version < (5, 1, 0):
- flags['CXXFLAGS'] += ['-Wno-missing-field-initializers']
- flags['CXXFLAGS'] += ['-fdiagnostics-color'] # gcc >= 4.9
+ flags['CXXFLAGS'] += ['-fdiagnostics-color']
return flags
def getOptimizedFlags(self, conf):
flags = super(GccFlags, self).getOptimizedFlags(conf)
- version = tuple(int(i) for i in conf.env['CC_VERSION'])
- if version < (5, 1, 0):
- flags['CXXFLAGS'] += ['-Wno-missing-field-initializers']
- flags['CXXFLAGS'] += ['-fdiagnostics-color'] # gcc >= 4.9
+ flags['CXXFLAGS'] += ['-fdiagnostics-color']
return flags
class ClangFlags(GccBasicFlags):
def getGeneralFlags(self, conf):
flags = super(ClangFlags, self).getGeneralFlags(conf)
- version = tuple(int(i) for i in conf.env['CC_VERSION'])
- if Utils.unversioned_sys_platform() == 'darwin' and version >= (9, 0, 0): # Bug #4296
+ if Utils.unversioned_sys_platform() == 'darwin' and self.getCompilerVersion(conf) >= (9, 0, 0):
+ # Bug #4296
flags['CXXFLAGS'] += [['-isystem', '/usr/local/include'], # for Homebrew
['-isystem', '/opt/local/include']] # for MacPorts
return flags
@@ -194,7 +192,7 @@
'-Wno-error=unneeded-internal-declaration', # Bug #1588
'-Wno-unused-local-typedef', # Bugs #2657 and #3209
]
- version = tuple(int(i) for i in conf.env['CC_VERSION'])
+ version = self.getCompilerVersion(conf)
if version < (3, 9, 0) or (Utils.unversioned_sys_platform() == 'darwin' and version < (8, 1, 0)):
flags['CXXFLAGS'] += ['-Wno-unknown-pragmas']
return flags
@@ -206,7 +204,7 @@
'-Wundefined-func-template',
'-Wno-unused-local-typedef', # Bugs #2657 and #3209
]
- version = tuple(int(i) for i in conf.env['CC_VERSION'])
+ version = self.getCompilerVersion(conf)
if version < (3, 9, 0) or (Utils.unversioned_sys_platform() == 'darwin' and version < (8, 1, 0)):
flags['CXXFLAGS'] += ['-Wno-unknown-pragmas']
return flags
diff --git a/src/challenge-module.cpp b/src/challenge-module.cpp
index c1f3432..f40e5b9 100644
--- a/src/challenge-module.cpp
+++ b/src/challenge-module.cpp
@@ -124,7 +124,7 @@
json.put(JSON_REQUEST_ID, requestId);
std::stringstream ss;
boost::property_tree::write_json(ss, json);
- Block jsonBlock = makeStringBlock(ndn::tlv::NameComponent, ss.str());
+ Block jsonBlock = makeStringBlock(ndn::tlv::GenericNameComponent, ss.str());
Name name = caName;
name.append("_DOWNLOAD").append(jsonBlock);
return name;
diff --git a/src/challenge-module/challenge-email.cpp b/src/challenge-module/challenge-email.cpp
index c63961c..b65d331 100644
--- a/src/challenge-module/challenge-email.cpp
+++ b/src/challenge-module/challenge-email.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2017, Regents of the University of California.
+ * Copyright (c) 2017-2018, Regents of the University of California.
*
* This file is part of ndncert, a certificate management system based on NDN.
*
@@ -20,7 +20,7 @@
#include "challenge-email.hpp"
#include "../logging.hpp"
-#include <boost/regex.hpp>
+#include <regex>
namespace ndn {
namespace ndncert {
@@ -179,9 +179,9 @@
bool
ChallengeEmail::isValidEmailAddress(const std::string& emailAddress)
{
- std::string pattern = R"_REGEX_((^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+.[a-zA-Z0-9\-\.]+$))_REGEX_";
- boost::regex emailPattern(pattern);
- return boost::regex_match(emailAddress, emailPattern);
+ const std::string pattern = R"_REGEX_((^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+.[a-zA-Z0-9\-\.]+$))_REGEX_";
+ static const std::regex emailPattern(pattern);
+ return std::regex_match(emailAddress, emailPattern);
}
void
diff --git a/src/client-module.cpp b/src/client-module.cpp
index fff47af..0c9565e 100644
--- a/src/client-module.cpp
+++ b/src/client-module.cpp
@@ -508,7 +508,7 @@
{
std::stringstream ss;
boost::property_tree::write_json(ss, json);
- return makeStringBlock(ndn::tlv::NameComponent, ss.str());
+ return makeStringBlock(ndn::tlv::GenericNameComponent, ss.str());
}
bool
diff --git a/tests/unit-tests/challenge-email.t.cpp b/tests/unit-tests/challenge-email.t.cpp
index f048f61..f723f6a 100644
--- a/tests/unit-tests/challenge-email.t.cpp
+++ b/tests/unit-tests/challenge-email.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2017, Regents of the University of California.
+ * Copyright (c) 2017-2018, Regents of the University of California.
*
* This file is part of ndncert, a certificate management system based on NDN.
*
@@ -65,7 +65,7 @@
emailJson.put(ChallengeEmail::JSON_EMAIL, "zhiyi@cs.ucla.edu");
std::stringstream ss;
boost::property_tree::write_json(ss, emailJson);
- Block jsonContent = makeStringBlock(ndn::tlv::NameComponent, ss.str());
+ Block jsonContent = makeStringBlock(ndn::tlv::GenericNameComponent, ss.str());
Name interestName("/ndn/site1/CA");
interestName.append("_SELECT").append("Fake-Request-ID").append("EMAIL").append(jsonContent);
@@ -106,7 +106,7 @@
emailJson.put(ChallengeEmail::JSON_EMAIL, "zhiyi@cs");
std::stringstream ss;
boost::property_tree::write_json(ss, emailJson);
- Block jsonContent = makeStringBlock(ndn::tlv::NameComponent, ss.str());
+ Block jsonContent = makeStringBlock(ndn::tlv::GenericNameComponent, ss.str());
Name interestName("/ndn/site1/CA");
interestName.append("_SELECT").append("Fake-Request-ID").append("EMAIL").append(jsonContent);
@@ -140,7 +140,7 @@
infoJson.put(ChallengeEmail::JSON_CODE, "4567");
std::stringstream ss;
boost::property_tree::write_json(ss, infoJson);
- Block jsonContent = makeStringBlock(ndn::tlv::NameComponent, ss.str());
+ Block jsonContent = makeStringBlock(ndn::tlv::GenericNameComponent, ss.str());
Name interestName("/ndn/site1/CA");
interestName.append("_VALIDATE").append("Fake-Request-ID").append("EMAIL").append(jsonContent);
@@ -174,7 +174,7 @@
infoJson.put(ChallengeEmail::JSON_CODE, "1234");
std::stringstream ss;
boost::property_tree::write_json(ss, infoJson);
- Block jsonContent = makeStringBlock(ndn::tlv::NameComponent, ss.str());
+ Block jsonContent = makeStringBlock(ndn::tlv::GenericNameComponent, ss.str());
Name interestName("/ndn/site1/CA");
interestName.append("_VALIDATE").append("Fake-Request-ID").append("EMAIL").append(jsonContent);
diff --git a/tests/unit-tests/challenge-pin.t.cpp b/tests/unit-tests/challenge-pin.t.cpp
index 633dd8f..2b7e377 100644
--- a/tests/unit-tests/challenge-pin.t.cpp
+++ b/tests/unit-tests/challenge-pin.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2017, Regents of the University of California.
+ * Copyright (c) 2017-2018, Regents of the University of California.
*
* This file is part of ndncert, a certificate management system based on NDN.
*
@@ -18,8 +18,8 @@
* See AUTHORS.md for complete list of ndncert authors and contributors.
*/
-#include "identity-management-fixture.hpp"
#include "challenge-module/challenge-pin.hpp"
+#include "identity-management-fixture.hpp"
namespace ndn {
namespace ndncert {
@@ -87,7 +87,7 @@
std::stringstream ss;
boost::property_tree::write_json(ss, infoJson);
std::string jsonString = ss.str();
- Block jsonContent = makeStringBlock(ndn::tlv::NameComponent, ss.str());
+ Block jsonContent = makeStringBlock(ndn::tlv::GenericNameComponent, ss.str());
Name interestName("/ndn/site1/CA");
interestName.append("_VALIDATE").append("Fake-Request-ID").append("PIN").append(jsonContent);
@@ -122,7 +122,7 @@
std::stringstream ss;
boost::property_tree::write_json(ss, infoJson);
std::string jsonString = ss.str();
- Block jsonContent = makeStringBlock(ndn::tlv::NameComponent, ss.str());
+ Block jsonContent = makeStringBlock(ndn::tlv::GenericNameComponent, ss.str());
Name interestName("/ndn/site1/CA");
interestName.append("_VALIDATE").append("Fake-Request-ID").append("PIN").append(jsonContent);
diff --git a/tools/ndncert-ca-server.cpp b/tools/ndncert-ca-server.cpp
index 9e25555..c666d34 100644
--- a/tools/ndncert-ca-server.cpp
+++ b/tools/ndncert-ca-server.cpp
@@ -105,7 +105,11 @@
auto issuedCert = request.getCert();
using namespace boost::asio::ip;
tcp::iostream requestStream;
+#if BOOST_VERSION >= 106700
+ requestStream.expires_after(std::chrono::seconds(3));
+#else
requestStream.expires_from_now(boost::posix_time::seconds(3));
+#endif // BOOST_VERSION >= 106700
requestStream.connect(repoHost, repoPort);
if (!requestStream) {
std::cerr << "ERROR: Cannot publish certificate to repo-ng"