X-Git-Url: https://git.syn-net.org/?p=debian%2Fuanytun.git;a=blobdiff_plain;f=src%2Fplain_packet.c;h=868ebd8033242ec2f2953594054e6a4f239b9998;hp=1d7ba2b884b60569b555e4dda7107449ca82ed56;hb=49edb2f365c78df40996baf53a984d8674978223;hpb=b81b2c1954fe3e3317e6fa260c5ffdc9eeee966c diff --git a/src/plain_packet.c b/src/plain_packet.c index 1d7ba2b..868ebd8 100644 --- a/src/plain_packet.c +++ b/src/plain_packet.c @@ -10,18 +10,19 @@ * tunnel endpoints. It has less protocol overhead than IPSec in Tunnel * mode and allows tunneling of every ETHER TYPE protocol (e.g. * ethernet, ip, arp ...). satp directly includes cryptography and - * message authentication based on the methodes used by SRTP. It is + * message authentication based on the methods used by SRTP. It is * intended to deliver a generic, scaleable and secure solution for * tunneling and relaying of packets of any protocol. - * * - * Copyright (C) 2007-2008 Christian Pointner + * + * Copyright (C) 2007-2014 Christian Pointner * * This file is part of uAnytun. * * uAnytun is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 3 as - * published by the Free Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. * * uAnytun is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -30,6 +31,19 @@ * * You should have received a copy of the GNU General Public License * along with uAnytun. If not, see . + * + * In addition, as a special exception, the copyright holders give + * permission to link the code of portions of this program with the + * OpenSSL library under certain conditions as described in each + * individual source file, and distribute linked combinations + * including the two. + * You must obey the GNU General Public License in all respects + * for all of the code used other than OpenSSL. If you modify + * file(s) with this exception, you may extend this exception to your + * version of the file(s), but you are not obligated to do so. If you + * do not wish to do so, delete this exception statement from your + * version. If you delete this exception statement from all source + * files in the program, then also delete it here. */ #include "datatypes.h" @@ -76,7 +90,7 @@ void plain_packet_set_length(plain_packet_t* packet, u_int32_t len) { if(!packet) return; - + if(len > PLAIN_PACKET_SIZE_MAX) len = PLAIN_PACKET_SIZE_MAX - sizeof(payload_type_t); else if(len < sizeof(payload_type_t)) @@ -84,7 +98,7 @@ void plain_packet_set_length(plain_packet_t* packet, u_int32_t len) else len -= sizeof(payload_type_t); - packet->payload_length_ = len; + packet->payload_length_ = len; } u_int8_t* plain_packet_get_payload(plain_packet_t* packet)