X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2FpacketSource.cpp;h=711a206f0ef4404930369997154012e19f9cc038;hb=59f70c469910fe88a529c043ab0364ca5f8918b9;hp=a5443ad67736fbc300603ee4cca29c740212f95d;hpb=bf2cb4e3379948d1f2e65f2a6373cf0f8c379481;p=anytun.git

diff --git a/src/packetSource.cpp b/src/packetSource.cpp
index a5443ad..711a206 100644
--- a/src/packetSource.cpp
+++ b/src/packetSource.cpp
@@ -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.
  */
 
 #include <boost/asio.hpp>
@@ -55,15 +68,15 @@ UDPPacketSource::UDPPacketSource(std::string localaddr, std::string port)
 UDPPacketSource::~UDPPacketSource()
 {
   std::list<SocketsElement>::iterator it = sockets_.begin();
-  for(;it != sockets_.end(); ++it) {
-/// this might be a needed by the receiver thread, TODO cleanup
-//    delete[](it->buf_);
-//    delete(it->sem_);
-//    delete(it->sock_);
+  for(; it != sockets_.end(); ++it) {
+    /// this might be a needed by the receiver thread, TODO cleanup
+    //    delete[](it->buf_);
+    //    delete(it->sem_);
+    //    delete(it->sock_);
   }
 }
 
-void UDPPacketSource::onResolve(PacketSourceResolverIt& it)
+void UDPPacketSource::onResolve(PacketSourceResolverIt it)
 {
   while(it != PacketSourceResolverIt()) {
     PacketSourceEndpoint e = *it;
@@ -74,13 +87,15 @@ void UDPPacketSource::onResolve(PacketSourceResolverIt& it)
     sock.len_ = 0;
     sock.sem_ = NULL;
     sock.sock_ = new proto::socket(io_service_);
-    if(!sock.sock_)
+    if(!sock.sock_) {
       AnytunError::throwErr() << "memory error";
+    }
 
     sock.sock_->open(e.protocol());
-#ifndef _MSC_VER
-    if(e.protocol() == proto::v6())
+#if !defined(_MSC_VER) && !defined(MINGW)
+    if(e.protocol() == proto::v6()) {
       sock.sock_->set_option(boost::asio::ip::v6_only(true));
+    }
 #endif
     sock.sock_->bind(e);
     sockets_.push_back(sock);
@@ -88,15 +103,16 @@ void UDPPacketSource::onResolve(PacketSourceResolverIt& it)
     it++;
   }
 
-      // prepare multi-socket recv
+  // prepare multi-socket recv
   if(sockets_.size() > 1) {
     std::list<SocketsElement>::iterator it = sockets_.begin();
-    for(;it != sockets_.end(); ++it) {
+    for(; it != sockets_.end(); ++it) {
       it->len_ = MAX_PACKET_LENGTH;
-      it->buf_ = new u_int8_t[it->len_];
-      if(!it->buf_)
+      it->buf_ = new uint8_t[it->len_];
+      if(!it->buf_) {
         AnytunError::throwErr() << "memory error";
-      
+      }
+
       it->sem_ = new Semaphore();
       if(!it->sem_) {
         delete[](it->buf_);
@@ -125,7 +141,7 @@ void UDPPacketSource::recv_thread(std::list<SocketsElement>::iterator it)
   result.it_ = it;
   for(;;) {
     it->sem_->down();
-    result.len_ = static_cast<u_int32_t>(it->sock_->receive_from(boost::asio::buffer(it->buf_, it->len_), result.remote_));
+    result.len_ = static_cast<uint32_t>(it->sock_->receive_from(boost::asio::buffer(it->buf_, it->len_), result.remote_));
     {
       Lock lock(thread_result_mutex_);
       thread_result_queue_.push(result);
@@ -134,10 +150,11 @@ void UDPPacketSource::recv_thread(std::list<SocketsElement>::iterator it)
   }
 }
 
-u_int32_t UDPPacketSource::recv(u_int8_t* buf, u_int32_t len, PacketSourceEndpoint& remote)
+uint32_t UDPPacketSource::recv(uint8_t* buf, uint32_t len, PacketSourceEndpoint& remote)
 {
-  if(sockets_.size() == 1)
-    return static_cast<u_int32_t>(sockets_.front().sock_->receive_from(boost::asio::buffer(buf, len), remote));
+  if(sockets_.size() == 1) {
+    return static_cast<uint32_t>(sockets_.front().sock_->receive_from(boost::asio::buffer(buf, len), remote));
+  }
 
   thread_result_sem_.down();
   ThreadResult result;
@@ -154,10 +171,10 @@ u_int32_t UDPPacketSource::recv(u_int8_t* buf, u_int32_t len, PacketSourceEndpoi
   return len;
 }
 
-void UDPPacketSource::send(u_int8_t* buf, u_int32_t len, PacketSourceEndpoint remote)
+void UDPPacketSource::send(uint8_t* buf, uint32_t len, PacketSourceEndpoint remote)
 {
   std::list<SocketsElement>::iterator it = sockets_.begin();
-  for(;it != sockets_.end(); ++it) {
+  for(; it != sockets_.end(); ++it) {
     if(it->sock_->local_endpoint().protocol() == remote.protocol()) {
       it->sock_->send_to(boost::asio::buffer(buf, len), remote);
       return;