Commit 4c518f9c authored by Robert Ricci's avatar Robert Ricci

Copyrights

parent 91b7f2c7
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// CircularTraffic.cc // CircularTraffic.cc
#include "lib.h" #include "lib.h"
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// CircularTraffic.h // CircularTraffic.h
#ifndef CIRCULAR_TRAFFIC_H_STUB_2 #ifndef CIRCULAR_TRAFFIC_H_STUB_2
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// Command.cc // Command.cc
#include "lib.h" #include "lib.h"
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// Command.h // Command.h
#ifndef COMMAND_H_STUB_2 #ifndef COMMAND_H_STUB_2
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// CommandInput.h // CommandInput.h
// This is the abstract base class for various kinds of control // This is the abstract base class for various kinds of control
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// CommandOutput.h // CommandOutput.h
// This is the base class which abstracts the messages sent to the monitor. // This is the base class which abstracts the messages sent to the monitor.
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// Connection.cc // Connection.cc
#include "lib.h" #include "lib.h"
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// Connection.h // Connection.h
#ifndef CONNECTION_H_STUB_2 #ifndef CONNECTION_H_STUB_2
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// ConnectionModel.h // ConnectionModel.h
#ifndef CONNECTION_MODEL_H_PELAB_2 #ifndef CONNECTION_MODEL_H_PELAB_2
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// Decayer.cc // Decayer.cc
#include "lib.h" #include "lib.h"
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// Decayer.h // Decayer.h
// This is for an old value which will decay over time. We still want // This is for an old value which will decay over time. We still want
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// DelaySensor.cc // DelaySensor.cc
#include "lib.h" #include "lib.h"
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// DelaySensor.h // DelaySensor.h
#ifndef DELAY_SENSOR_H_STUB_2 #ifndef DELAY_SENSOR_H_STUB_2
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// DirectInput.cc // DirectInput.cc
#include "lib.h" #include "lib.h"
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// DirectInput.h // DirectInput.h
#ifndef DIRECT_INPUT_H_STUB_2 #ifndef DIRECT_INPUT_H_STUB_2
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// EwmaThroughputSensor.cc // EwmaThroughputSensor.cc
#include "lib.h" #include "lib.h"
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// EwmaThroughputSensor.h // EwmaThroughputSensor.h
#ifndef EWMA_THROUGHPUT_SENSOR_H_STUB_2 #ifndef EWMA_THROUGHPUT_SENSOR_H_STUB_2
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// KernelTcp.cc // KernelTcp.cc
#include "lib.h" #include "lib.h"
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// KernelTcp.h // KernelTcp.h
#ifndef KERNEL_TCP_H_PELAB_2 #ifndef KERNEL_TCP_H_PELAB_2
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// LeastSquaresThroughput.cc // LeastSquaresThroughput.cc
#include "lib.h" #include "lib.h"
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// LeastSquaresThroughput.h // LeastSquaresThroughput.h
// Algorithm based on the equations at: // Algorithm based on the equations at:
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// MaxDelaySensor.cc // MaxDelaySensor.cc
#include "lib.h" #include "lib.h"
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// MaxDelaySensor.h // MaxDelaySensor.h
#ifndef MAX_DELAY_SENSOR_H_STUB_2 #ifndef MAX_DELAY_SENSOR_H_STUB_2
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// MinDelaySensor.cc // MinDelaySensor.cc
#include "lib.h" #include "lib.h"
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// MinDelaySensor.h // MinDelaySensor.h
// This sensor keeps track of the lowest delay seen recently. The // This sensor keeps track of the lowest delay seen recently. The
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// PacketSensor.cc // PacketSensor.cc
#include "lib.h" #include "lib.h"
...@@ -167,6 +173,40 @@ void PacketSensor::localSend(PacketInfo * packet) ...@@ -167,6 +173,40 @@ void PacketSensor::localSend(PacketInfo * packet)
SentPacket record; SentPacket record;
record.seqStart = startSequence; record.seqStart = startSequence;
<<<<<<< PacketSensor.cc
/*
* Calculate the packet payload size - we have to make sure to
* take into account IP and TCP option headers
*/
unsigned int sequenceLength =
// Total length of the IP part of the packet
(ntohs(packet->ip->ip_len))
// Total length of all IP headers (including options)
- (packet->ip->ip_hl*4)
// Total length of all TCP headers (including options)
<<<<<<< PacketSensor.cc
- (packet->tcp->doff*4);
record.seqEnd = record.seqStart + sequenceLength;
record.totalLength = packet->packetLength;
record.timestamp = packet->packetTime;
logWrite(SENSOR,
<<<<<<< PacketSensor.cc
"PacketSensor::localSend() new record: ss=%i,sl=%i,se=%i,tl=%i",
record.seqStart,record.sequenceLength,record.seqEnd,
record.totalLength);
=======
"PacketSensor::localSend() new record: ss=%u,sl=%u,se=%u,tl=%u",
record.seqStart, sequenceLength, record.seqEnd,
record.totalLength);
>>>>>>> 1.5
globalSequence.seqEnd = record.seqEnd;
if (unacked.empty())
{
globalSequence.seqStart = record.seqStart;
=======
- (packet->tcp->doff*4);
=======
>>>>>>> 1.27
// We want to get the sequence number of the last data byte, not the // We want to get the sequence number of the last data byte, not the
// sequence number of the first byte of the next segment // sequence number of the first byte of the next segment
record.seqEnd = record.seqStart + sequenceLength - 1; record.seqEnd = record.seqStart + sequenceLength - 1;
...@@ -176,6 +216,11 @@ void PacketSensor::localSend(PacketInfo * packet) ...@@ -176,6 +216,11 @@ void PacketSensor::localSend(PacketInfo * packet)
"PacketSensor::localSend() new record: ss=%u,sl=%u,se=%u,tl=%u", "PacketSensor::localSend() new record: ss=%u,sl=%u,se=%u,tl=%u",
record.seqStart, sequenceLength, record.seqEnd, record.seqStart, sequenceLength, record.seqEnd,
record.totalLength); record.totalLength);
<<<<<<< PacketSensor.cc
>>>>>>> 1.11
globalSequence.seqEnd = record.seqEnd;
=======
>>>>>>> 1.16
if (unacked.empty()) if (unacked.empty())
{ {
globalSequence.seqStart = record.seqStart; globalSequence.seqStart = record.seqStart;
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// PacketSensor.h // PacketSensor.h
// This sensor keeps track of unacknowledged packets. // This sensor keeps track of unacknowledged packets.
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// Sensor.cc // Sensor.cc
#include "lib.h" #include "lib.h"
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// Sensor.h // Sensor.h
// This is the abstract base class for all of the individual // This is the abstract base class for all of the individual
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// SensorList.cc // SensorList.cc
#include "lib.h" #include "lib.h"
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// SensorList.h // SensorList.h
// This is the class for managing sensors and their dependencies. When // This is the class for managing sensors and their dependencies. When
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// StateSensor.cc // StateSensor.cc
#include "lib.h" #include "lib.h"
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// StateSensor.h // StateSensor.h
#ifndef STATE_SENSOR_H_STUB_2 #ifndef STATE_SENSOR_H_STUB_2
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// TSThroughputSensor.cc // TSThroughputSensor.cc
#include "lib.h" #include "lib.h"
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
/* /*
* TSThroughputSensor.h * TSThroughputSensor.h
* NOTE: This file is very similar to ThroughputSensor.h - however, it uses * NOTE: This file is very similar to ThroughputSensor.h - however, it uses
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// ThroughputSensor.cc // ThroughputSensor.cc
#include "lib.h" #include "lib.h"
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// ThroughputSensor.h // ThroughputSensor.h
// For every ack, this calculates the // For every ack, this calculates the
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// Time.cc // Time.cc
#include "lib.h" #include "lib.h"
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// Time.h // Time.h
#ifndef TIME_H_STUB_2 #ifndef TIME_H_STUB_2
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// TrafficModel.h // TrafficModel.h
#ifndef TRAFFIC_MODEL_H_STUB_2 #ifndef TRAFFIC_MODEL_H_STUB_2
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// TrivialCommandOutput.cc // TrivialCommandOutput.cc
#include "lib.h" #include "lib.h"
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// TrivialCommandOutput.h // TrivialCommandOutput.h
#ifndef TRIVIAL_COMMAND_OUTPUT_H_STUB_2 #ifndef TRIVIAL_COMMAND_OUTPUT_H_STUB_2
......
#!/bin/sh #!/bin/sh
#
# EMULAB-COPYRIGHT
# Copyright (c) 2006 University of Utah and the Flux Group.
# All rights reserved.
#
ARGS=$* ARGS=$*
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2006 University of Utah and the Flux Group.
* All rights reserved.
*/
// lib.h // lib.h
#ifndef LIB_H_PELAB_2 #ifndef LIB_H_PELAB_2
...@@ -268,5 +274,7 @@ namespace global ...@@ -268,5 +274,7 @@ namespace global
extern std::auto_ptr<CommandInput> input; extern std::auto_ptr<CommandInput> input;
extern std::auto_ptr<CommandOutput> output; extern std::auto_ptr<CommandOutput> output;
extern int logFlags;
} }
#endif #endif