From abc82d6a52a75a30040fb4a458751a664a625c0a Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Wed, 19 Mar 2014 13:56:48 -0700
Subject: IPC changes and SocketManager changes all build!

---
 node/PacketDecoder.hpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'node/PacketDecoder.hpp')

diff --git a/node/PacketDecoder.hpp b/node/PacketDecoder.hpp
index 26aa85ce..9552c7fe 100644
--- a/node/PacketDecoder.hpp
+++ b/node/PacketDecoder.hpp
@@ -37,6 +37,7 @@
 #include "SharedPtr.hpp"
 #include "AtomicCounter.hpp"
 #include "Peer.hpp"
+#include "Socket.hpp"
 
 /*
  * The big picture:
@@ -70,16 +71,16 @@ public:
 	 * Create a new packet-in-decode
 	 *
 	 * @param b Source buffer with raw packet data
-	 * @param localPort Local port on which packet was received
+	 * @param fromSock Socket on which packet was received
 	 * @param remoteAddress Address from which packet came
 	 * @throws std::out_of_range Range error processing packet
 	 */
 	template<unsigned int C2>
-	PacketDecoder(const Buffer<C2> &b,Demarc::Port localPort,const InetAddress &remoteAddress)
+	PacketDecoder(const Buffer<C2> &b,const SharedPtr<Socket> &fromSock,const InetAddress &remoteAddress)
  		throw(std::out_of_range) :
  		Packet(b),
  		_receiveTime(Utils::now()),
- 		_localPort(localPort),
+ 		_fromSock(fromSock),
  		_remoteAddress(remoteAddress),
  		_step(DECODE_WAITING_FOR_SENDER_LOOKUP),
  		__refCount()
@@ -124,7 +125,7 @@ private:
 	bool _doNETWORK_CONFIG_REFRESH(const RuntimeEnvironment *_r,const SharedPtr<Peer> &peer);
 
 	uint64_t _receiveTime;
-	Demarc::Port _localPort;
+	SharedPtr<Socket> _fromSock;
 	InetAddress _remoteAddress;
 
 	enum {
-- 
cgit v1.2.3