projects
/
anytun.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 0.3.4
[anytun.git]
/
src
/
encryptedPacket.h
diff --git
a/src/encryptedPacket.h
b/src/encryptedPacket.h
index
bd321b3
..
221c534
100644
(file)
--- a/
src/encryptedPacket.h
+++ b/
src/encryptedPacket.h
@@
-11,7
+11,7
@@
* tunneling and relaying of packets of any protocol.
*
*
* 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 <satp@wirdorange.org>
*
* This file is part of Anytun.
* Christian Pointner <satp@wirdorange.org>
*
* This file is part of Anytun.
@@
-43,10
+43,10
@@
public:
/**
* Packet constructor
/**
* Packet constructor
- * @param the length of the payload
+ * @param the length of the payload
* @param allow reallocation of buffer
*/
* @param allow reallocation of buffer
*/
- EncryptedPacket(u
_int32_t payload_length, u_
int32_t auth_tag_length, bool allow_realloc = false);
+ EncryptedPacket(u
int32_t payload_length, u
int32_t auth_tag_length, bool allow_realloc = false);
/**
* Packet destructor
/**
* Packet destructor
@@
-57,7
+57,7
@@
public:
* Get the length of the header
* @return the length of the header
*/
* 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
/**
* Get the sequence number
@@
-107,53
+107,52
@@
public:
* Get the length of the payload
* @return the length of the payload
*/
* 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
*/
/**
* 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
*/
/**
* 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();
void withAuthTag(bool b);
void addAuthTag();
void removeAuthTag();
- u
_
int8_t* getAuthTag();
- u
_
int32_t getAuthTagLength();
-
+ uint8_t* getAuthTag();
+ uint32_t getAuthTagLength();
+
private:
EncryptedPacket();
private:
EncryptedPacket();
- EncryptedPacket(const EncryptedPacket
&
src);
+ EncryptedPacket(const EncryptedPacket
&
src);
void reinit();
#ifdef _MSC_VER
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
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_;
#endif
struct HeaderStruct* header_;
-
u_int8_t
* payload_;
- u
_int8_t
* auth_tag_;
- u
_
int32_t auth_tag_length_;
+
uint8_t
* payload_;
+ u
int8_t
* auth_tag_;
+ uint32_t auth_tag_length_;
};
#endif
};
#endif