Commit 5a40cdef authored by Mark Frohnmayer's avatar Mark Frohnmayer
Browse files

net_connection now fully compiles; still untested.

parent af203fe0

tnl2/connection.h

+6 −6
Original line number Diff line number Diff line
@@ -320,17 +320,17 @@ protected: 
   virtual void writePacket(BitStream *bstream, PacketNotify *note) {}



	/// Called when the packet associated with the specified notify is known to have been received by the remote host.  Packets are guaranteed to be notified in the order in which they were sent.

	virtual void packetReceived(PacketNotify *note)

	virtual void packet_received(PacketNotify *note)

	{

	   if(mStringTable)

		  mStringTable->packetReceived(&note->stringList);

		  mStringTable->packet_received(&note->stringList);

	}

	

	/// Called when the packet associated with the specified notify is known to have been not received by the remote host.  Packets are guaranteed to be notified in the order in which they were sent.

	virtual void packetDropped(PacketNotify *note)

	virtual void packet_dropped(PacketNotify *note)

	{

	   if(mStringTable)

		  mStringTable->packetDropped(&note->stringList);

		  mStringTable->packet_dropped(&note->stringList);

	}



   /// Allocates a data record to track data sent on an individual packet.  If you need to track additional notification information, you'll have to override this so you allocate a subclass of PacketNotify with extra fields.
@@ -721,7 +721,7 @@ protected: 
			 }

		  }



		  packetReceived(note);

		  packet_received(note);

	   }

	   else

	   {
@@ -745,7 +745,7 @@ protected: 


		  }



		  packetDropped(note);

		  packet_dropped(note);

	   }

	   delete note;

	}

tnl2/connection_string_table.h

+2 −2
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ public: 
	}





   void packetReceived(PacketList *note)

   void packet_received(PacketList *note)

	{

	   PacketEntry *walk = note->stringHead;

	   while(walk)
@@ -163,7 +163,7 @@ public: 
	   }

	}

	

   void packetDropped(PacketList *note)

   void packet_dropped(PacketList *note)

	{

	   PacketEntry *walk = note->stringHead;

	   while(walk)

tnl2/event_connection.h

+512 −512
Original line number Diff line number Diff line
@@ -88,9 +88,9 @@ protected: 
	PacketNotify *allocNotify() { return new EventPacketNotify; }

	

	/// Override processing to requeue any guaranteed events in the packet that was dropped

   void packetDropped(PacketNotify *notify)

	void packet_dropped(PacketNotify *notify)

	{

	   Parent::packetDropped(pnotify);

		Parent::packet_dropped(pnotify);

		EventPacketNotify *notify = static_cast<EventPacketNotify *>(pnotify);

		

		EventNote *walk = notify->eventList;
@@ -139,9 +139,9 @@ protected: 
	}

	

	/// Override processing to notify for delivery and dereference any events sent in the packet

   void packetReceived(PacketNotify *notify)

	void packet_received(PacketNotify *notify)

	{

	   Parent::packetReceived(pnotify);

		Parent::packet_received(pnotify);

		

		EventPacketNotify *notify = static_cast<EventPacketNotify *>(pnotify);

tnl2/ghost_connection.h

+4 −4
Original line number Diff line number Diff line
@@ -39,9 +39,9 @@ protected: 
   PacketNotify *allocNotify() { return new GhostPacketNotify; }



   /// Override to properly update the GhostInfo's for all ghosts that had upates in the dropped packet.

   void packetDropped(PacketNotify *notify)

   void packet_dropped(PacketNotify *notify)

	{

	   Parent::packetDropped(pnotify);

	   Parent::packet_dropped(pnotify);

	   GhostPacketNotify *notify = static_cast<GhostPacketNotify *>(pnotify);



	   GhostRef *packRef = notify->ghostList;
@@ -99,9 +99,9 @@ protected: 
	}



   /// Override to update flags associated with the ghosts updated in this packet.

   void packetReceived(PacketNotify *notify)

   void packet_received(PacketNotify *notify)

	{

	   Parent::packetReceived(pnotify);

	   Parent::packet_received(pnotify);

	   GhostPacketNotify *notify = static_cast<GhostPacketNotify *>(pnotify);



	   GhostRef *packRef = notify->ghostList;

tnl2/net_connection.h

+255 −192

File changed.

Preview size limit exceeded, changes collapsed.