X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2Fanyrtpproxy%2FsyncRtpCommand.h;h=c0dfff38cd116c9dce4dcca99f904160bbc4c54c;hb=4022c01b494945eff22115d535228d7f1c5f3369;hp=282243b98cd9296fff8c56ef36f63ee56db6a6ac;hpb=058ae090a970436caec3b3059e9e18b310dd6b0d;p=anytun.git

diff --git a/src/anyrtpproxy/syncRtpCommand.h b/src/anyrtpproxy/syncRtpCommand.h
index 282243b..c0dfff3 100644
--- a/src/anyrtpproxy/syncRtpCommand.h
+++ b/src/anyrtpproxy/syncRtpCommand.h
@@ -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,8 +27,22 @@
  *  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 _SYNCRTPCOMMAND_H
 #define _SYNCRTPCOMMAND_H
 #include <boost/archive/text_oarchive.hpp>
@@ -39,22 +54,21 @@
 class SyncRtpCommand
 {
 public:
-	SyncRtpCommand(const std::string & );
-	SyncRtpCommand();
-	std::string getCallId() const;
+  SyncRtpCommand(const std::string&);
+  SyncRtpCommand();
+  std::string getCallId() const;
 
 private:
-	SyncRtpCommand(const SyncRtpCommand &);
-	std::string callid_;
+  SyncRtpCommand(const SyncRtpCommand&);
+  std::string callid_;
   friend class boost::serialization::access;
   template<class Archive>
-  void serialize(Archive & ar, const unsigned int version)
-  {
-		Lock lock(gRtpSessionTable.getMutex());
-		ar & callid_;
+  void serialize(Archive& ar, const unsigned int version) {
+    Lock lock(gRtpSessionTable.getMutex());
+    ar& callid_;
     bool is_new;
-		ar & gRtpSessionTable.getOrNewSessionUnlocked(callid_, is_new);
-	};
+    ar& gRtpSessionTable.getOrNewSessionUnlocked(callid_, is_new);
+  };
 };