From ddfc1b38d7bb5cc607afc7fadc6374911f5a9e60 Mon Sep 17 00:00:00 2001 From: Markus Grüneis Date: Wed, 17 Feb 2010 21:40:54 +0000 Subject: whitespace only change: unified formatting with "astyle --style=k/r --indent=spaces=2 --unpad-paren --add-brackets --align-pointer=type --keep-one-line-blocks --indent-col1-comments --lineend=linux --suffix=none --recursive" --- src/encryptedPacket.cpp | 97 ++++++++++++++++++++++++++++--------------------- 1 file changed, 56 insertions(+), 41 deletions(-) (limited to 'src/encryptedPacket.cpp') diff --git a/src/encryptedPacket.cpp b/src/encryptedPacket.cpp index 46235c5..731074b 100644 --- a/src/encryptedPacket.cpp +++ b/src/encryptedPacket.cpp @@ -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. @@ -46,8 +46,7 @@ EncryptedPacket::EncryptedPacket(u_int32_t payload_length, u_int32_t auth_tag_le header_ = reinterpret_cast(buf_); payload_ = buf_ + sizeof(struct HeaderStruct); auth_tag_ = NULL; - if(header_) - { + if(header_) { header_->seq_nr = 0; header_->sender_id = 0; header_->mux = 0; @@ -61,50 +60,57 @@ u_int32_t EncryptedPacket::getHeaderLength() seq_nr_t EncryptedPacket::getSeqNr() const { - if(header_) + if(header_) { return SEQ_NR_T_NTOH(header_->seq_nr); - + } + return 0; } sender_id_t EncryptedPacket::getSenderId() const { - if(header_) + if(header_) { return SENDER_ID_T_NTOH(header_->sender_id); + } return 0; } mux_t EncryptedPacket::getMux() const { - if(header_) + if(header_) { return MUX_T_NTOH(header_->mux); + } return 0; } void EncryptedPacket::setSeqNr(seq_nr_t seq_nr) { - if(header_) + if(header_) { header_->seq_nr = SEQ_NR_T_HTON(seq_nr); + } } void EncryptedPacket::setSenderId(sender_id_t sender_id) { - if(header_) + if(header_) { header_->sender_id = SENDER_ID_T_HTON(sender_id); + } } void EncryptedPacket::setMux(mux_t mux) { - if(header_) + if(header_) { header_->mux = MUX_T_HTON(mux); + } } void EncryptedPacket::setHeader(seq_nr_t seq_nr, sender_id_t sender_id, mux_t mux) { - if(!header_) + if(!header_) { return; + } header_->seq_nr = SEQ_NR_T_HTON(seq_nr); header_->sender_id = SENDER_ID_T_HTON(sender_id); @@ -113,43 +119,45 @@ void EncryptedPacket::setHeader(seq_nr_t seq_nr, sender_id_t sender_id, mux_t mu u_int32_t EncryptedPacket::getPayloadLength() const { - if(!payload_) + if(!payload_) { return 0; + } - if(!auth_tag_) + if(!auth_tag_) { return (length_ > sizeof(struct HeaderStruct)) ? (length_ - sizeof(struct HeaderStruct)) : 0; - + } + return (length_ > (sizeof(struct HeaderStruct) + auth_tag_length_)) ? (length_ - sizeof(struct HeaderStruct) - auth_tag_length_) : 0; } void EncryptedPacket::setPayloadLength(u_int32_t payload_length) { Buffer::setLength(payload_length + sizeof(struct HeaderStruct)); - // depending on allow_realloc buf_ may point to another address - // therefore in this case reinit() gets called by Buffer::setLength() + // depending on allow_realloc buf_ may point to another address + // therefore in this case reinit() gets called by Buffer::setLength() } void EncryptedPacket::reinit() { header_ = reinterpret_cast(buf_); payload_ = buf_ + sizeof(struct HeaderStruct); - - if(length_ <= (sizeof(struct HeaderStruct))) + + if(length_ <= (sizeof(struct HeaderStruct))) { payload_ = NULL; - + } + if(length_ < (sizeof(struct HeaderStruct))) { header_ = NULL; - AnytunError::throwErr() << "encrypted packet can't be initialized, buffer is too small"; - } - - if(auth_tag_) - { + AnytunError::throwErr() << "encrypted packet can't be initialized, buffer is too small"; + } + + if(auth_tag_) { if(length_ < (sizeof(struct HeaderStruct) + auth_tag_length_)) { auth_tag_ = NULL; - AnytunError::throwErr() << "auth-tag can't be enabled, buffer is too small"; + AnytunError::throwErr() << "auth-tag can't be enabled, buffer is too small"; } auth_tag_ = buf_ + length_ - auth_tag_length_; - } + } } u_int8_t* EncryptedPacket::getPayload() @@ -164,46 +172,52 @@ u_int8_t* EncryptedPacket::getAuthenticatedPortion() u_int32_t EncryptedPacket::getAuthenticatedPortionLength() { - if(!buf_) + if(!buf_) { return 0; + } - if(!auth_tag_) + if(!auth_tag_) { return length_; - + } + return (length_ > auth_tag_length_) ? (length_ - auth_tag_length_) : 0; } void EncryptedPacket::withAuthTag(bool b) { - if((b && auth_tag_) || (!b && !auth_tag_)) + if((b && auth_tag_) || (!b && !auth_tag_)) { return; - - if(b) - { - if(length_ < (sizeof(struct HeaderStruct) + auth_tag_length_)) + } + + if(b) { + if(length_ < (sizeof(struct HeaderStruct) + auth_tag_length_)) { AnytunError::throwErr() << "auth-tag can't be enabled, buffer is too small"; - + } + auth_tag_ = buf_ + length_ - auth_tag_length_; - } - else + } else { auth_tag_ = NULL; + } } void EncryptedPacket::addAuthTag() { - if(auth_tag_) + if(auth_tag_) { return; + } auth_tag_ = buf_; // will be set to the correct value @ reinit setLength(length_ + auth_tag_length_); - if(auth_tag_ == buf_) // reinit was not called by setLength + if(auth_tag_ == buf_) { // reinit was not called by setLength reinit(); + } } void EncryptedPacket::removeAuthTag() { - if(!auth_tag_) + if(!auth_tag_) { return; + } auth_tag_ = NULL; setLength(length_ - auth_tag_length_); @@ -216,8 +230,9 @@ u_int8_t* EncryptedPacket::getAuthTag() u_int32_t EncryptedPacket::getAuthTagLength() { - if(auth_tag_) + if(auth_tag_) { return auth_tag_length_; + } return 0; } -- cgit v1.2.3