X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;ds=sidebyside;f=src%2FthreadUtils.hpp;h=ae74c09b5718937779b89bc038dcdb73d67a8260;hb=refs%2Fheads%2Fupstream;hp=85500c1d190ddea20cca559f65814399b9dfd97e;hpb=058ae090a970436caec3b3059e9e18b310dd6b0d;p=anytun.git

diff --git a/src/threadUtils.hpp b/src/threadUtils.hpp
index 85500c1..ae74c09 100644
--- a/src/threadUtils.hpp
+++ b/src/threadUtils.hpp
@@ -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,14 +27,32 @@
  *  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 ANYTUN_threadUtils_hpp_INCLUDED
+#define ANYTUN_threadUtils_hpp_INCLUDED
+
 #include <boost/thread.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/shared_mutex.hpp>
+#include <boost/thread/condition.hpp>
+
 #include "datatypes.h"
-#ifndef __THREADUTILS__
-#define __THREADUTILS__
+
 typedef boost::mutex::scoped_lock Lock;
 typedef boost::mutex Mutex;
 
@@ -45,20 +64,19 @@ class Semaphore
 {
 public:
   Semaphore(unsigned int initVal=0)
-    :count_(initVal){};
-  void up()
-  {
-     boost::mutex::scoped_lock lock(mutex_);
-     count_++;
-     lock.unlock();
-     cond_.notify_one();
+    :count_(initVal) {};
+  void up() {
+    boost::mutex::scoped_lock lock(mutex_);
+    count_++;
+    lock.unlock();
+    cond_.notify_one();
   }
-  void down()
-  {
-     boost::mutex::scoped_lock lock(mutex_);
-     while (count_ <= 0)
-       cond_.wait(lock);
-     count_--;
+  void down() {
+    boost::mutex::scoped_lock lock(mutex_);
+    while(count_ <= 0) {
+      cond_.wait(lock);
+    }
+    count_--;
   }
 private:
   boost::mutex mutex_;