From f48852fd961e8cdae2d36fad4dc76ffa1daf1215 Mon Sep 17 00:00:00 2001 From: Othmar Gsenger Date: Fri, 29 Feb 2008 15:51:43 +0000 Subject: sender early setting of payload type --- anytun.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'anytun.cpp') diff --git a/anytun.cpp b/anytun.cpp index f607790..616e1e2 100644 --- a/anytun.cpp +++ b/anytun.cpp @@ -141,6 +141,13 @@ void* sender(void* p) // read packet from device u_int32_t len = param->dev.read(plain_packet.getPayload(), plain_packet.getPayloadLength()); plain_packet.setPayloadLength(len); + // set payload type + if(param->dev.getType() == TunDevice::TYPE_TUN) + plain_packet.setPayloadType(PAYLOAD_TYPE_TUN); + else if(param->dev.getType() == TunDevice::TYPE_TAP) + plain_packet.setPayloadType(PAYLOAD_TYPE_TAP); + else + plain_packet.setPayloadType(0); if(param->cl.empty()) continue; @@ -152,14 +159,6 @@ void* sender(void* p) continue; ConnectionParam & conn = cit->second; - // set payload type - if(param->dev.getType() == TunDevice::TYPE_TUN) - plain_packet.setPayloadType(PAYLOAD_TYPE_TUN); - else if(param->dev.getType() == TunDevice::TYPE_TAP) - plain_packet.setPayloadType(PAYLOAD_TYPE_TAP); - else - plain_packet.setPayloadType(0); - // generate packet-key conn.kd_.generate(LABEL_SATP_ENCRYPTION, conn.seq_nr_, session_key); conn.kd_.generate(LABEL_SATP_SALT, conn.seq_nr_, session_salt); -- cgit v1.2.3