[trac4269] Add documentation and test for handling pkt4 as input

diff --git a/doc/guide/classify.xml b/doc/guide/classify.xml
index e18e993e7e4a4f9b448e374063b15dde5ae6174f..2aca1e4e314f2c7bf5e3a3c55af1324d62e10421 100644 (file)
--- a/doc/guide/classify.xml
+++ b/doc/guide/classify.xml
@@ -169,6 +169,20 @@
 sub-option</entry><entry>relay4[code].hex</entry><entry>The value of
 sub-option with code "code" from the DHCPv4 Relay Agent Information option
 (option 82)</entry></row>
+<row>
+  <entry>Message Type in DHCPv6 packet</entry>
+  <entry>pkt6.msgtype</entry>
+<!--  <entry>'1'</entry>
+-->
+  <entry>The value of the message type field in the DHCPv6 packet.</entry>
+</row>
+<row>
+  <entry>Transaction ID in DHCPv6 packet</entry>
+  <entry>pkt6.transid</entry>
+<!--  <entry>'12345'</entry>
+-->
+  <entry>The value of the transaction id in the DHCPv6 packet.</entry>
+</row>
           </tbody>
           </tgroup>
         </table>
@@ -209,6 +223,14 @@ sub-option with code "code" from the DHCPv4 Relay Agent Information option
        instance "relay4[code].exists" is supported.
       </para>
 
+      <para>
+       "pkt6" refers to information from the client request.  To access any
+       information from an intermediate relay use "relay6".  "pkt6.msgtype"
+       outputs the string representation of the integer value for the message
+       type, for example SOLICIT will be '1'.  "pkt6.transid" outputs the string
+       representation of the value of the transaction ID.
+      </para>
+
       <para>
         <table frame="all" id="classification-expressions-list">
           <title>List of Classification Expressions</title>

diff --git a/src/lib/eval/tests/token_unittest.cc b/src/lib/eval/tests/token_unittest.cc
index 176b267113376187143d915f78139366563a5c6e..bd63f1a68f27a6d7f4c80f103e661dfb31b85325 100644 (file)
--- a/src/lib/eval/tests/token_unittest.cc
+++ b/src/lib/eval/tests/token_unittest.cc
@@ -985,4 +985,9 @@ TEST_F(TokenTest, pkt6Fields) {
     EXPECT_NO_THROW(t_->evaluate(*pkt6_, values_));
     ASSERT_EQ(1, values_.size());
     EXPECT_EQ("12345", values_.top());
+
+    // Check that working with a v4 packet generates an error
+    clearStack();
+    ASSERT_NO_THROW(t_.reset(new TokenPkt6(TokenPkt6::TRANSID)));
+    EXPECT_THROW(t_->evaluate(*pkt4_, values_), EvalTypeError);
 }