Imported Upstream version 0.3.5

[anytun.git] / src / anyrtpproxy / portWindow.h

diff --git a/src/anyrtpproxy/portWindow.h b/src/anyrtpproxy/portWindow.h
index b5a667f..c2df76e 100644 (file)
--- a/src/anyrtpproxy/portWindow.h
+++ b/src/anyrtpproxy/portWindow.h
@@ -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.
  */
 
 #ifndef _PORT_WINDOW_H_
@@ -40,26 +53,26 @@
 class PortWindow
 {
 public:
-  typedef std::set<u_int16_t> PortSet;
+  typedef std::set<uint16_t> PortSet;
 
-  PortWindow(u_int16_t,u_int16_t);
+  PortWindow(uint16_t,uint16_t);
   ~PortWindow();
 
   PortSet::size_type getLength();
-  bool hasPort(u_int16_t);
-  bool freePort(u_int16_t);
-  u_int16_t newPort();
+  bool hasPort(uint16_t);
+  bool freePort(uint16_t);
+  uint16_t newPort();
   void clear();
 
 
 private:
-       u_int16_t start_port_;
-       u_int16_t end_port_;
+  uint16_t start_port_;
+  uint16_t end_port_;
   ::Mutex mutex_;
-       PortSet ports_;
+  PortSet ports_;
 
-  PortWindow(const PortWindow &s);
-  void operator=(const PortWindow &s);
+  PortWindow(const PortWindow& s);
+  void operator=(const PortWindow& s);
 };
 
 #endif