X-Git-Url: https://git.syn-net.org/debian/?p=anytun.git;a=blobdiff_plain;f=src%2FencryptedPacket.h;h=221c534bdbd73013b0e79d070e9ffb78c2ed0ae0;hp=bd321b30225b2771e0f0a6e94f35a29410d4677e;hb=ef0cacf2508418915d3f64b04003be3c13fed3cc;hpb=ece844834d2cecc028ce81ca283f5d441088580e diff --git a/src/encryptedPacket.h b/src/encryptedPacket.h index bd321b3..221c534 100644 --- a/src/encryptedPacket.h +++ b/src/encryptedPacket.h @@ -11,7 +11,7 @@ * tunneling and relaying of packets of any protocol. * * - * Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl, + * Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl, * Christian Pointner * * This file is part of Anytun. @@ -43,10 +43,10 @@ public: /** * Packet constructor - * @param the length of the payload + * @param the length of the payload * @param allow reallocation of buffer */ - EncryptedPacket(u_int32_t payload_length, u_int32_t auth_tag_length, bool allow_realloc = false); + EncryptedPacket(uint32_t payload_length, uint32_t auth_tag_length, bool allow_realloc = false); /** * Packet destructor @@ -57,7 +57,7 @@ public: * Get the length of the header * @return the length of the header */ - static u_int32_t getHeaderLength(); + static uint32_t getHeaderLength(); /** * Get the sequence number @@ -107,53 +107,52 @@ public: * Get the length of the payload * @return the length of the payload */ - u_int32_t getPayloadLength() const; + uint32_t getPayloadLength() const; /** * Set the length of the payload * @param length length of the payload */ - void setPayloadLength(u_int32_t payload_length); + void setPayloadLength(uint32_t payload_length); /** * Get the the payload * @return the Pointer to the payload */ - u_int8_t* getPayload(); + uint8_t* getPayload(); - u_int8_t* getAuthenticatedPortion(); - u_int32_t getAuthenticatedPortionLength(); + uint8_t* getAuthenticatedPortion(); + uint32_t getAuthenticatedPortionLength(); void withAuthTag(bool b); void addAuthTag(); void removeAuthTag(); - u_int8_t* getAuthTag(); - u_int32_t getAuthTagLength(); - + uint8_t* getAuthTag(); + uint32_t getAuthTagLength(); + private: EncryptedPacket(); - EncryptedPacket(const EncryptedPacket &src); + EncryptedPacket(const EncryptedPacket& src); void reinit(); #ifdef _MSC_VER - #pragma pack(push, 1) -#endif - struct ATTR_PACKED HeaderStruct - { +#pragma pack(push, 1) +#endif + struct ATTR_PACKED HeaderStruct { seq_nr_t seq_nr; sender_id_t sender_id; mux_t mux; }; #ifdef _MSC_VER - #pragma pack(pop) +#pragma pack(pop) #endif struct HeaderStruct* header_; - u_int8_t * payload_; - u_int8_t * auth_tag_; - u_int32_t auth_tag_length_; + uint8_t* payload_; + uint8_t* auth_tag_; + uint32_t auth_tag_length_; }; #endif