Attachment #89440 for bug #132555

View | Details | Raw Unified | Return to bug 132555
Collapse All | Expand All




}


void XmitFailedCallback(Packet *pkt, void *data)
{
  DiffusionAgent *agent = (DiffusionAgent *)data;  // cast of trust
  agent->xmitFailed(pkt);
}


void DiffusionAgent::Print_IOlist()
{
}

}


void XmitFailedCallback(Packet *pkt, void *data)
{
  DiffusionAgent *agent = (DiffusionAgent *)data;  // cast of trust
  agent->xmitFailed(pkt);
}


void DiffusionAgent::xmitFailed(Packet *)
{
  // For future use, if needed.




#include "dsr/path.h"
#include "god.h"

void OmniMcastXmitFailedCallback(Packet *pkt, void *data)
{
  OmniMcastAgent *agent = (OmniMcastAgent *)data;  // cast of trust
  agent->xmitFailed(pkt);
}


static class OmniMcastClass : public TclClass {
public:
  OmniMcastClass() : TclClass("Agent/OmniMcast") {}

}


void OmniMcastXmitFailedCallback(Packet *pkt, void *data)
{
  OmniMcastAgent *agent = (OmniMcastAgent *)data;  // cast of trust
  agent->xmitFailed(pkt);
}


void OmniMcastAgent::xmitFailed(Packet *pkt)
{
  // For future extension if needed.





*/

void
XmitFailureCallback(Packet *pkt, void *data)
{
  DSRAgent *agent = (DSRAgent *)data; // cast of trust
  agent->xmitFailed(pkt);
}

void
XmitFlowFailureCallback(Packet *pkt, void *data)
{
  DSRAgent *agent = (DSRAgent *)data;
  agent->xmitFlowFailed(pkt);
}


/*===========================================================================
  SendBuf management and helpers
---------------------------------------------------------------------------*/

  sendOutPacketWithRoute(p, true);
}

void
XmitFailureCallback(Packet *pkt, void *data)
{
  DSRAgent *agent = (DSRAgent *)data; // cast of trust
  agent->xmitFailed(pkt);
}

void
XmitFlowFailureCallback(Packet *pkt, void *data)
{
  DSRAgent *agent = (DSRAgent *)data;
  agent->xmitFlowFailed(pkt);
}

#if 0

/* this is code that implements Route Reply holdoff to prevent route 

Lines 304-310 Link Here

(-)ns-2.29.orig/pgm/pgm-agent.cc (-1 / +1 lines)
304		304
305	void print_stats();	305	void print_stats();
306		306
307	void PgmAgent::trace_event(char *evType, double evTime);	307	void trace_event(char *evType, double evTime);
308		308
309	#ifdef PGM_DEBUG	309	#ifdef PGM_DEBUG
310	void display_packet(Packet *pkt);	310	void display_packet(Packet *pkt);

Lines 183-189 Link Here

(-)ns-2.29.orig/pgm/pgm-receiver.cc (-1 / +1 lines)
183	void print_stats();	183	void print_stats();
184	void display_packet(Packet *pkt); // For debugging.	184	void display_packet(Packet *pkt); // For debugging.
185		185
186	void PgmReceiver::trace_event(char *evType, double evTime);	186	void trace_event(char *evType, double evTime);
187		187
188	EventTrace * et_; //Trace Object for Custom Event Trace	188	EventTrace * et_; //Trace Object for Custom Event Trace
189		189

Lines 186-192 Link Here

(-)ns-2.29.orig/pgm/pgm-sender.cc (-1 / +1 lines)
186		186
187	void display_packet(Packet *pkt); // For debugging.	187	void display_packet(Packet *pkt); // For debugging.
188		188
189	void PgmSender::trace_event(char *evType, nsaddr_t daddr, double evTime);	189	void trace_event(char *evType, nsaddr_t daddr, double evTime);
190		190
191	EventTrace * et_; //Trace Object for custom Event Traces	191	EventTrace * et_; //Trace Object for custom Event Traces
192		192

Lines 65-71 Link Here

(-)ns-2.29.orig/tcp/tcp-sack-rh.cc (-1 / +1 lines)
65	virtual void estadjust();	65	virtual void estadjust();
66	virtual void rhclear();	66	virtual void rhclear();
67	virtual void computefack();	67	virtual void computefack();
68	virtual void SackRHTcpAgent::newack(Packet* pkt);	68	virtual void newack(Packet* pkt);
69	protected:	69	protected:
70	int fack_; /* the FACK state variable */	70	int fack_; /* the FACK state variable */
71	int retran_data_; /* the number of retransmitted packets in the pipe */	71	int retran_data_; /* the number of retransmitted packets in the pipe */

Return to bug 132555

Lines 241-246 Link Here

(-)ns-2.29.orig/diffusion/diffusion.cc (-7 / +7 lines)
241	}	241	}
242		242
243		243
		244	void XmitFailedCallback(Packet pkt, void data)
		245	{
		246	DiffusionAgent agent = (DiffusionAgent )data; // cast of trust
		247	agent->xmitFailed(pkt);
		248	}
		249
		250
