Re: [ns] RE: Diffserv Model for NS 2.1b5 available from NortelNetworks Open IP Environment Group

[Lloyd Wood <l.wood@eim.surrey.ac.uk>]

On Fri, 28 Jul 2000, Peter Pieda wrote:

> A new release of the Nortel Networks Open IP Diffserv Model for NS 
> is available for download at http://www7.nortel.com:8080/CTL/.
> 
> The following additions have been made to the model:
> 	1. Class Selector PHB and Default PHB added.
> 	2. Bounded Strict Priority Scheduler
> 	3. DropTail AQM
> 	4. Minor code adjustments (see feedback)
> 
> Thanks to all of those who gave feedback.
> 
> There is some on-going work to port this to the latest release of NS.

Porting it to the latest release is easy; patches (below) are pretty
much what I posted last time bar the line nos.

However, although old policer regression tests pass just as before,
the new 'schedular' regression tests fail on current ns due to slight
differences in packet counts.

cheers,

L.

<L.Wood@surrey.ac.uk>PGP<http://www.ee.surrey.ac.uk/Personal/L.Wood/>

patches for v6 of nortel diffserv code to make 2.1b5-aware code work
with 2.1b6 and a recent ns snapshot (July 2000):

dsPolicy.h:
38c38
< 	long sourceNode, destNode;	// Source-destination pair
---
> 	nsaddr_t sourceNode, destNode;	// Source-destination pair
86c86
< 	policyTableEntry* getPolicyTableEntry(long source, long dest);
---
> 	policyTableEntry* getPolicyTableEntry(nsaddr_t source, nsaddr_t dest);

dsPolicy.cc:
123c123
< policyTableEntry* getPolicyTableEntry(long source, long dest)
---
> policyTableEntry* getPolicyTableEntry(nsaddr_t source, nsaddr_t dest)
129c129
< policyTableEntry* Policy::getPolicyTableEntry(long source, long dest) {
---
> policyTableEntry* Policy::getPolicyTableEntry(nsaddr_t source, nsaddr_t dest) {
135c135
< 	printf("ERROR: No Policy Table entry found for Source %ld-Destination %ld.\n", source, dest);
---
> 	printf("ERROR: No Policy Table entry found for Source %d-Destination %d.\n", source, dest);
532c532
< 	policy = getPolicyTableEntry((iph->src() >> 8), (iph->dst() >> 8));
---
> 	policy = getPolicyTableEntry(iph->saddr(), iph->daddr());
570c570
< 			   printf("Flow (%ld to %ld): TSW2CM policer, ",
---
> 			   printf("Flow (%d to %d): TSW2CM policer, ",
576c576
< 			   printf("Flow (%ld to %ld): TSW3CM policer, initial code ",
---
> 			   printf("Flow (%d to %d): TSW3CM policer, initial code ",
583c583
< 			   printf("Flow (%ld to %ld): Token Bucket policer, ",
---
> 			   printf("Flow (%d to %d): Token Bucket policer, ",
590c590
< 			   printf("Flow (%ld to %ld): srTCM policer, initial code ",
---
> 			   printf("Flow (%d to %d): srTCM policer, initial code ",
597c597
< 			   printf("Flow (%ld to %ld): trTCM policer, initial code ",
---
> 			   printf("Flow (%d to %d): trTCM policer, initial code ",