Imported Upstream version 0.3.4

[anytun.git] / src / packetSource.h

diff --git a/src/packetSource.h b/src/packetSource.h
index d5ee736..bd75be2 100644 (file)
--- a/src/packetSource.h
+++ b/src/packetSource.h
@@ -11,7 +11,7 @@
  *  tunneling and relaying of packets of any protocol.
  *
  *
- *  Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl, 
+ *  Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl,
  *                          Christian Pointner <satp@wirdorange.org>
  *
  *  This file is part of Anytun.
@@ -50,8 +50,8 @@ class PacketSource
 public:
   virtual ~PacketSource() {}
 
-  virtual u_int32_t recv(u_int8_t* buf, u_int32_t len, PacketSourceEndpoint& remote) = 0;
-  virtual void send(u_int8_t* buf, u_int32_t len, PacketSourceEndpoint remote) = 0;
+  virtual uint32_t recv(uint8_t* buf, uint32_t len, PacketSourceEndpoint& remote) = 0;
+  virtual void send(uint8_t* buf, uint32_t len, PacketSourceEndpoint remote) = 0;
 
   void waitUntilReady();
 
@@ -60,25 +60,25 @@ protected:
 };
 
 class UDPPacketSource : public PacketSource
-{  
+{
 public:
   typedef boost::asio::ip::udp proto;
 
   UDPPacketSource(std::string localaddr, std::string port);
   ~UDPPacketSource();
 
-  u_int32_t recv(u_int8_t* buf, u_int32_t len, PacketSourceEndpoint& remote);
-  void send(u_int8_t* buf, u_int32_t len, PacketSourceEndpoint remote);
+  uint32_t recv(uint8_t* buf, uint32_t len, PacketSourceEndpoint& remote);
+  void send(uint8_t* buf, uint32_t len, PacketSourceEndpoint remote);
 
   void onResolve(PacketSourceResolverIt& it);
   void onError(const std::runtime_error& e);
 
 private:
   boost::asio::io_service io_service_;
-  
+
   typedef struct {
-    u_int8_t* buf_;
-    u_int32_t len_;
+    uint8_t* buf_;
+    uint32_t len_;
     proto::socket* sock_;
     Semaphore* sem_;
   } SocketsElement;
@@ -86,7 +86,7 @@ private:
 
   void recv_thread(std::list<SocketsElement>::iterator it);
   typedef struct {
-    u_int32_t len_;
+    uint32_t len_;
     PacketSourceEndpoint remote_;
     std::list<SocketsElement>::iterator it_;
   } ThreadResult;