|
@@ -12,6 +12,20 @@
|
|
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
// PERFORMANCE OF THIS SOFTWARE.
|
|
// PERFORMANCE OF THIS SOFTWARE.
|
|
|
|
|
|
|
|
+#include <exceptions/exceptions.h>
|
|
|
|
+
|
|
|
|
+#include <util/buffer.h>
|
|
|
|
+
|
|
|
|
+#include <dns/name.h>
|
|
|
|
+#include <dns/messagerenderer.h>
|
|
|
|
+#include <dns/master_lexer.h>
|
|
|
|
+#include <dns/rdata.h>
|
|
|
|
+#include <dns/rrparamregistry.h>
|
|
|
|
+#include <dns/rrtype.h>
|
|
|
|
+
|
|
|
|
+#include <boost/lexical_cast.hpp>
|
|
|
|
+#include <boost/shared_ptr.hpp>
|
|
|
|
+
|
|
#include <algorithm>
|
|
#include <algorithm>
|
|
#include <cctype>
|
|
#include <cctype>
|
|
#include <string>
|
|
#include <string>
|
|
@@ -24,17 +38,6 @@
|
|
#include <stdint.h>
|
|
#include <stdint.h>
|
|
#include <string.h>
|
|
#include <string.h>
|
|
|
|
|
|
-#include <boost/lexical_cast.hpp>
|
|
|
|
-#include <boost/shared_ptr.hpp>
|
|
|
|
-
|
|
|
|
-#include <util/buffer.h>
|
|
|
|
-#include <dns/name.h>
|
|
|
|
-#include <dns/messagerenderer.h>
|
|
|
|
-#include <dns/master_lexer.h>
|
|
|
|
-#include <dns/rdata.h>
|
|
|
|
-#include <dns/rrparamregistry.h>
|
|
|
|
-#include <dns/rrtype.h>
|
|
|
|
-
|
|
|
|
using namespace std;
|
|
using namespace std;
|
|
using boost::lexical_cast;
|
|
using boost::lexical_cast;
|
|
using namespace isc::util;
|
|
using namespace isc::util;
|
|
@@ -113,7 +116,11 @@ fromtextError(bool& error_issued, const MasterLexer& lexer,
|
|
token->getErrorText());
|
|
token->getErrorText());
|
|
break;
|
|
break;
|
|
default:
|
|
default:
|
|
- assert(false);
|
|
|
|
|
|
+ // This case shouldn't happen based on how we use MasterLexer in
|
|
|
|
+ // createRdata(), so we could assert() that here. But since it
|
|
|
|
+ // depends on detailed behavior of other classes, we treat the case
|
|
|
|
+ // in a bit less harsh way.
|
|
|
|
+ isc_throw(Unexpected, "bug: createRdata() saw unexpected token type");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|