244	void DiffusionAgent::Print_IOlist()	251	void DiffusionAgent::Print_IOlist()
245	{	252	{
246	}	253	}
Lines 459-471 Link Here
459	}	466	}
460		467
461		468
462	void XmitFailedCallback(Packet pkt, void data)
463	{
464	DiffusionAgent agent = (DiffusionAgent )data; // cast of trust
465	agent->xmitFailed(pkt);
466	}
467
468
469	void DiffusionAgent::xmitFailed(Packet *)	469	void DiffusionAgent::xmitFailed(Packet *)
470	{	470	{
471	// For future use, if needed.	471	// For future use, if needed.

Lines 214-219 Link Here

(-)ns-2.29.orig/dsr/dsragent.cc (-14 / +15 lines)
214		214
215	*/	215	*/
216		216
		217	void
		218	XmitFailureCallback(Packet pkt, void data)
		219	{
		220	DSRAgent agent = (DSRAgent )data; // cast of trust
		221	agent->xmitFailed(pkt);
		222	}
		223
		224	void
		225	XmitFlowFailureCallback(Packet pkt, void data)
		226	{
		227	DSRAgent agent = (DSRAgent )data;
		228	agent->xmitFlowFailed(pkt);
		229	}
		230
		231
217	/*===========================================================================	232	/*===========================================================================
218	SendBuf management and helpers	233	SendBuf management and helpers
219	---------------------------------------------------------------------------*/	234	---------------------------------------------------------------------------*/
Lines 2785-2804 Link Here
2785	sendOutPacketWithRoute(p, true);	2800	sendOutPacketWithRoute(p, true);
2786	}	2801	}
2787		2802
2788	void
2789	XmitFailureCallback(Packet pkt, void data)
2790	{
2791	DSRAgent agent = (DSRAgent )data; // cast of trust
2792	agent->xmitFailed(pkt);
2793	}
2794
2795	void
2796	XmitFlowFailureCallback(Packet pkt, void data)
2797	{
2798	DSRAgent agent = (DSRAgent )data;
2799	agent->xmitFlowFailed(pkt);
2800	}
2801
2802	#if 0	2803	#if 0
2803		2804
2804	/* this is code that implements Route Reply holdoff to prevent route	2805	/* this is code that implements Route Reply holdoff to prevent route

Lines 80-85 Link Here

(-)ns-2.29.orig/diffusion/omni_mcast.cc (-7 / +7 lines)
80	#include "dsr/path.h"	80	#include "dsr/path.h"
81	#include "god.h"	81	#include "god.h"
82		82
		83	void OmniMcastXmitFailedCallback(Packet pkt, void data)
		84	{
		85	OmniMcastAgent agent = (OmniMcastAgent )data; // cast of trust
		86	agent->xmitFailed(pkt);
		87	}
		88
		89
83	static class OmniMcastClass : public TclClass {	90	static class OmniMcastClass : public TclClass {
84	public:	91	public:
85	OmniMcastClass() : TclClass("Agent/OmniMcast") {}	92	OmniMcastClass() : TclClass("Agent/OmniMcast") {}
Lines 419-431 Link Here
419	}	426	}
420		427
421		428
422	void OmniMcastXmitFailedCallback(Packet pkt, void data)
423	{
424	OmniMcastAgent agent = (OmniMcastAgent )data; // cast of trust
425	agent->xmitFailed(pkt);
426	}
427
428
429	void OmniMcastAgent::xmitFailed(Packet *pkt)	429	void OmniMcastAgent::xmitFailed(Packet *pkt)
430	{	430	{
431	// For future extension if needed.	431	// For future extension if needed.