X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2Fanyrtpproxy%2FportWindow.cpp;h=7fb835c41d26699553940d13eada92216e439763;hb=5123ec3335dda691676f62467c57edc2517a5d5c;hp=99dafd700f218af9c9f23b64442d410f52606f4d;hpb=058ae090a970436caec3b3059e9e18b310dd6b0d;p=anytun.git

diff --git a/src/anyrtpproxy/portWindow.cpp b/src/anyrtpproxy/portWindow.cpp
index 99dafd7..7fb835c 100644
--- a/src/anyrtpproxy/portWindow.cpp
+++ b/src/anyrtpproxy/portWindow.cpp
@@ -6,19 +6,20 @@
  *  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 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.
  *
  *  Anytun 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.
  *
  *  Anytun is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,12 +27,25 @@
  *  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 "portWindow.h"
 
-PortWindow::PortWindow(u_int16_t start, u_int16_t end) : start_port_(start), end_port_(end)
+PortWindow::PortWindow(uint16_t start, uint16_t end) : start_port_(start), end_port_(end)
 {
 }
 
@@ -45,37 +59,41 @@ PortWindow::PortSet::size_type PortWindow::getLength()
   return ports_.size();
 }
 
-bool PortWindow::hasPort(u_int16_t port)
+bool PortWindow::hasPort(uint16_t port)
 {
   Lock lock(mutex_);
 
   PortSet::const_iterator it=ports_.find(port);
-  if(it == ports_.end())
+  if(it == ports_.end()) {
     return false;
+  }
   return true;
 }
 
-bool PortWindow::freePort(u_int16_t port)
+bool PortWindow::freePort(uint16_t port)
 {
   Lock lock(mutex_);
 
   PortSet::iterator it=ports_.find(port);
-  if(it == ports_.end())
+  if(it == ports_.end()) {
     return false;
-	ports_.erase(it);
+  }
+  ports_.erase(it);
   return true;
 }
 
-u_int16_t PortWindow::newPort()
+uint16_t PortWindow::newPort()
 {
   Lock lock(mutex_);
-	u_int16_t port= start_port_;
-	while (port<end_port_ && ports_.find(port) !=ports_.end())
-	  port++;
-  if (port>=end_port_)
-		return 0;
-	ports_.insert(port);
-	return port;
+  uint16_t port= start_port_;
+  while(port<end_port_ && ports_.find(port) !=ports_.end()) {
+    port++;
+  }
+  if(port>=end_port_) {
+    return 0;
+  }
+  ports_.insert(port);
+  return port;
 }
 
 void PortWindow::clear()