From acbead59d307a10952cee41792e9397a2334f0da Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@anytun.org>
Date: Wed, 9 Apr 2008 21:22:30 +0000
Subject: cipher added mux to senderid for crypto fixed payload type with ipv6
 fixed lua script options: device defaults to tun

---
 plainPacket.cpp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'plainPacket.cpp')

diff --git a/plainPacket.cpp b/plainPacket.cpp
index c1fd99a..c3aa089 100644
--- a/plainPacket.cpp
+++ b/plainPacket.cpp
@@ -55,7 +55,18 @@ payload_type_t PlainPacket::getPayloadType() const
 
 void PlainPacket::setPayloadType(payload_type_t payload_type)
 {
-  if(payload_type_)
+  if(!payload_type_)
+    return;
+  
+  if(payload_type == PAYLOAD_TYPE_TUN)
+  {
+    struct ip* hdr = reinterpret_cast<struct ip*>(payload_);
+    if(hdr->ip_v == 4)
+      *payload_type_ = PAYLOAD_TYPE_T_HTON(PAYLOAD_TYPE_TUN4);
+    else if(hdr->ip_v == 6)
+      *payload_type_ = PAYLOAD_TYPE_T_HTON(PAYLOAD_TYPE_TUN6);
+  }
+  else
     *payload_type_ = PAYLOAD_TYPE_T_HTON(payload_type);
 }
 
@@ -106,7 +117,7 @@ NetworkAddress PlainPacket::getSrcAddr() const
         // TODO
     return NetworkAddress();
   }
-  else if(type == PAYLOAD_TYPE_TUN) // IPv4
+  else if(type == PAYLOAD_TYPE_TUN4) // IPv4
   {
     if(length_ < (sizeof(payload_type_t)+sizeof(struct ip)))
       return NetworkAddress();
@@ -135,7 +146,7 @@ NetworkAddress PlainPacket::getDstAddr() const
         // TODO
     return NetworkAddress();
   }
-  else if(type == PAYLOAD_TYPE_TUN) // IPv4
+  else if(type == PAYLOAD_TYPE_TUN4) // IPv4
   {
     if(length_ < (sizeof(payload_type_t)+sizeof(struct ip)))
       return NetworkAddress();
-- 
cgit v1.2.3