X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2Fanyrtpproxy%2FrtpSession.h;h=cfdd36ce9cf8c9eeac4d7b5befe740f10f312d6d;hb=bd02a5f6be4815d46524d613f727199ca756c971;hp=3716c9ba8b3948ac032f6e12df7dbdb5381a1728;hpb=058ae090a970436caec3b3059e9e18b310dd6b0d;p=anytun.git

diff --git a/src/anyrtpproxy/rtpSession.h b/src/anyrtpproxy/rtpSession.h
index 3716c9b..cfdd36c 100644
--- a/src/anyrtpproxy/rtpSession.h
+++ b/src/anyrtpproxy/rtpSession.h
@@ -11,14 +11,15 @@
  *  tunneling and relaying of packets of any protocol.
  *
  *
- *  Copyright (C) 2007-2008 Othmar Gsenger, Erwin Nindl, 
+ *  Copyright (C) 2007-2009 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
@@ -44,7 +45,7 @@ class RtpSession
 public:
   typedef boost::asio::ip::udp proto;
 
-	RtpSession(const std::string& call_id);
+  RtpSession(const std::string& call_id);
 
   bool isDead();
   bool isDead(bool d);
@@ -62,71 +63,71 @@ public:
   proto::endpoint getRemoteEnd2();
   RtpSession& setRemoteEnd2(proto::endpoint e);
 
-	RtpSession& setSeen1();
+  RtpSession& setSeen1();
   bool getSeen1();
 
-	RtpSession& setSeen2();
+  RtpSession& setSeen2();
   bool getSeen2();
 
 private:
-	RtpSession(const RtpSession & src);
-  
+  RtpSession(const RtpSession& src);
+
   void reinit();
 
   //TODO: check if this is ok
   friend class boost::serialization::access;
   template<class Archive>
-  void serialize(Archive & ar, const unsigned int version)
-	{    
+  void serialize(Archive& ar, const unsigned int version) {
     Lock lock(mutex_);
 
-        // address of local_end1 and local_end2 are always equal
-		std::string local_addr(local_end1_.address().to_string());
-		u_int16_t local_port1 = local_end1_.port();
-		u_int16_t local_port2 = local_end2_.port();
-
-		std::string remote_addr1(remote_end1_.address().to_string());
-		u_int16_t remote_port1 = remote_end1_.port();
-		std::string remote_addr2(remote_end2_.address().to_string());
-		u_int16_t remote_port2 = remote_end2_.port();
-
-    ar & dead_;
-    ar & complete_;
-    ar & local_addr;
-    ar & local_port1;
-    ar & local_port2;
-    ar & remote_addr1;
-    ar & remote_port1;
-    ar & remote_addr2;
-    ar & remote_port2;
-		ar & seen1_;
-		ar & seen2_;
-
-		proto::endpoint local_end1(boost::asio::ip::address::from_string(local_addr), local_port1);
+    // address of local_end1 and local_end2 are always equal
+    std::string local_addr(local_end1_.address().to_string());
+    uint16_t local_port1 = local_end1_.port();
+    uint16_t local_port2 = local_end2_.port();
+
+    std::string remote_addr1(remote_end1_.address().to_string());
+    uint16_t remote_port1 = remote_end1_.port();
+    std::string remote_addr2(remote_end2_.address().to_string());
+    uint16_t remote_port2 = remote_end2_.port();
+
+    ar& dead_;
+    ar& complete_;
+    ar& local_addr;
+    ar& local_port1;
+    ar& local_port2;
+    ar& remote_addr1;
+    ar& remote_port1;
+    ar& remote_addr2;
+    ar& remote_port2;
+    ar& seen1_;
+    ar& seen2_;
+
+    proto::endpoint local_end1(boost::asio::ip::address::from_string(local_addr), local_port1);
     local_end1_ = local_end1;
-		proto::endpoint local_end2(boost::asio::ip::address::from_string(local_addr), local_port2);
-		local_end2_ = local_end2;
+    proto::endpoint local_end2(boost::asio::ip::address::from_string(local_addr), local_port2);
+    local_end2_ = local_end2;
 
-		proto::endpoint remote_end1(boost::asio::ip::address::from_string(remote_addr1), remote_port1);
-		remote_end1_ = remote_end1;
-		proto::endpoint remote_end2(boost::asio::ip::address::from_string(remote_addr2), remote_port2);
-		remote_end2_ = remote_end2;
+    proto::endpoint remote_end1(boost::asio::ip::address::from_string(remote_addr1), remote_port1);
+    remote_end1_ = remote_end1;
+    proto::endpoint remote_end2(boost::asio::ip::address::from_string(remote_addr2), remote_port2);
+    remote_end2_ = remote_end2;
 
-    if(complete_ && !dead_)
+    if(complete_ && !dead_) {
       reinit();
+    }
 
     in_sync_ = true;
-	}
+  }
 
   bool in_sync_;
-	::Mutex mutex_;
+  ::Mutex mutex_;
 
   const std::string& call_id_;
   bool dead_;
   bool complete_;
   proto::endpoint local_end1_, local_end2_;
   proto::endpoint remote_end1_, remote_end2_;
-	bool seen1_,seen2_; //has at least 1 packet been recieved?
+  bool seen1_,seen2_; //has at least 1 packet been recieved?
 };