X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2FseqWindow.cpp;h=e2f94766a03255f22ec0d6d04ed70596a789da73;hb=eadcba6b0fd5c506e953a6a6e63f43cd880c8b0e;hp=359ba63667db6653cbfd100e196441f6c852fe17;hpb=bb834fe0ed7a38b724f49b944adb801634eb6194;p=anytun.git

diff --git a/src/seqWindow.cpp b/src/seqWindow.cpp
index 359ba63..e2f9476 100644
--- a/src/seqWindow.cpp
+++ b/src/seqWindow.cpp
@@ -6,12 +6,12 @@
  *  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-2009 Othmar Gsenger, Erwin Nindl, 
+ *  Copyright (C) 2007-2014 Markus Grüneis, Othmar Gsenger, Erwin Nindl,
  *                          Christian Pointner <satp@wirdorange.org>
  *
  *  This file is part of Anytun.
@@ -27,7 +27,20 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with anytun.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with Anytun.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *  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 "threadUtils.hpp"
@@ -44,16 +57,18 @@ SeqWindowElement::SeqWindowElement()
 
 SeqWindowElement::~SeqWindowElement()
 {
-  if(window_)
+  if(window_) {
     delete[] window_;
+  }
 }
 
 void SeqWindowElement::init(window_size_t w, seq_nr_t m)
 {
-  if(window_)
+  if(window_) {
     delete[] window_;
-  window_ = new u_int8_t[w];
-  memset(window_, 0, w); 
+  }
+  window_ = new uint8_t[w];
+  memset(window_, 0, w);
   pos_ = 0;
   max_ = m;
   window_[pos_] = 1;
@@ -70,8 +85,9 @@ SeqWindow::~SeqWindow()
 bool SeqWindow::checkAndAdd(sender_id_t sender, seq_nr_t seq_nr)
 {
   Lock lock(mutex_);
-  if (!window_size_)
+  if(!window_size_) {
     return false;
+  }
 
   SenderMap::iterator s = sender_.find(sender);
   if(s == sender_.end()) {
@@ -84,67 +100,71 @@ bool SeqWindow::checkAndAdd(sender_id_t sender, seq_nr_t seq_nr)
     s->second.max_ += SEQ_NR_MAX/2;
     seq_nr += SEQ_NR_MAX/2;
     shifted = 1;
-  }
-  else if(s->second.max_ > (SEQ_NR_MAX - window_size_)) {
+  } else if(s->second.max_ > (SEQ_NR_MAX - window_size_)) {
     s->second.max_ -= SEQ_NR_MAX/2;
     seq_nr -= SEQ_NR_MAX/2;
     shifted = 2;
   }
-  
+
   seq_nr_t min = s->second.max_ - window_size_ + 1;
   if(seq_nr < min || seq_nr == s->second.max_) {
-    if(shifted == 1)
+    if(shifted == 1) {
       s->second.max_ -= SEQ_NR_MAX/2;
-    else if(shifted == 2)
+    } else if(shifted == 2) {
       s->second.max_ += SEQ_NR_MAX/2;
+    }
     return true;
   }
-  
+
   if(seq_nr > s->second.max_) {
     seq_nr_t diff = seq_nr - s->second.max_;
-    if(diff >= window_size_)
+    if(diff >= window_size_) {
       diff = window_size_;
-    
+    }
+
     window_size_t new_pos = s->second.pos_ + diff;
-    
+
     if(new_pos >= window_size_) {
       new_pos -= window_size_;
-      
-      if(s->second.pos_ < window_size_ - 1)
+
+      if(s->second.pos_ < window_size_ - 1) {
         memset(&(s->second.window_[s->second.pos_ + 1]), 0, window_size_ - s->second.pos_ - 1);
-      
+      }
+
       memset(s->second.window_, 0, new_pos);
-    }
-    else {
+    } else {
       memset(&(s->second.window_[s->second.pos_ + 1]), 0, diff);
     }
     s->second.pos_ = new_pos;
     s->second.window_[s->second.pos_] = 1;
     s->second.max_ = seq_nr;
-    
-    if(shifted == 1)
+
+    if(shifted == 1) {
       s->second.max_ -= SEQ_NR_MAX/2;
-    else if(shifted == 2)
+    } else if(shifted == 2) {
       s->second.max_ += SEQ_NR_MAX/2;
-    
+    }
+
     return false;
   }
-  
+
   seq_nr_t diff = s->second.max_ - seq_nr;
-  window_size_t pos = diff > s->second.pos_ ? s->second.pos_ + window_size_ : s->second.pos_; 
+  window_size_t pos = diff > s->second.pos_ ? s->second.pos_ + window_size_ : s->second.pos_;
   pos -= diff;
-  
-  if(shifted == 1)
+
+  if(shifted == 1) {
     s->second.max_ -= SEQ_NR_MAX/2;
-  else if(shifted == 2)
+  } else if(shifted == 2) {
     s->second.max_ += SEQ_NR_MAX/2;
-  
+  }
+
   int ret = s->second.window_[pos];
   s->second.window_[pos] = 1;
-  
-  if(ret)
+
+  if(ret) {
     return true;
-  
+  }
+
   return false;
 }