Changeset 6703

Timestamp:

07/18/12 14:03:51 (10 months ago)

Author:

bless@…

Message:

- punt packet to IP stack processing when no interception necessary

Files:

• protlib/trunk/src/tp_queryencap.cpp (modified) (9 diffs)

protlib/trunk/src/tp_queryencap.cpp

@@ -533 +533 @@
         
           // We have to look for RAO option in Hop-by-Hop extension header, if it is NOT set to a value we look for, don't intercept
+          // Hbh-Extension and Destination Option headers have this format:
+          // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+- - - - - - - - -
+          // |  Option Type  |  Opt Data Len |  Option Data
+          // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+- - - - - - - - -
+
           if (intercept)
           {
@@ -594 +599 @@
           }
           else
-          {
+          { // either intercept or no interception yet but maybe rao matching not necessary
             if (intercept)
             {
@@ -607 +612 @@
           }
 
-          int offset = ip6_headerlen; // will point to IP payload, initially size of IPv6 header
+          int offset = ip6_headerlen; // will point to IP payload or next extension header, initially size of IPv6 header
 
           // one RAO value matched (or we do not require strict RAO checking), now check for magic number
@@ -617 +622 @@
             // Now to do: iterate over extension headers to find the start of the UDP header
             // the first extension header is the hop-by-hop options header and it is present
-            // if RAO was used
+            // if RAO was used.
             struct ip6_ext *extheader = (struct ip6_ext *) (m->payload + offset);
                 
@@ -627 +632 @@
             else
             {
-              // assume that some extension header is present
+              // assume that some extension header is present (at least the RAO)
               next_header= extheader->ip6e_nxt;
               // iterate if next header is not UDP
@@ -633 +638 @@
               {
                 // advance to next extension header
+                // Note that the Length of the Hop-by-Hop Options header is given in 8-octet units, 
+                // not including the first 8 octets.
+
                 offset = offset + 8 + (extheader->ip6e_len * 8);
                 if (offset > 20000) // sanity check
@@ -645 +653 @@
               } // end while
             }
+            // now next_header points to UDP content
+
             // set offset to next header following the last extension header that we saw
             offset = offset + 8 + (extheader->ip6e_len * 8);
@@ -737 +747 @@
             tpmsg = new (nothrow) TPMsg (netmsg, peer_addr->copy(), own_addr->copy());
 
-            Log (DEBUG_LOG, LOG_NORMAL, tpparam.name,
+            DLog(tpparam.name,
                  "[IPv6catcher] - receipt of PDU now complete, sending msg#" << tpmsg->get_id() << " to signaling module");
                 
@@ -750 +760 @@
             } // endif
           } // endif intercept
+          else
+          { // this module should not intercept the packet -> pass it on to the normal IP stack processing
+            DLog(tpparam.name,
+                 "[IPv6catcher] - no interception here, will pass it on to IP stack for further processing");
+
+            status = ipq_set_verdict (h, m->packet_id, NF_ACCEPT, 0, NULL);
+            if (status < 0)
+                    die (h);
+
+          }
         } // end case IQM_PACKET
         break;