Attachment #1178 for bug #1203

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

(-)a/src/aodv/helper/aodv-helper.h (-3 / +5 lines)

Lines 17-24	Link Here

 * Authors: Pavel Boyko <boyko@iitp.ru>, written after OlsrHelper by Mathieu Lacage <mathieu.lacage@sophia.inria.fr>

 * Authors: Pavel Boyko <boyko@iitp.ru>, written after OlsrHelper by Mathieu Lacage <mathieu.lacage@sophia.inria.fr>

*/

*/

#ifndef AODVHELPER_H_

#define AODVHELPER_H_

#ifndef AODV_HELPER_H

#define AODV_HELPER_H

#include "ns3/object-factory.h"

#include "ns3/object-factory.h"

#include "ns3/node.h"

#include "ns3/node.h"

Lines 67-70	Link Here

};

};

#endif /* AODVHELPER_H_ */

#endif /* AODV_HELPER_H */

(-)a/src/aodv/model/aodv-dpd.h (-3 / +3 lines)

Lines 20-27	Link Here

 *          Pavel Boyko <boyko@iitp.ru>

 *          Pavel Boyko <boyko@iitp.ru>

*/

*/

#ifndef DUPLICATEPACKETDETECTION_H_

#ifndef AODV_DPD_H

#define DUPLICATEPACKETDETECTION_H_

#define AODV_DPD_H

#include "aodv-id-cache.h"

#include "aodv-id-cache.h"

#include "ns3/nstime.h"

#include "ns3/nstime.h"

Lines 59-62	Link Here

#endif

#endif /* AODV_DPD_H */

(-)a/src/aodv/model/aodv-id-cache.h (-3 / +3 lines)

Lines 26-33	Link Here

 *          Pavel Boyko <boyko@iitp.ru>

 *          Pavel Boyko <boyko@iitp.ru>

*/

*/

#ifndef IDCACHE_H_

#ifndef AODV_ID_CACHE_H

#define IDCACHE_H_

#define AODV_ID_CACHE_H

#include "ns3/ipv4-address.h"

#include "ns3/ipv4-address.h"

#include "ns3/simulator.h"

#include "ns3/simulator.h"

Lines 83-86	Link Here

#endif /* IDCACHE_H_ */

#endif /* AODV_ID_CACHE_H */

(-)a/src/aodv/test/aodv-regression.h (-3 / +4 lines)

Lines 18-25	Link Here

 * Authors: Pavel Boyko <boyko@iitp.ru>

 * Authors: Pavel Boyko <boyko@iitp.ru>

*/

*/

#ifndef AODVREGRESSION_H_

#ifndef AODV_REGRESSION_H

#define AODVREGRESSION_H_

#define AODV_REGRESSION_H

#include "ns3/test.h"

#include "ns3/test.h"

#include "ns3/nstime.h"

#include "ns3/nstime.h"

Lines 191-194	Link Here

191

192

193

194

#endif /* AODVREGRESSION_H_ */

194

195

#endif /* AODV_REGRESSION_H */

(-)a/src/aodv/test/bug-772.h (-3 / +4 lines)

Lines 18-25	Link Here

 * Authors: Pavel Boyko <boyko@iitp.ru>

 * Authors: Pavel Boyko <boyko@iitp.ru>

*/

*/

#ifndef BUG702TEST_H_

#ifndef BUG_772_H

#define BUG702TEST_H_

#define BUG_772_H

#include "ns3/test.h"

#include "ns3/test.h"

#include "ns3/nstime.h"

#include "ns3/nstime.h"

Lines 76-79	Link Here

#endif /* BUG702TEST_H_ */

#endif /* BUG_772_H */

(-)a/src/aodv/test/loopback.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Authors: Pavel Boyko <boyko@iitp.ru>

 * Authors: Pavel Boyko <boyko@iitp.ru>

*/

*/

#ifndef LOOPBACK_H_

#ifndef AODV_LOOPBACK_H

#define LOOPBACK_H_

#define AODV_LOOPBACK_H

#include "ns3/test.h"

#include "ns3/test.h"

#include <string>

#include <string>

Lines 42-45	Link Here

#endif /* LOOPBACK_H_ */

#endif /* AODV_LOOPBACK_H */

(-)a/src/applications/model/bulk-send-application.h (-4 / +3 lines)

Lines 18-25	Link Here

 * Author: George F. Riley <riley@ece.gatech.edu>

 * Author: George F. Riley <riley@ece.gatech.edu>

*/

*/

#ifndef __bulksend_application_h__

#ifndef BULK_SEND_APPLICATION_H

#define __bulksend_application_h__

#define BULK_SEND_APPLICATION_H

#include "ns3/address.h"

#include "ns3/address.h"

#include "ns3/application.h"

#include "ns3/application.h"

Lines 103-107	Link Here

103

104

} // namespace ns3

104

} // namespace ns3

105

106

#endif

106

#endif /* BULK_SEND_APPLICATION_H */

107

(-)a/src/applications/model/onoff-application.h (-4 / +3 lines)

Lines 22-29	Link Here

// George F. Riley, Georgia Tech, Spring 2007

// George F. Riley, Georgia Tech, Spring 2007

// Adapted from ApplicationOnOff in GTNetS.

// Adapted from ApplicationOnOff in GTNetS.

#ifndef __onoff_application_h__

#ifndef ONOFF_APPLICATION_H

#define __onoff_application_h__

#define ONOFF_APPLICATION_H

#include "ns3/address.h"

#include "ns3/address.h"

#include "ns3/application.h"

#include "ns3/application.h"

Lines 158-162	Link Here

158

159

} // namespace ns3

159

} // namespace ns3

160

161

#endif

161

#endif /* ONOFF_APPLICATION_H */

162

(-)a/src/applications/model/packet-loss-counter.h (-3 / +3 lines)

Lines 19-27	Link Here

 *                      <amine.ismail@udcast.com>

 *                      <amine.ismail@udcast.com>

*/

*/

#ifndef _PACKET_LOSS_COUNTER_H_

#define _PACKET_LOSS_COUNTER_H_

#ifndef PACKET_LOSS_COUNTER_H

#define PACKET_LOSS_COUNTER_H

#include "ns3/application.h"

#include "ns3/application.h"

#include "ns3/event-id.h"

#include "ns3/event-id.h"

Lines 53-56	Link Here

};

};

#endif /* PACKETLOSSCOUNTER_H_ */

#endif /* PACKET_LOSS_COUNTER_H */

(-)a/src/applications/model/packet-sink.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author:  Tom Henderson (tomhend@u.washington.edu)

 * Author:  Tom Henderson (tomhend@u.washington.edu)

*/

*/

#ifndef __packet_sink_h__

#ifndef PACKET_SINK_H

#define __packet_sink_h__

#define PACKET_SINK_H

#include "ns3/application.h"

#include "ns3/application.h"

#include "ns3/event-id.h"

#include "ns3/event-id.h"

Lines 114-118	Link Here

114

115

} // namespace ns3

115

} // namespace ns3

116

117

#endif

117

#endif /* PACKET_SINK_H */

118

(-)a/src/applications/model/udp-client.h (-3 / +3 lines)

Lines 20-27	Link Here

*/

*/

#ifndef __UDP_CLIENT_H__

#ifndef UDP_CLIENT_H

#define __UDP_CLIENT_H__

#define UDP_CLIENT_H

#include "ns3/application.h"

#include "ns3/application.h"

#include "ns3/event-id.h"

#include "ns3/event-id.h"

Lines 82-85	Link Here

} // namespace ns3

} // namespace ns3

#endif // __UDP_CLIENT_H__

#endif /* UDP_CLIENT_H */

(-)a/src/applications/model/udp-echo-client.h (-4 / +3 lines)

Lines 16-23	Link Here

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

*/

*/

#ifndef __UDP_ECHO_CLIENT_H__

#ifndef UDP_ECHO_CLIENT_H

#define __UDP_ECHO_CLIENT_H__

#define UDP_ECHO_CLIENT_H

#include "ns3/application.h"

#include "ns3/application.h"

#include "ns3/event-id.h"

#include "ns3/event-id.h"

Lines 151-155	Link Here

151

152

} // namespace ns3

152

} // namespace ns3

153

154

#endif // __UDP_ECHO_CLIENT_H__

154

#endif /* UDP_ECHO_CLIENT_H */

155

(-)a/src/applications/model/udp-echo-server.h (-3 / +3 lines)

Lines 16-23	Link Here

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

*/

*/

#ifndef __UDP_ECHO_SERVER_H__

#ifndef UDP_ECHO_SERVER_H

#define __UDP_ECHO_SERVER_H__

#define UDP_ECHO_SERVER_H

#include "ns3/application.h"

#include "ns3/application.h"

#include "ns3/event-id.h"

#include "ns3/event-id.h"

Lines 64-68	Link Here

} // namespace ns3

} // namespace ns3

#endif // __UDP_ECHO_SERVER_H__

#endif /* UDP_ECHO_SERVER_H */

(-)a/src/applications/model/udp-server.h (-3 / +3 lines)

Lines 20-27	Link Here

*/

*/

#ifndef __UDP_SERVER_H__

#ifndef UDP_SERVER_H

#define __UDP_SERVER_H__

#define UDP_SERVER_H

#include "ns3/application.h"

#include "ns3/application.h"

#include "ns3/event-id.h"

#include "ns3/event-id.h"

Lines 91-94	Link Here

} // namespace ns3

} // namespace ns3

#endif // __UDP_SERVER_H__

#endif /* UDP_SERVER_H */




 *                              <amine.ismail@udcast.com>
 */

#ifndef UDP_TRACE_CLIENT_H
#define UDP_TRACE_CLIENT_H

#include "ns3/application.h"
#include "ns3/event-id.h"
#include "ns3/ptr.h"
#include "ns3/ipv4-address.h"
#include <vector>

namespace ns3 {

class Socket;


} // namespace ns3

#endif /* UDP_TRACE_CLIENT_H */

(-)a/src/click/helper/click-internet-stack-helper.h (-1 / +1 lines)

Lines 228-231	Link Here

228

229

#endif /* CLICK_INTERNET_STACK_HELPER_H */

229

#endif /* CLICK_INTERNET_STACK_HELPER_H */

230

231

#endif // NS3_CLICK

231

#endif /* NS3_CLICK */




 * Authors: Lalith Suresh <suresh.lalith@gmail.com>
 */

#ifndef IPV4_CLICK_ROUTING_H
#define IPV4_CLICK_ROUTING_H

#include "ns3/object.h"
#include "ns3/packet.h"

  bool m_nonDefaultName;

  Ptr<Ipv4> m_ipv4;
#endif /* NS3_CLICK */
};

} // namespace ns3

#endif /* IPV4_CLICK_ROUTING_H */

(-)a/src/click/model/ipv4-l3-click-protocol.h (-2 / +2 lines)

Lines 262-270	Link Here

262

263

  std::vector<bool> m_promiscDeviceList;

263

  std::vector<bool> m_promiscDeviceList;

264

265

#endif // NS3_CLICK

265

#endif /* NS3_CLICK */

266

};

266

};

267

268

} // namespace ns3

268

} // namespace ns3

269

270

#endif // IPV4_L3_CLICK_ROUTING_H

270

#endif /* IPV4_L3_CLICK_ROUTING_H */

(-)a/src/core/model/log.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>

 * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>

*/

*/

#ifndef __LOG_H__

#ifndef LOG_H

#define __LOG_H__

#define LOG_H

#include <string>

#include <string>

#include <iostream>

#include <iostream>

Lines 400-403	Link Here

400

} // namespace ns3

400

} // namespace ns3

401

402

403

#endif // __LOG_H__

403

#endif /* LOG_H */

(-)a/src/core/model/random-variable.h (-4 / +3 lines)

Lines 19-26	Link Here

// Author: Hadi Arbabi<marbabi@cs.odu.edu>

// Author: Hadi Arbabi<marbabi@cs.odu.edu>

//

//

#ifndef __random_variable_h

#ifndef NS3_RANDOM_VARIABLE_H

#define __random_variable_h

#define NS3_RANDOM_VARIABLE_H

#include <vector>

#include <vector>

#include <algorithm>

#include <algorithm>

Lines 817-821	Link Here

817

818

} // namespace ns3

818

} // namespace ns3

819

820

#endif /* NS3_RANDOM_VARIABLE_H */

821

#endif

(-)a/src/core/model/ref-count-base.h (-3 / +3 lines)

Lines 20-27	Link Here

 * Authors: Gustavo Carneiro <gjcarneiro@gmail.com>,

 * Authors: Gustavo Carneiro <gjcarneiro@gmail.com>,

 *          Mathieu Lacage <mathieu.lacage@sophia.inria.fr>

 *          Mathieu Lacage <mathieu.lacage@sophia.inria.fr>

*/

*/

#ifndef __REF_COUNT_BASE_H__

#ifndef REF_COUNT_BASE_H

#define __REF_COUNT_BASE_H__

#define REF_COUNT_BASE_H

#include "simple-ref-count.h"

#include "simple-ref-count.h"

Lines 45-48	Link Here

} // namespace ns3

} // namespace ns3

#endif /* __REF_COUNT_BASE_H__*/

#endif /* REF_COUNT_BASE_H */

(-)a/src/core/model/unix-fd-reader.h (-2 / +1 lines)

Lines 1-5	Link Here

/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */

/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */

/*

/*

 * Copyright (c) 2010 The Boeing Company

 * Copyright (c) 2010 The Boeing Company

Lines 110-113	Link Here

110

109

111

} // namespace ns3

110

} // namespace ns3

112

111

113

#endif  // UNIX_FD_READER_H

112

#endif /* UNIX_FD_READER_H */

(-)a/src/csma/model/backoff.h (-2 / +1 lines)

Lines 98-102	Link Here

} // namespace ns3

} // namespace ns3

100

101

#endif // BACKOFF_H

101

#endif /* BACKOFF_H */

102

(-)a/src/csma/model/csma-net-device.h (-1 / +1 lines)

Lines 712-715	Link Here

712

713

}; // namespace ns3

713

}; // namespace ns3

714

715

#endif // CSMA_NET_DEVICE_H

715

#endif /* CSMA_NET_DEVICE_H */

(-)a/src/dsdv/doc/dsdv.h (-3 / +4 lines)

Lines 29-36	Link Here

 * NSF grant CNS-1050226 (Multilayer Network Resilience Analysis and Experimentation on GENI),

 * NSF grant CNS-1050226 (Multilayer Network Resilience Analysis and Experimentation on GENI),

 * US Department of Defense (DoD), and ITTC at The University of Kansas.

 * US Department of Defense (DoD), and ITTC at The University of Kansas.

*/

*/

#ifndef DSDV_H_

#define DSDV_H_

#ifndef DSDV_H

#define DSDV_H

/**

/**

 * \defgroup dsdv DSDV Routing

 * \defgroup dsdv DSDV Routing

Lines 40-43	Link Here

 * library document.

 * library document.

*/

*/

#endif /* DSDV_H_ */

#endif /* DSDV_H */

(-)a/src/dsdv/helper/dsdv-helper.h (-3 / +5 lines)

Lines 28-35	Link Here

 * NSF grant CNS-1050226 (Multilayer Network Resilience Analysis and Experimentation on GENI),

 * NSF grant CNS-1050226 (Multilayer Network Resilience Analysis and Experimentation on GENI),

 * US Department of Defense (DoD), and ITTC at The University of Kansas.

 * US Department of Defense (DoD), and ITTC at The University of Kansas.

*/

*/

#ifndef DSDVHELPER_H_

#define DSDVHELPER_H_

#ifndef DSDV_HELPER_H

#define DSDV_HELPER_H

#include "ns3/object-factory.h"

#include "ns3/object-factory.h"

#include "ns3/node.h"

#include "ns3/node.h"

Lines 76-79	Link Here

};

};

#endif /* DSDVHELPER_H_ */

#endif /* DSDV_HELPER_H */

(-)a/src/dsdv/model/dsdv-packet-queue.h (-3 / +4 lines)

Lines 28-35	Link Here

 * NSF grant CNS-1050226 (Multilayer Network Resilience Analysis and Experimentation on GENI),

 * NSF grant CNS-1050226 (Multilayer Network Resilience Analysis and Experimentation on GENI),

 * US Department of Defense (DoD), and ITTC at The University of Kansas.

 * US Department of Defense (DoD), and ITTC at The University of Kansas.

*/

*/

#ifndef __DSDV_PACKETQUEUE_H__

#define __DSDV_PACKETQUEUE_H__

#ifndef DSDV_PACKETQUEUE_H

#define DSDV_PACKETQUEUE_H

#include <vector>

#include <vector>

#include "ns3/ipv4-routing-protocol.h"

#include "ns3/ipv4-routing-protocol.h"

Lines 196-199	Link Here

196

};

197

};

197

198

199

#endif /* __DSDV_PACKETQUEUE_H__ */

200

#endif /* DSDV_PACKETQUEUE_H */

(-)a/src/dsdv/model/dsdv-packet.h (-3 / +5 lines)

Lines 28-35	Link Here

 * NSF grant CNS-1050226 (Multilayer Network Resilience Analysis and Experimentation on GENI),

 * NSF grant CNS-1050226 (Multilayer Network Resilience Analysis and Experimentation on GENI),

 * US Department of Defense (DoD), and ITTC at The University of Kansas.

 * US Department of Defense (DoD), and ITTC at The University of Kansas.

*/

*/

#ifndef DSDVPACKET_H_

#define DSDVPACKET_H_

#ifndef DSDV_PACKET_H

#define DSDV_PACKET_H

#include <iostream>

#include <iostream>

#include "ns3/header.h"

#include "ns3/header.h"

Lines 108-111	Link Here

108

109

110

111

#endif /* DSDVPACKET_H_ */

112

113

#endif /* DSDV_PACKET_H */

(-)a/src/dsdv/model/dsdv-routing-protocol.h (-3 / +5 lines)

Lines 29-36	Link Here

 * NSF grant CNS-1050226 (Multilayer Network Resilience Analysis and Experimentation on GENI),

 * NSF grant CNS-1050226 (Multilayer Network Resilience Analysis and Experimentation on GENI),

 * US Department of Defense (DoD), and ITTC at The University of Kansas.

 * US Department of Defense (DoD), and ITTC at The University of Kansas.

*/

*/

#ifndef DSDVROUTINGPROTOCOL_H_

#define DSDVROUTINGPROTOCOL_H_

#ifndef DSDV_ROUTING_PROTOCOL_H

#define DSDV_ROUTING_PROTOCOL_H

#include "dsdv-rtable.h"

#include "dsdv-rtable.h"

#include "dsdv-packet-queue.h"

#include "dsdv-packet-queue.h"

Lines 192-195	Link Here

192

193

194

195

#endif /* DSDVROUTINGPROTOCOL_H_ */

196

197

#endif /* DSDV_ROUTING_PROTOCOL_H */

(-)a/src/dsdv/model/dsdv-rtable.h (-3 / +4 lines)

Lines 28-35	Link Here

 * NSF grant CNS-1050226 (Multilayer Network Resilience Analysis and Experimentation on GENI),

 * NSF grant CNS-1050226 (Multilayer Network Resilience Analysis and Experimentation on GENI),

 * US Department of Defense (DoD), and ITTC at The University of Kansas.

 * US Department of Defense (DoD), and ITTC at The University of Kansas.

*/

*/

#ifndef __DSDV_RTABLE_H__

#define __DSDV_RTABLE_H__

#ifndef DSDV_RTABLE_H

#define DSDV_RTABLE_H

#include <cassert>

#include <cassert>

#include <map>

#include <map>

Lines 345-348	Link Here

345

};

346

};

346

347

348

#endif /*__DSDV_RTABLE_H__ */

349

#endif /* DSDV_RTABLE_H */

(-)a/src/emu/model/emu-encode-decode.h (-1 / +1 lines)

Lines 29-33	Link Here

} // namespace ns3

} // namespace ns3

#endif // EMU_ENCODE_DECODE_H

#endif /* EMU_ENCODE_DECODE_H */

(-)a/src/emu/model/emu-net-device.h (-2 / +1 lines)

Lines 537-541	Link Here

537

538

} // namespace ns3

538

} // namespace ns3

539

540

#endif // EMU_NET_DEVICE_H

540

#endif /* EMU_NET_DEVICE_H */

541

(-)a/src/energy/model/li-ion-energy-source.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Andrea Sacco <andrea.sacco85@gmail.com>

 * Author: Andrea Sacco <andrea.sacco85@gmail.com>

*/

*/

#ifndef LI_ION_ENERGY_SOURCE

#ifndef LI_ION_ENERGY_SOURCE_H

#define LI_ION_ENERGY_SOURCE

#define LI_ION_ENERGY_SOURCE_H

#include "ns3/traced-value.h"

#include "ns3/traced-value.h"

#include "ns3/energy-source.h"

#include "ns3/energy-source.h"

Lines 201-204	Link Here

201

202

} // namespace ns3

202

} // namespace ns3

203

204

#endif /* LI_ION_ENERGY_SOURCE */

204

#endif /* LI_ION_ENERGY_SOURCE_H */

(-)a/src/energy/model/simple-device-energy-model.h (-3 / +4 lines)

Lines 4-11	Link Here

 *  Created on: 09/ago/2010

 *  Created on: 09/ago/2010

 *      Author: socket

 *      Author: socket

*/

*/

#ifndef SIMPLE_DEVICE_ENERGY_MODEL_H_

#define SIMPLE_DEVICE_ENERGY_MODEL_H_

#ifndef SIMPLE_DEVICE_ENERGY_MODEL_H

#define SIMPLE_DEVICE_ENERGY_MODEL_H

#include "ns3/device-energy-model.h"

#include "ns3/device-energy-model.h"

#include "ns3/nstime.h"

#include "ns3/nstime.h"

Lines 105-108	Link Here

105

106

} // namespace ns3

107

} // namespace ns3

107

108

#endif /* SIMPLE_DEVICE_ENERGY_MODEL_H_ */

109

#endif /* SIMPLE_DEVICE_ENERGY_MODEL_H */

(-)a/src/flow-monitor/model/flow-classifier.h (-4 / +3 lines)

Lines 18-25	Link Here

// Author: Gustavo J. A. M. Carneiro  <gjc@inescporto.pt> <gjcarneiro@gmail.com>

// Author: Gustavo J. A. M. Carneiro  <gjc@inescporto.pt> <gjcarneiro@gmail.com>

//

//

#ifndef __FLOW_CLASSIFIER_H__

#ifndef FLOW_CLASSIFIER_H

#define __FLOW_CLASSIFIER_H__

#define FLOW_CLASSIFIER_H

#include "ns3/simple-ref-count.h"

#include "ns3/simple-ref-count.h"

#include <ostream>

#include <ostream>

Lines 62-66	Link Here

} // namespace ns3

} // namespace ns3

#endif

#endif /* FLOW_CLASSIFIER_H */

(-)a/src/flow-monitor/model/flow-monitor.h (-3 / +3 lines)

Lines 18-25	Link Here

// Author: Gustavo J. A. M. Carneiro  <gjc@inescporto.pt> <gjcarneiro@gmail.com>

// Author: Gustavo J. A. M. Carneiro  <gjc@inescporto.pt> <gjcarneiro@gmail.com>

//

//

#ifndef __FLOW_MONITOR_H__

#ifndef FLOW_MONITOR_H

#define __FLOW_MONITOR_H__

#define FLOW_MONITOR_H

#include <vector>

#include <vector>

#include <map>

#include <map>

Lines 243-247	Link Here

243

244

} // namespace ns3

244

} // namespace ns3

245

246

#endif

246

#endif /* FLOW_MONITOR_H */

247

(-)a/src/flow-monitor/model/flow-probe.h (-4 / +3 lines)

Lines 18-25	Link Here

// Author: Gustavo J. A. M. Carneiro  <gjc@inescporto.pt> <gjcarneiro@gmail.com>

// Author: Gustavo J. A. M. Carneiro  <gjc@inescporto.pt> <gjcarneiro@gmail.com>

//

//

#ifndef __FLOW_PROBE_H__

#ifndef FLOW_PROBE_H

#define __FLOW_PROBE_H__

#define FLOW_PROBE_H

#include <map>

#include <map>

#include <vector>

#include <vector>

Lines 87-91	Link Here

} // namespace ns3

} // namespace ns3

#endif

#endif /* FLOW_PROBE_H */

(-)a/src/flow-monitor/model/histogram.h (-4 / +3 lines)

Lines 18-25	Link Here

// Author: Pedro Fortuna  <pedro.fortuna@inescporto.pt> <pedro.fortuna@gmail.com>

// Author: Pedro Fortuna  <pedro.fortuna@inescporto.pt> <pedro.fortuna@gmail.com>

//

//

#ifndef __NS3_HISTOGRAM_H__

#ifndef NS3_HISTOGRAM_H

#define __NS3_HISTOGRAM_H__

#define NS3_HISTOGRAM_H

#include <vector>

#include <vector>

#include <stdint.h>

#include <stdint.h>

Lines 60-64	Link Here

} // namespace ns3

} // namespace ns3

#endif

#endif /* NS3_HISTOGRAM_H */

(-)a/src/flow-monitor/model/ipv4-flow-classifier.h (-4 / +3 lines)

Lines 18-25	Link Here

// Author: Gustavo J. A. M. Carneiro  <gjc@inescporto.pt> <gjcarneiro@gmail.com>

// Author: Gustavo J. A. M. Carneiro  <gjc@inescporto.pt> <gjcarneiro@gmail.com>

//

//

#ifndef __IPV4_FLOW_CLASSIFIER_H__

#ifndef IPV4_FLOW_CLASSIFIER_H

#define __IPV4_FLOW_CLASSIFIER_H__

#define IPV4_FLOW_CLASSIFIER_H

#include <stdint.h>

#include <stdint.h>

#include <map>

#include <map>

Lines 74-78	Link Here

} // namespace ns3

} // namespace ns3

#endif

#endif /* IPV4_FLOW_CLASSIFIER_H */

(-)a/src/flow-monitor/model/ipv4-flow-probe.h (-4 / +3 lines)

Lines 18-25	Link Here

// Author: Gustavo J. A. M. Carneiro  <gjc@inescporto.pt> <gjcarneiro@gmail.com>

// Author: Gustavo J. A. M. Carneiro  <gjc@inescporto.pt> <gjcarneiro@gmail.com>

//

//

#ifndef __IPV4_FLOW_PROBE_H__

#ifndef IPV4_FLOW_PROBE_H

#define __IPV4_FLOW_PROBE_H__

#define IPV4_FLOW_PROBE_H

#include "ns3/flow-probe.h"

#include "ns3/flow-probe.h"

#include "ns3/ipv4-flow-classifier.h"

#include "ns3/ipv4-flow-classifier.h"

Lines 82-86	Link Here

} // namespace ns3

} // namespace ns3

#endif

#endif /* IPV4_FLOW_PROBE_H */

(-)a/src/internet/model/ipv4-packet-info-tag.h (-4 / +3 lines)

Lines 18-25	Link Here

 * Authors: Hajime Tazaki <tazaki@sfc.wide.ad.jp>

 * Authors: Hajime Tazaki <tazaki@sfc.wide.ad.jp>

*/

*/

#ifndef __IPV4_PACKET_INFO_TAG_H__

#ifndef IPV4_PACKET_INFO_TAG_H

#define __IPV4_PACKET_INFO_TAG_H__

#define IPV4_PACKET_INFO_TAG_H

#include "ns3/tag.h"

#include "ns3/tag.h"

#include "ns3/ipv4-address.h"

#include "ns3/ipv4-address.h"

Lines 86-90	Link Here

};

};

} //namespace ns3

} //namespace ns3

#endif /* __IPV4_PACKET_INFO_TAG_H__ */

#endif /* IPV4_PACKET_INFO_TAG_H */

(-)a/src/internet/model/ipv6-packet-info-tag.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Authors: Hajime Tazaki <tazaki@sfc.wide.ad.jp>

 * Authors: Hajime Tazaki <tazaki@sfc.wide.ad.jp>

*/

*/

#ifndef __IPV6_PACKET_INFO_TAG_H__

#ifndef IPV6_PACKET_INFO_TAG_H

#define __IPV6_PACKET_INFO_TAG_H__

#define IPV6_PACKET_INFO_TAG_H

#include "ns3/tag.h"

#include "ns3/tag.h"

#include "ns3/ipv6-address.h"

#include "ns3/ipv6-address.h"

Lines 91-95	Link Here

};

};

} //namespace ns3

} //namespace ns3

#endif /* __IPV6_PACKET_INFO_TAG_H__ */

#endif /* IPV6_PACKET_INFO_TAG_H */

(-)a/src/internet/model/pending-data.h (-3 / +3 lines)

Lines 21-28	Link Here

// Georgia Tech Network Simulator - Data Descriptors

// Georgia Tech Network Simulator - Data Descriptors

// George F. Riley.  Georgia Tech, Spring 2002

// George F. Riley.  Georgia Tech, Spring 2002

#ifndef __datapdu_h__

#ifndef PENDING_DATA_H

#define __datapdu_h__

#define PENDING_DATA_H

#include "ns3/packet.h"

#include "ns3/packet.h"

#include "pending-data.h"

#include "pending-data.h"

Lines 114-118	Link Here

114

};

114

};

115

116

} //namepsace ns3

116

} //namepsace ns3

117

#endif

118

117

118

#endif /* PENDING_DATA_H */

(-)a/src/internet/model/rtt-estimator.h (-5 / +3 lines)

Lines 22-29	Link Here

// George F. Riley.  Georgia Tech, Spring 2002

// George F. Riley.  Georgia Tech, Spring 2002

#ifndef __rtt_estimator_h__

#ifndef RTT_ESTIMATOR_H

#define __rtt_estimator_h__

#define RTT_ESTIMATOR_H

#include <deque>

#include <deque>

#include "ns3/sequence-number.h"

#include "ns3/sequence-number.h"

Lines 114-120	Link Here

114

  int64x64_t   variance;   // Current variance

114

  int64x64_t   variance;   // Current variance

115

};

115

};

116

} //namespace ns3

116

} //namespace ns3

117

#endif

118

117

119

118

#endif /* RTT_ESTIMATOR_H */

120

(-)a/src/internet/model/sim_errno.h (-3 / +3 lines)

Lines 1-5	Link Here

#ifndef NETWORK_SIMULATION_CRADLE_ERR_H_

#ifndef NSC_SIM_ERRNO_H

#define NETWORK_SIMULATION_CRADLE_ERR_H_

#define NSC_SIM_ERRNO_H

// list of network stack errors that may happen in a simulation,

// list of network stack errors that may happen in a simulation,

// and can be handled by the simulator in a sane way.

// and can be handled by the simulator in a sane way.

Lines 32-35	Link Here

  NSC_ETIMEDOUT = -140,

  NSC_ETIMEDOUT = -140,

};

};

#endif

#endif /* NSC_SIM_ERRNO_H */

(-)a/src/internet/model/sim_interface.h (-3 / +5 lines)

Lines 1-5	Link Here

#ifndef __SIM_INTERFACE_H__

/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */

#define __SIM_INTERFACE_H__

/*

/*

  Network Simulation Cradle

  Network Simulation Cradle

  Copyright (C) 2003-2005 Sam Jansen

  Copyright (C) 2003-2005 Sam Jansen

Lines 20-25	Link Here

*/

*/

#ifndef NSC_SIM_INTERFACE_H

#define NSC_SIM_INTERFACE_H

#define NSC_VERSION 0x000500

#define NSC_VERSION 0x000500

struct INetStack

struct INetStack

Lines 197-200	Link Here

197

#define CREATE_STACK_FUNC(a,b,c) extern "C" INetStack *nsc_create_stack ( \

199

#define CREATE_STACK_FUNC(a,b,c) extern "C" INetStack *nsc_create_stack ( \

198

    ISendCallback *a, IInterruptCallback *b, FRandom c)

200

    ISendCallback *a, IInterruptCallback *b, FRandom c)

199

201

200

#endif

202

#endif /* NSC_SIM_INTERFACE_H */

(-)a/src/internet/model/tcp-rx-buffer.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Adrian Sai-wah Tam <adrian.sw.tam@gmail.com>

 * Author: Adrian Sai-wah Tam <adrian.sw.tam@gmail.com>

*/

*/

#ifndef __TCP_RX_BUFFER_H__

#ifndef TCP_RX_BUFFER_H

#define __TCP_RX_BUFFER_H__

#define TCP_RX_BUFFER_H

#include <map>

#include <map>

#include "ns3/traced-value.h"

#include "ns3/traced-value.h"

Lines 86-89	Link Here

} //namepsace ns3

} //namepsace ns3

#endif /* __TCP_RX_BUFFER_H__ */

#endif /* TCP_RX_BUFFER_H */

(-)a/src/internet/model/tcp-socket.h (-2 / +2 lines)

Lines 20-27	Link Here

 *          Mathieu Lacage <mathieu.lacage@sophia.inria.fr>

 *          Mathieu Lacage <mathieu.lacage@sophia.inria.fr>

*/

*/

#ifndef __TCP_SOCKET_H__

#ifndef TCP_SOCKET_H

#define __TCP_SOCKET_H__

#define TCP_SOCKET_H

#include "ns3/socket.h"

#include "ns3/socket.h"

#include "ns3/traced-callback.h"

#include "ns3/traced-callback.h"

(-)a/src/internet/model/tcp-tx-buffer.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Adrian Sai-wah Tam <adrian.sw.tam@gmail.com>

 * Author: Adrian Sai-wah Tam <adrian.sw.tam@gmail.com>

*/

*/

#ifndef __TCP_TX_BUFFER_H__

#ifndef TCP_TX_BUFFER_H

#define __TCP_TX_BUFFER_H__

#define TCP_TX_BUFFER_H

#include <list>

#include <list>

#include "ns3/traced-value.h"

#include "ns3/traced-value.h"

Lines 118-121	Link Here

118

119

} // namepsace ns3

119

} // namepsace ns3

120

121

#endif

121

#endif /* TCP_TX_BUFFER_H */

(-)a/src/internet/model/udp-socket.h (-2 / +2 lines)

Lines 20-27	Link Here

 *          Mathieu Lacage <mathieu.lacage@sophia.inria.fr>

 *          Mathieu Lacage <mathieu.lacage@sophia.inria.fr>

*/

*/

#ifndef __UDP_SOCKET_H__

#ifndef UDP_SOCKET_H

#define __UDP_SOCKET_H__

#define UDP_SOCKET_H

#include "ns3/socket.h"

#include "ns3/socket.h"

#include "ns3/traced-callback.h"

#include "ns3/traced-callback.h"

(-)a/src/lte/model/bearer-qos-parameters.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Giuseppe Piro  <g.piro@poliba.it>

 * Author: Giuseppe Piro  <g.piro@poliba.it>

*/

*/

#ifndef BEARER_QOS_PARAMETERS_H_

#ifndef BEARER_QOS_PARAMETERS_H

#define BEARER_QOS_PARAMETERS_H_

#define BEARER_QOS_PARAMETERS_H

#include "ns3/object.h"

#include "ns3/object.h"

Lines 156-159	Link Here

156

157

158

159

#endif /* BEARER_QOS_PARAMETERS_H_ */

159

#endif /* BEARER_QOS_PARAMETERS_H */




/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
/*
 * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation;
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * Author: Giuseppe Piro  <g.piro@poliba.it>
 */

#ifndef JAKES_FADING_REALIZATIONS_H
#define JAKES_FADING_REALIZATIONS_H

#include "JakesTraces/multipath_v0_M6.h"
#include "JakesTraces/multipath_v0_M8.h"
#include "JakesTraces/multipath_v0_M10.h"
#include "JakesTraces/multipath_v0_M12.h"

#include "JakesTraces/multipath_v3_M6.h"
#include "JakesTraces/multipath_v3_M8.h"
#include "JakesTraces/multipath_v3_M10.h"
#include "JakesTraces/multipath_v3_M12.h"

#include "JakesTraces/multipath_v30_M6.h"
#include "JakesTraces/multipath_v30_M8.h"
#include "JakesTraces/multipath_v30_M10.h"
#include "JakesTraces/multipath_v30_M12.h"

#include "JakesTraces/multipath_v120_M6.h"
#include "JakesTraces/multipath_v120_M8.h"
#include "JakesTraces/multipath_v120_M10.h"
#include "JakesTraces/multipath_v120_M12.h"

#endif /* JAKES_FADING_REALIZATIONS_H */


#endif /* MULTIPATH_H_ */

(-)a/src/lte/model/ue-record.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Giuseppe Piro  <g.piro@poliba.it>

 * Author: Giuseppe Piro  <g.piro@poliba.it>

*/

*/

#ifndef UE_RECORD_H_

#ifndef UE_RECORD_H

#define UE_RECORD_H_

#define UE_RECORD_H

#include "ns3/net-device.h"

#include "ns3/net-device.h"

#include "ns3/object.h"

#include "ns3/object.h"

Lines 118-121	Link Here

118

119

; // namespace ns3

119

; // namespace ns3

120

121

#endif /* UE_RECORD_H_ */

121

#endif /* UE_RECORD_H */

(-)a/src/mesh/helper/flame/flame-installer.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Authors: Kirill Andreev <andreev@iitp.ru>

 * Authors: Kirill Andreev <andreev@iitp.ru>

*/

*/

#ifndef FLAME_STACK_INSTALLER_H

#ifndef FLAME_INSTALLER_H

#define FLAME_STACK_INSTALLER_H

#define FLAME_INSTALLER_H

#include "ns3/mesh-stack-installer.h"

#include "ns3/mesh-stack-installer.h"

Lines 75-79	Link Here

} //namespace ns3

} //namespace ns3

#endif // FLAME_STACK_INSTALLER_H

#endif /* FLAME_INSTALLER_H */

(-)a/src/mesh/model/dot11s/ie-dot11s-peer-management.h (-3 / +4 lines)

Lines 19-26	Link Here

 *          Aleksey Kovalenko <kovalenko@iitp.ru>

 *          Aleksey Kovalenko <kovalenko@iitp.ru>

*/

*/

#ifndef MESH_PEER_MAN_ELEMENT

#ifndef IE_DOT11S_PEER_MANAGEMENT_H

#define MESH_PEER_MAN_ELEMENT

#define IE_DOT11S_PEER_MANAGEMENT_H

#include "ns3/mesh-information-element-vector.h"

#include "ns3/mesh-information-element-vector.h"

Lines 98-101	Link Here

std::ostream &operator << (std::ostream &os, const IePeerManagement &peerMan);

std::ostream &operator << (std::ostream &os, const IePeerManagement &peerMan);

} // namespace dot11s

} // namespace dot11s

100

} //namespace ns3

100

} //namespace ns3

101

#endif

101

102

#endif /* IE_DOT11S_PEER_MANAGEMENT_H */




 *          Aleksey Kovalenko <kovalenko@iitp.ru>
 */

#ifndef PEER_LINK_H
#define PEER_LINK_H

#include "ns3/nstime.h"
#include "ns3/object.h"

#include "ns3/ie-dot11s-beacon-timing.h"
#include "ns3/ie-dot11s-peer-management.h"
#include "ns3/ie-dot11s-configuration.h"

namespace ns3 {
namespace dot11s {

class PeerManagementProtocolMac;
/**
 * \ingroup dot11s


} // namespace dot11s
} //namespace ns3

#endif /* PEER_LINK_H */

(-)a/src/mesh/model/dot11s/peer-management-protocol-mac.h (-3 / +4 lines)

Lines 18-25	Link Here

 * Author: Kirill Andreev <andreev@iitp.ru>

 * Author: Kirill Andreev <andreev@iitp.ru>

*/

*/

#ifndef PEER_MANAGER_MAC_PLUGIN_H_

#ifndef PEER_MANAGEMENT_PROTOCOL_MAC_H

#define PEER_MANAGER_MAC_PLUGIN_H_

#define PEER_MANAGEMENT_PROTOCOL_MAC_H

#include "ns3/mesh-wifi-interface-mac-plugin.h"

#include "ns3/mesh-wifi-interface-mac-plugin.h"

Lines 131-135	Link Here

131

132

} // namespace dot11s

132

} // namespace dot11s

133

} //namespace ns3

133

} //namespace ns3

134

#endif

135

134

135

#endif /* PEER_MANAGEMENT_PROTOCOL_MAC_H */

136

(-)a/src/mesh/model/mesh-wifi-beacon.h (-4 / +3 lines)

Lines 18-25	Link Here

 * Author: Pavel Boyko <boyko@iitp.ru>

 * Author: Pavel Boyko <boyko@iitp.ru>

*/

*/

#ifndef MESHWIFIBEACON_H_

#ifndef MESH_WIFI_BEACON_H

#define MESHWIFIBEACON_H_

#define MESH_WIFI_BEACON_H

#include "ns3/object.h"

#include "ns3/object.h"

#include "ns3/packet.h"

#include "ns3/packet.h"

Lines 72-76	Link Here

#endif /* MESH_WIFI_BEACON_H */

#endif /* MESHWIFIBEACON_H_ */

(-)a/src/mesh/model/mesh-wifi-interface-mac-plugin.h (-3 / +4 lines)

Lines 18-25	Link Here

 * Author: Pavel Boyko <boyko@iitp.ru>

 * Author: Pavel Boyko <boyko@iitp.ru>

*/

*/

#ifndef MESHWIFIINTERFACEMACPLUGIN_H_

#ifndef MESH_WIFI_INTERFACE_MAC_PLUGIN_H

#define MESHWIFIINTERFACEMACPLUGIN_H_

#define MESH_WIFI_INTERFACE_MAC_PLUGIN_H

#include "ns3/wifi-mac-header.h"

#include "ns3/wifi-mac-header.h"

#include "ns3/packet.h"

#include "ns3/packet.h"

Lines 68-71	Link Here

};

};

} // namespace ns3

} // namespace ns3

#endif /* MESHWIFIINTERFACEMACPLUGIN_H_ */

#endif /* MESH_WIFI_INTERFACE_MAC_PLUGIN_H */

(-)a/src/mesh/model/mesh-wifi-interface-mac.h (-3 / +4 lines)

Lines 19-26	Link Here

 *          Pavel Boyko <boyko@iitp.ru>

 *          Pavel Boyko <boyko@iitp.ru>

*/

*/

#ifndef MESHWIFIINTERFACEMAC_H_

#ifndef MESH_WIFI_INTERFACE_MAC_H

#define MESHWIFIINTERFACEMAC_H_

#define MESH_WIFI_INTERFACE_MAC_H

#include <stdint.h>

#include <stdint.h>

#include <map>

#include <map>

Lines 34-39	Link Here

#include "ns3/mesh-wifi-interface-mac-plugin.h"

#include "ns3/mesh-wifi-interface-mac-plugin.h"

#include "ns3/event-id.h"

#include "ns3/event-id.h"

#include "qos-utils.h"

#include "qos-utils.h"

namespace ns3 {

namespace ns3 {

class WifiMacHeader;

class WifiMacHeader;

Lines 189-192	Link Here

189

190

} // namespace ns3

191

} // namespace ns3

191

192

#endif /* MESHWIFIINTERFACEMAC_H_ */

193

#endif /* MESH_WIFI_INTERFACE_MAC_H */

(-)a/src/mesh/test/dot11s/pmp-regression.h (-1 / +2 lines)

Lines 17-22	Link Here

 * Authors: Pavel Boyko <boyko@iitp.ru>

 * Authors: Pavel Boyko <boyko@iitp.ru>

*/

*/

#ifndef PMP_REGRESSION_H

#ifndef PMP_REGRESSION_H

#define PMP_REGRESSION_H

#define PMP_REGRESSION_H

#include "ns3/test.h"

#include "ns3/test.h"

Lines 58-62	Link Here

  void CheckResults ();

  void CheckResults ();

  void DoRun ();

  void DoRun ();

};

};

#endif // PMP_REGRESSION_H

#endif /* PMP_REGRESSION_H */

(-)a/src/network/model/application.h (-3 / +4 lines)

Lines 18-25	Link Here

 * Author: George F. Riley<riley@ece.gatech.edu>

 * Author: George F. Riley<riley@ece.gatech.edu>

*/

*/

#ifndef __APPLICATION_H__

#ifndef APPLICATION_H

#define __APPLICATION_H__

#define APPLICATION_H

#include "ns3/event-id.h"

#include "ns3/event-id.h"

#include "ns3/nstime.h"

#include "ns3/nstime.h"

Lines 131-134	Link Here

131

};

131

};

132

133

} //namespace ns3

133

} //namespace ns3

134

#endif

134

135

#endif /* APPLICATION_H */

(-)a/src/network/model/nix-vector.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Authors: Josh Pelkey <jpelkey@gatech.edu>

 * Authors: Josh Pelkey <jpelkey@gatech.edu>

*/

*/

#ifndef __NIX_VECTOR_H__

#ifndef NIX_VECTOR_H

#define __NIX_VECTOR_H__

#define NIX_VECTOR_H

#include "ns3/ptr.h"

#include "ns3/ptr.h"

#include "ns3/simple-ref-count.h"

#include "ns3/simple-ref-count.h"

Lines 185-188	Link Here

185

};

185

};

186

} // namespace ns3

186

} // namespace ns3

187

188

#endif

188

#endif /* NIX_VECTOR_H */

(-)a/src/network/model/socket.h (-5 / +3 lines)

Lines 20-27	Link Here

 *          Mathieu Lacage <mathieu.lacage@sophia.inria.fr>

 *          Mathieu Lacage <mathieu.lacage@sophia.inria.fr>

*/

*/

#ifndef __SOCKET_H__

#ifndef NS3_SOCKET_H

#define __SOCKET_H__

#define NS3_SOCKET_H

#include "ns3/callback.h"

#include "ns3/callback.h"

#include "ns3/ptr.h"

#include "ns3/ptr.h"

Lines 688-693	Link Here

688

689

} //namespace ns3

689

} //namespace ns3

690

691

#endif /* SOCKET_H */

691

#endif /* NS3_SOCKET_H */

692

693

(-)a/src/network/utils/inet6-socket-address.h (-2 / +1 lines)

Lines 18-24	Link Here

 * Author: Sebastien Vincent <vincent@clarinet.u-strasbg.fr>

 * Author: Sebastien Vincent <vincent@clarinet.u-strasbg.fr>

*/

*/

#ifndef INET6_SOCKET_ADDRESS_H

#ifndef INET6_SOCKET_ADDRESS_H

#define INET6_SOCKET_ADDRESS_H

#define INET6_SOCKET_ADDRESS_H

#include <stdint.h>

#include <stdint.h>

Lines 139-142	Link Here

139

} /* namespace ns3 */

139

} /* namespace ns3 */

140

141

#endif /* INET6_SOCKET_ADDRESS_H */

141

#endif /* INET6_SOCKET_ADDRESS_H */

142

(-)a/src/network/utils/output-stream-wrapper.h (-1 / +1 lines)

Lines 90-93	Link Here

} //namespace ns3

} //namespace ns3

#endif // OUTPUT_STREAM_WRAPPER_H

#endif /* OUTPUT_STREAM_WRAPPER_H */

(-)a/src/network/utils/pcap-file-wrapper.h (-1 / +1 lines)

Lines 201-204	Link Here

201

202

} //namespace ns3

202

} //namespace ns3

203

204

#endif // PCAP_FILE_WRAPPER_H

204

#endif /* PCAP_FILE_WRAPPER_H */

(-)a/src/network/utils/sequence-number.h (-3 / +3 lines)

Lines 18-25	Link Here

// Author: Gustavo J. A. M. Carneiro  <gjc@inescporto.pt> <gjcarneiro@gmail.com>

// Author: Gustavo J. A. M. Carneiro  <gjc@inescporto.pt> <gjcarneiro@gmail.com>

//

//

#ifndef __NS3_SEQ_NUM_H__

#ifndef NS3_SEQ_NUM_H

#define __NS3_SEQ_NUM_H__

#define NS3_SEQ_NUM_H

#include <limits>

#include <limits>

#include <iostream>

#include <iostream>

Lines 293-298	Link Here

293

294

} // namespace ns3

294

} // namespace ns3

295

296

#endif

296

#endif /* NS3_SEQ_NUM_H */

297

298

(-)a/src/nix-vector-routing/model/ipv4-nix-vector-routing.h (-3 / +4 lines)

Lines 18-25	Link Here

 * Authors: Josh Pelkey <jpelkey@gatech.edu>

 * Authors: Josh Pelkey <jpelkey@gatech.edu>

*/

*/

#ifndef __IPV4_NIX_VECTOR_ROUTING_H__

#ifndef IPV4_NIX_VECTOR_ROUTING_H

#define __IPV4_NIX_VECTOR_ROUTING_H__

#define IPV4_NIX_VECTOR_ROUTING_H

#include <map>

#include <map>

Lines 167-170	Link Here

167

  uint32_t m_totalNeighbors;

167

  uint32_t m_totalNeighbors;

168

};

168

};

169

} // namespace ns3

169

} // namespace ns3

170

#endif

170

171

#endif /* IPV4_NIX_VECTOR_ROUTING_H */

(-)a/src/olsr/model/olsr-repositories.h (-3 / +3 lines)

Lines 25-32	Link Here

/// \brief	Here are defined all data structures needed by an OLSR node.

/// \brief	Here are defined all data structures needed by an OLSR node.

///

///

#ifndef __OLSR_REPOSITORIES_H__

#ifndef OLSR_REPOSITORIES_H

#define __OLSR_REPOSITORIES_H__

#define OLSR_REPOSITORIES_H

#include <set>

#include <set>

#include <vector>

#include <vector>

Lines 301-304	Link Here

301

302

                }}; // namespace ns3, olsr

302

                }}; // namespace ns3, olsr

303

304

#endif  /* __OLSR_REPOSITORIES_H__ */

304

#endif /* OLSR_REPOSITORIES_H */

(-)a/src/olsr/model/olsr-routing-protocol.h (-4 / +3 lines)

Lines 20-28	Link Here

 *          Gustavo J. A. M. Carneiro <gjc@inescporto.pt>

 *          Gustavo J. A. M. Carneiro <gjc@inescporto.pt>

*/

*/

#ifndef OLSR_AGENT_IMPL_H

#ifndef __OLSR_AGENT_IMPL_H__

#define OLSR_AGENT_IMPL_H

#define __OLSR_AGENT_IMPL_H__

#include "olsr-header.h"

#include "olsr-header.h"

#include "ns3/test.h"

#include "ns3/test.h"

Lines 306-309	Link Here

306

305

307

}  // namespace ns3

306

}  // namespace ns3

308

307

309

#endif

308

#endif /* OLSR_AGENT_IMPL_H */

(-)a/src/olsr/model/olsr-state.h (-3 / +3 lines)

Lines 22-29	Link Here

/// \brief	This header file declares and defines internal state of an OLSR node.

/// \brief	This header file declares and defines internal state of an OLSR node.

#ifndef __OLSR_STATE_H__

#ifndef OLSR_STATE_H

#define __OLSR_STATE_H__

#define OLSR_STATE_H

#include "olsr-repositories.h"

#include "olsr-repositories.h"

Lines 177-180	Link Here

177

178

} // namespace ns3

178

} // namespace ns3

179

180

#endif

180

#endif /* OLSR_STATE_H */

(-)a/src/olsr/test/bug780-test.h (-3 / +5 lines)

Lines 16-23	Link Here

 * Authors: Pavel Boyko <boyko@iitp.ru>

 * Authors: Pavel Boyko <boyko@iitp.ru>

*/

*/

#ifndef BUG780_REGRESSIONTEST_H_

#ifndef BUG780_TEST_H

#define BUG780_REGRESSIONTEST_H_

#define BUG780_TEST_H

#include "ns3/test.h"

#include "ns3/test.h"

#include "ns3/nstime.h"

#include "ns3/nstime.h"

#include "ns3/node-container.h"

#include "ns3/node-container.h"

Lines 46-49	Link Here

#endif

#endif /* BUG780_TEST_H */

(-)a/src/olsr/test/hello-regression-test.h (-3 / +5 lines)

Lines 18-25	Link Here

 * Authors: Pavel Boyko <boyko@iitp.ru>

 * Authors: Pavel Boyko <boyko@iitp.ru>

*/

*/

#ifndef HELLOREGRESSIONTEST_H_

#ifndef HELLO_REGRESSION_TEST_H

#define HELLOREGRESSIONTEST_H_

#define HELLO_REGRESSION_TEST_H

#include "ns3/test.h"

#include "ns3/test.h"

#include "ns3/nstime.h"

#include "ns3/nstime.h"

#include "ns3/node-container.h"

#include "ns3/node-container.h"

Lines 66-69	Link Here

#endif /* HELLOREGRESSIONTEST_H_ */

#endif /* HELLO_REGRESSION_TEST_H */

(-)a/src/olsr/test/tc-regression-test.h (-3 / +5 lines)

Lines 18-25	Link Here

 * Authors: Pavel Boyko <boyko@iitp.ru>

 * Authors: Pavel Boyko <boyko@iitp.ru>

*/

*/

#ifndef TCREGRESSIONTEST_H_

#ifndef TC_REGRESSION_TEST_H

#define TCREGRESSIONTEST_H_

#define TC_REGRESSION_TEST_H

#include "ns3/test.h"

#include "ns3/test.h"

#include "ns3/nstime.h"

#include "ns3/nstime.h"

#include "ns3/node-container.h"

#include "ns3/node-container.h"

Lines 93-96	Link Here

#endif /* TCREGRESSIONTEST_H_ */

#endif /* TC_REGRESSION_TEST_H */

(-)a/src/point-to-point/model/point-to-point-net-device.h (-2 / +1 lines)

Lines 468-472	Link Here

468

469

} // namespace ns3

469

} // namespace ns3

470

471

#endif // POINT_TO_POINT_NET_DEVICE_H

471

#endif /* POINT_TO_POINT_NET_DEVICE_H */

472

(-)a/src/propagation/model/cost231-propagation-loss-model.h (-3 / +3 lines)

Lines 19-26	Link Here

 *                              <amine.ismail@udcast.com>

 *                              <amine.ismail@udcast.com>

*/

*/

#ifndef COST231_PROPAGATION_LOSS_MODEL_H_

#ifndef COST231_PROPAGATION_LOSS_MODEL_H

#define COST231_PROPAGATION_LOSS_MODEL_H_

#define COST231_PROPAGATION_LOSS_MODEL_H

#include "ns3/nstime.h"

#include "ns3/nstime.h"

#include "ns3/propagation-loss-model.h"

#include "ns3/propagation-loss-model.h"

Lines 92-95	Link Here

#endif /* COST231PROPAGATIONMODEL_H_ */

#endif /* COST231PROPAGATIONMODEL_H */

(-)a/src/spectrum/model/aloha-noack-net-device.h (-1 / +1 lines)

Lines 227-230	Link Here

227

228

} // namespace ns3

228

} // namespace ns3

229

230

#endif // ALOHA_NOACK_NET_DEVICE_H

230

#endif /* ALOHA_NOACK_NET_DEVICE_H */

(-)a/src/spectrum/model/non-communicating-net-device.h (-1 / +1 lines)

Lines 134-137	Link Here

134

135

} // namespace ns3

135

} // namespace ns3

136

137

#endif // NON_COMMUNICATING_NET_DEVICE_H

137

#endif /* NON_COMMUNICATING_NET_DEVICE_H */

(-)a/src/stats/model/basic-data-calculators.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Joe Kopena (tjkopena@cs.drexel.edu)

 * Author: Joe Kopena (tjkopena@cs.drexel.edu)

*/

*/

#ifndef __BASIC_DATA_CALCULATORS_H__

#ifndef BASIC_DATA_CALCULATORS_H

#define __BASIC_DATA_CALCULATORS_H__

#define BASIC_DATA_CALCULATORS_H

#include "data-calculator.h"

#include "data-calculator.h"

#include "data-output-interface.h"

#include "data-output-interface.h"

Lines 263-266	Link Here

263

};

263

};

264

265

266

#endif // __BASIC_DATA_CALCULATORS_H__

266

#endif /* BASIC_DATA_CALCULATORS_H */

(-)a/src/stats/model/data-calculator.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Joe Kopena (tjkopena@cs.drexel.edu)

 * Author: Joe Kopena (tjkopena@cs.drexel.edu)

*/

*/

#ifndef __DATA_CALCULATOR_H__

#ifndef DATA_CALCULATOR_H

#define __DATA_CALCULATOR_H__

#define DATA_CALCULATOR_H

#include "ns3/object.h"

#include "ns3/object.h"

#include "ns3/nstime.h"

#include "ns3/nstime.h"

Lines 124-127	Link Here

124

};

124

};

125

126

127

#endif // __DATA_CALCULATOR_H__

127

#endif /* DATA_CALCULATOR_H */

(-)a/src/stats/model/data-collector.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Joe Kopena (tjkopena@cs.drexel.edu)

 * Author: Joe Kopena (tjkopena@cs.drexel.edu)

*/

*/

#ifndef __DATA_COLLECTOR_H__

#ifndef DATA_COLLECTOR_H

#define __DATA_COLLECTOR_H__

#define DATA_COLLECTOR_H

#include <list>

#include <list>

#include <string>

#include <string>

Lines 89-92	Link Here

// end namespace ns3

// end namespace ns3

};

};

#endif // __DATA_COLLECTOR_H__

#endif /* DATA_COLLECTOR_H */

(-)a/src/stats/model/data-output-interface.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Joe Kopena (tjkopena@cs.drexel.edu)

 * Author: Joe Kopena (tjkopena@cs.drexel.edu)

*/

*/

#ifndef __DATA_OUTPUT_INTERFACE_H__

#ifndef DATA_OUTPUT_INTERFACE_H

#define __DATA_OUTPUT_INTERFACE_H__

#define DATA_OUTPUT_INTERFACE_H

#include "ns3/object.h"

#include "ns3/object.h"

#include "ns3/nstime.h"

#include "ns3/nstime.h"

Lines 91-94	Link Here

};

};

#endif // __DATA_OUTPUT_INTERFACE_H__

#endif /* DATA_OUTPUT_INTERFACE_H */

(-)a/src/stats/model/omnet-data-output.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Joe Kopena (tjkopena@cs.drexel.edu)

 * Author: Joe Kopena (tjkopena@cs.drexel.edu)

*/

*/

#ifndef __OMNET_DATA_OUTPUT_H__

#ifndef OMNET_DATA_OUTPUT_H

#define __OMNET_DATA_OUTPUT_H__

#define OMNET_DATA_OUTPUT_H

#include "ns3/nstime.h"

#include "ns3/nstime.h"

Lines 85-88	Link Here

};

};

#endif // __OMNET_DATA_OUTPUT_H__

#endif /* OMNET_DATA_OUTPUT_H */

(-)a/src/stats/model/packet-data-calculators.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Joe Kopena (tjkopena@cs.drexel.edu)

 * Author: Joe Kopena (tjkopena@cs.drexel.edu)

*/

*/

#ifndef __PACKET_DATA_CALCULATORS_H__

#ifndef PACKET_DATA_CALCULATORS_H

#define __PACKET_DATA_CALCULATORS_H__

#define PACKET_DATA_CALCULATORS_H

#include "ns3/packet.h"

#include "ns3/packet.h"

#include "ns3/mac48-address.h"

#include "ns3/mac48-address.h"

Lines 73-76	Link Here

};

};

#endif // __PACKET_DATA_CALCULATORS_H__

#endif /* PACKET_DATA_CALCULATORS_H */

(-)a/src/stats/model/sqlite-data-output.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Joe Kopena (tjkopena@cs.drexel.edu)

 * Author: Joe Kopena (tjkopena@cs.drexel.edu)

*/

*/

#ifndef __SQLITE_DATA_OUTPUT_H__

#ifndef SQLITE_DATA_OUTPUT_H

#define __SQLITE_DATA_OUTPUT_H__

#define SQLITE_DATA_OUTPUT_H

#include "ns3/nstime.h"

#include "ns3/nstime.h"

Lines 94-97	Link Here

};

};

#endif // __SQLITE_DATA_OUTPUT_H__

#endif /* SQLITE_DATA_OUTPUT_H */

(-)a/src/stats/model/time-data-calculators.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Joe Kopena (tjkopena@cs.drexel.edu)

 * Author: Joe Kopena (tjkopena@cs.drexel.edu)

*/

*/

#ifndef __TIME_DATA_CALCULATORS_H__

#ifndef TIME_DATA_CALCULATORS_H

#define __TIME_DATA_CALCULATORS_H__

#define TIME_DATA_CALCULATORS_H

#include "ns3/nstime.h"

#include "ns3/nstime.h"

Lines 61-64	Link Here

};

};

#endif // __TIME_DATA_CALCULATORS_H__

#endif /* TIME_DATA_CALCULATORS_H */

(-)a/src/tap-bridge/model/tap-encode-decode.h (-1 / +1 lines)

Lines 29-33	Link Here

} // namespace ns3

} // namespace ns3

#endif // TAP_ENCODE_DECODE_H

#endif /* TAP_ENCODE_DECODE_H */

(-)a/src/topology-read/model/inet-topology-reader.h (-3 / +3 lines)

Lines 19-26	Link Here

 * Author: Valerio Sartini (valesar@gmail.com)

 * Author: Valerio Sartini (valesar@gmail.com)

*/

*/

#ifndef __INET_TOPOLOGY_READER_H__

#ifndef INET_TOPOLOGY_READER_H

#define __INET_TOPOLOGY_READER_H__

#define INET_TOPOLOGY_READER_H

#include "ns3/nstime.h"

#include "ns3/nstime.h"

Lines 76-79	Link Here

};

};

#endif // __INET_TOPOLOGY_READER_H__

#endif /* INET_TOPOLOGY_READER_H */

(-)a/src/topology-read/model/orbis-topology-reader.h (-4 / +3 lines)

Lines 19-26	Link Here

 * Author: Valerio Sartini (valesar@gmail.com)

 * Author: Valerio Sartini (valesar@gmail.com)

*/

*/

#ifndef __ORBIS_TOPOLOGY_READER_H__

#ifndef ORBIS_TOPOLOGY_READER_H

#define __ORBIS_TOPOLOGY_READER_H__

#define ORBIS_TOPOLOGY_READER_H

#include "ns3/nstime.h"

#include "ns3/nstime.h"

Lines 71-76	Link Here

};

};

#endif // __ORBIS_TOPOLOGY_READER_H__

#endif /* ORBIS_TOPOLOGY_READER_H */

(-)a/src/topology-read/model/rocketfuel-topology-reader.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Hajime Tazaki (tazaki@sfc.wide.ad.jp)

 * Author: Hajime Tazaki (tazaki@sfc.wide.ad.jp)

*/

*/

#ifndef __ROCKETFUEL_TOPOLOGY_READER_H__

#ifndef ROCKETFUEL_TOPOLOGY_READER_H

#define __ROCKETFUEL_TOPOLOGY_READER_H__

#define ROCKETFUEL_TOPOLOGY_READER_H

#include "ns3/nstime.h"

#include "ns3/nstime.h"

Lines 84-89	Link Here

};

};

#endif // __ROCKETFUEL_TOPOLOGY_READER_H__

#endif /* ROCKETFUEL_TOPOLOGY_READER_H */

(-)a/src/topology-read/model/topology-reader.h (-3 / +3 lines)

Lines 19-26	Link Here

 * Author: Valerio Sartini (valesar@gmail.com)

 * Author: Valerio Sartini (valesar@gmail.com)

*/

*/

#ifndef __TOPOLOGY_READER_H__

#ifndef TOPOLOGY_READER_H

#define __TOPOLOGY_READER_H__

#define TOPOLOGY_READER_H

#include <string>

#include <string>

#include <map>

#include <map>

Lines 197-200	Link Here

197

};

197

};

198

199

200

#endif // __TOPOLOGY_READER_H__

200

#endif /* TOPOLOGY_READER_H */

(-)a/src/uan/examples/uan-cw-example.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Leonard Tracy <lentracy@gmail.com>

 * Author: Leonard Tracy <lentracy@gmail.com>

*/

*/

#ifndef UANCWEXAMPLE_H

#ifndef UAN_CW_EXAMPLE_H

#define UANCWEXAMPLE_H

#define UAN_CW_EXAMPLE_H

#include "ns3/network-module.h"

#include "ns3/network-module.h"

#include "ns3/tools-module.h"

#include "ns3/tools-module.h"

Lines 64-67	Link Here

  Experiment ();

  Experiment ();

};

};

#endif //UANCWEXAMPLE_H

#endif /* UAN_CW_EXAMPLE_H */

(-)a/src/uan/examples/uan-rc-example.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Leonard Tracy <lentracy@gmail.com>

 * Author: Leonard Tracy <lentracy@gmail.com>

*/

*/

#ifndef UANRCEXAMPLE_H

#ifndef UAN_RC_EXAMPLE_H

#define UANRCEXAMPLE_H

#define UAN_RC_EXAMPLE_H

#include "ns3/network-module.h"

#include "ns3/network-module.h"

#include "ns3/tools-module.h"

#include "ns3/tools-module.h"

Lines 61-64	Link Here

};

};

#endif //UANRCEXAMPLE_H

#endif /* UAN_RC_EXAMPLE_H */




 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 * Author: Leonard Tracy <lentracy@u.washington.edu>
 *
 *
 */

#ifndef UAN_HELPER_H
#define UAN_HELPER_H

#include <string>
#include "ns3/attribute.h"


} // end namespace ns3

#endif /* UAN_HELPER_H */

(-)a/src/uan/model/uan-address.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Leonard Tracy <lentracy@gmail.com>

 * Author: Leonard Tracy <lentracy@gmail.com>

*/

*/

#ifndef UANADDRESS_H

#ifndef UAN_ADDRESS_H

#define UANADDRESS_H

#define UAN_ADDRESS_H

#include "ns3/address.h"

#include "ns3/address.h"

#include <iostream>

#include <iostream>

Lines 126-129	Link Here

126

127

} // namespace ns3

127

} // namespace ns3

128

129

#endif // UANADDRESS_H

129

#endif /* UAN_ADDRESS_H */

(-)a/src/uan/model/uan-channel.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Leonard Tracy <lentracy@gmail.com>

 * Author: Leonard Tracy <lentracy@gmail.com>

*/

*/

#ifndef UANCHANNEL_H

#ifndef UAN_CHANNEL_H

#define UANCHANNEL_H

#define UAN_CHANNEL_H

#include "ns3/net-device.h"

#include "ns3/net-device.h"

#include "ns3/channel.h"

#include "ns3/channel.h"

Lines 112-115	Link Here

112

113

114

115

#endif // UANCHANNEL_H

115

#endif /* UAN_CHANNEL_H */

(-)a/src/uan/model/uan-header-common.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Leonard Tracy <lentracy@gmail.com>

 * Author: Leonard Tracy <lentracy@gmail.com>

*/

*/

#ifndef UANHEADERCOMMON_H

#ifndef UAN_HEADER_COMMON_H

#define UANHEADERCOMMON_H

#define UAN_HEADER_COMMON_H

#include "ns3/header.h"

#include "ns3/header.h"

#include "ns3/nstime.h"

#include "ns3/nstime.h"

Lines 93-96	Link Here

#endif // UANHEADERCOMMON_H

#endif /* UAN_HEADER_COMMON_H */

(-)a/src/uan/model/uan-header-rc.h (-3 / +3 lines)

Lines 19-26	Link Here

*/

*/

#ifndef UANHEADERRC_H

#ifndef UAN_HEADER_RC_H

#define UANHEADERRC_H

#define UAN_HEADER_RC_H

#include "ns3/header.h"

#include "ns3/header.h"

#include "ns3/nstime.h"

#include "ns3/nstime.h"

Lines 372-375	Link Here

372

373

374

375

#endif // UANHEADERRC_H

375

#endif /* UAN_HEADER_RC_H */

(-)a/src/uan/model/uan-mac-aloha.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Leonard Tracy <lentracy@gmail.com>

 * Author: Leonard Tracy <lentracy@gmail.com>

*/

*/

#ifndef UANMACALOHA_H

#ifndef UAN_MAC_ALOHA_H

#define UANMACALOHA_H

#define UAN_MAC_ALOHA_H

#include "uan-mac.h"

#include "uan-mac.h"

#include "uan-address.h"

#include "uan-address.h"

Lines 82-85	Link Here

#endif // UANMACALOHA_H

#endif /* UAN_MAC_ALOHA_H */

(-)a/src/uan/model/uan-mac-cw.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Leonard Tracy <lentracy@gmail.com>

 * Author: Leonard Tracy <lentracy@gmail.com>

*/

*/

#ifndef UANMACCW_H

#ifndef UAN_MAC_CW_H

#define UANMACCW_H

#define UAN_MAC_CW_H

#include "ns3/uan-mac.h"

#include "ns3/uan-mac.h"

#include "ns3/nstime.h"

#include "ns3/nstime.h"

Lines 126-129	Link Here

126

127

128

129

#endif // UANMACCW_H

129

#endif /* UAN_MAC_CW_H */

(-)a/src/uan/model/uan-mac-rc-gw.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Leonard Tracy <lentracy@gmail.com>

 * Author: Leonard Tracy <lentracy@gmail.com>

*/

*/

#ifndef UANMACRCGW_H

#ifndef UAN_MAC_RC_GW_H

#define UANMACRCGW_H

#define UAN_MAC_RC_GW_H

#include "uan-mac.h"

#include "uan-mac.h"

#include "uan-address.h"

#include "uan-address.h"

Lines 164-167	Link Here

164

165

166

167

#endif // UANMACRCGW_H

167

#endif /* UAN_MAC_RC_GW_H */

(-)a/src/uan/model/uan-mac-rc.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Leonard Tracy <lentracy@gmail.com>

 * Author: Leonard Tracy <lentracy@gmail.com>

*/

*/

#ifndef UANMACRC_H

#ifndef UAN_MAC_RC_H

#define UANMACRC_H

#define UAN_MAC_RC_H

#include "uan-mac.h"

#include "uan-mac.h"

#include "uan-address.h"

#include "uan-address.h"

Lines 214-217	Link Here

214

215

216

217

#endif // UANMACRC_H

217

#endif /* UAN_MAC_RC_H */

(-)a/src/uan/model/uan-mac.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Leonard Tracy <lentracy@gmail.com>

 * Author: Leonard Tracy <lentracy@gmail.com>

*/

*/

#ifndef UANMAC_H

#ifndef UAN_MAC_H

#define UANMAC_H

#define UAN_MAC_H

#include "ns3/address.h"

#include "ns3/address.h"

#include "ns3/object.h"

#include "ns3/object.h"

Lines 93-96	Link Here

#endif // UANMAC_H

#endif /* UAN_MAC_H */

(-)a/src/uan/model/uan-net-device.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Leonard Tracy <lentracy@gmail.com>

 * Author: Leonard Tracy <lentracy@gmail.com>

*/

*/

#ifndef UANNETDEVICE_H

#ifndef UAN_NET_DEVICE_H

#define UANNETDEVICE_H

#define UAN_NET_DEVICE_H

#include "ns3/net-device.h"

#include "ns3/net-device.h"

#include "ns3/pointer.h"

#include "ns3/pointer.h"

Lines 154-157	Link Here

154

155

} // namespace ns3

155

} // namespace ns3

156

157

#endif // UANNETDEVICE_H

157

#endif /* UAN_NET_DEVICE_H */

(-)a/src/uan/model/uan-noise-model-default.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Leonard Tracy <lentracy@gmail.com>

 * Author: Leonard Tracy <lentracy@gmail.com>

*/

*/

#ifndef UANNOISEMODELDEFAULT_H

#ifndef UAN_NOISE_MODEL_DEFAULT_H

#define UANNOISEMODELDEFAULT_H

#define UAN_NOISE_MODEL_DEFAULT_H

#include "ns3/uan-noise-model.h"

#include "ns3/uan-noise-model.h"

#include "ns3/attribute.h"

#include "ns3/attribute.h"

Lines 63-66	Link Here

#endif // UANNOISEMODELDEFAULT_H

#endif /* UAN_NOISE_MODEL_DEFAULT_H */

(-)a/src/uan/model/uan-noise-model.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Leonard Tracy <lentracy@gmail.com>

 * Author: Leonard Tracy <lentracy@gmail.com>

*/

*/

#ifndef UANNOISEMODEL_H

#ifndef UAN_NOISE_MODEL_H

#define UANNOISEMODEL_H

#define UAN_NOISE_MODEL_H

#include "ns3/object.h"

#include "ns3/object.h"

Lines 44-47	Link Here

} // namespace ns3

} // namespace ns3

#endif // UANNOISEMODEL_H

#endif /* UAN_NOISE_MODEL_H */

(-)a/src/uan/model/uan-phy-dual.h (-3 / +3 lines)

Lines 19-26	Link Here

 *         Andrea Sacco <andrea.sacco85@gmail.com>

 *         Andrea Sacco <andrea.sacco85@gmail.com>

*/

*/

#ifndef UANPHYDUAL_H

#ifndef UAN_PHY_DUAL_H

#define UANPHYDUAL_H

#define UAN_PHY_DUAL_H

#include "ns3/uan-phy.h"

#include "ns3/uan-phy.h"

Lines 279-282	Link Here

279

280

281

282

#endif // UANPHYDUAL_H

282

#endif /* UAN_PHY_DUAL_H */

(-)a/src/uan/model/uan-phy-gen.h (-3 / +3 lines)

Lines 19-26	Link Here

 *         Andrea Sacco <andrea.sacco85@gmail.com>

 *         Andrea Sacco <andrea.sacco85@gmail.com>

*/

*/

#ifndef UANPHYGEN_H

#ifndef UAN_PHY_GEN_H

#define UANPHYGEN_H

#define UAN_PHY_GEN_H

#include "uan-phy.h"

#include "uan-phy.h"

Lines 261-264	Link Here

261

262

} // namespace ns3

262

} // namespace ns3

263

264

#endif // UANPHYGEN_H

264

#endif /* UAN_PHY_GEN_H */

(-)a/src/uan/model/uan-phy.h (-3 / +3 lines)

Lines 20-27	Link Here

*/

*/

#ifndef UANPHY_H

#ifndef UAN_PHY_H

#define UANPHY_H

#define UAN_PHY_H

#include "ns3/object.h"

#include "ns3/object.h"

#include "ns3/uan-mac.h"

#include "ns3/uan-mac.h"

Lines 378-381	Link Here

378

379

380

381

#endif // UANPHY_H

381

#endif /* UAN_PHY_H */




 * Author: Leonard Tracy <lentracy@gmail.com>
 */

#ifndef UAN_PROP_MODEL_IDEAL_H
#define UAN_PROP_MODEL_IDEAL_H

#include "uan-prop-model.h"
#include "ns3/mobility-model.h"
#include "ns3/nstime.h"

namespace ns3 {

/**


}

#endif /* UAN_PROP_MODEL_IDEAL_H */

(-)a/src/uan/model/uan-prop-model-thorp.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Leonard Tracy <lentracy@gmail.com>

 * Author: Leonard Tracy <lentracy@gmail.com>

*/

*/

#ifndef UANPROPMODELTHORP_H_

#ifndef UAN_PROP_MODEL_THORP_H

#define UANPROPMODELTHORP_H_

#define UAN_PROP_MODEL_THORP_H

#include "uan-prop-model.h"

#include "uan-prop-model.h"

Lines 51-54	Link Here

#endif /* UANPROPMODELTHORP_H_ */

#endif /* UAN_PROP_MODEL_THORP_H */

(-)a/src/uan/model/uan-prop-model.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Leonard Tracy <lentracy@gmail.com>

 * Author: Leonard Tracy <lentracy@gmail.com>

*/

*/

#ifndef UANPROPMODEL_H_

#ifndef UAN_PROP_MODEL_H

#define UANPROPMODEL_H_

#define UAN_PROP_MODEL_H

#include "ns3/object.h"

#include "ns3/object.h"

#include "ns3/mobility-model.h"

#include "ns3/mobility-model.h"

Lines 251-254	Link Here

251

252

253

254

#endif /*UANPROPMODEL_H_*/

254

#endif /* UAN_PROP_MODEL_H */

(-)a/src/uan/model/uan-transducer-hd.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Leonard Tracy <lentracy@gmail.com>

 * Author: Leonard Tracy <lentracy@gmail.com>

*/

*/

#ifndef UANTRANSDUCERHD_H_

#ifndef UAN_TRANSDUCER_HD_H

#define UANTRANSDUCERHD_H_

#define UAN_TRANSDUCER_HD_H

#include "uan-transducer.h"

#include "uan-transducer.h"

#include "ns3/simulator.h"

#include "ns3/simulator.h"

Lines 69-72	Link Here

#endif /*UANTRANSDUCERSIMPLE_H_*/

#endif /* UAN_TRANSDUCER_HD_H */




 *
 * Author: Leonard Tracy <lentracy@gmail.com>
 */

#ifndef UAN_TRANSDUCER_H
#define UAN_TRANSDUCER_H

#include "ns3/object.h"
#include "ns3/packet.h"

#include "ns3/uan-prop-model.h"

#include <list>

namespace ns3 {

class UanPhy;


} // namespace ns3

#endif /* UAN_TRANSDUCER_H */

(-)a/src/uan/model/uan-tx-mode.h (-3 / +3 lines)

Lines 18-25	Link Here

 * Author: Leonard Tracy <lentracy@gmail.com>

 * Author: Leonard Tracy <lentracy@gmail.com>

*/

*/

#ifndef UANTXMODE_H

#ifndef UAN_TX_MODE_H

#define UANTXMODE_H

#define UAN_TX_MODE_H

#include "ns3/object.h"

#include "ns3/object.h"

#include <map>

#include <map>

Lines 205-208	Link Here

205

206

} // namespace ns3

206

} // namespace ns3

207

208

#endif // UANTXMODE_H

208

#endif /* UAN_TX_MODE_H */

(-)a/src/wimax/model/bvec.h (-3 / +6 lines)

Lines 18-28	Link Here

 * Author: Mohamed Amine Ismail <amine.ismail@sophia.inria.fr>

 * Author: Mohamed Amine Ismail <amine.ismail@sophia.inria.fr>

 *                              <amine.ismail@udcast.com>

 *                              <amine.ismail@udcast.com>

*/

*/

#ifndef BVEC_H_

#define BVEC_H_

#ifndef BVEC_H

#define BVEC_H

#include <vector>

#include <vector>

namespace ns3 {

namespace ns3 {

typedef std::vector<bool> bvec;

typedef std::vector<bool> bvec;

#endif /* BVEC_H_ */

#endif /* BVEC_H */

(-)a/src/wimax/model/cs-parameters.h (-3 / +5 lines)

Lines 20-29	Link Here

*/

*/

#ifndef WIMAX_CS_PARAMETERS_H

#define WIMAX_CS_PARAMETERS_H

#include "ipcs-classifier-record.h"

#include "ipcs-classifier-record.h"

#include "wimax-tlv.h"

#include "wimax-tlv.h"

#ifndef CSPARAMETERS_H_

#define CSPARAMETERS_H_

namespace ns3 {

namespace ns3 {

/**

/**

Lines 76-79	Link Here

};

};

#endif /* CSPARAMETERS_H_ */

#endif /* WIMAX_CS_PARAMETERS_H */

(-)a/src/wimax/model/default-traces.h (-3 / +3 lines)

Lines 33-40	Link Here

#ifndef DEFAULTTRACES_H_

#ifndef WIMAX_DEFAULT_TRACES_H

#define DEFAULTTRACES_H_

#define WIMAX_DEFAULT_TRACES_H

double modulation0[6][29] = {

double modulation0[6][29] = {

Lines 831-834	Link Here

831

    0.01943 }

831

    0.01943 }

832

};

832

};

833

834

#endif /* DEFAULTTRACES_H_ */

834

#endif /* WIMAX_DEFAULT_TRACES_H */

(-)a/src/wimax/model/ipcs-classifier-record.h (-3 / +3 lines)

Lines 19-26	Link Here

*/

*/

#ifndef IPCS_CLASSIFIER_RECORD_H_

#ifndef IPCS_CLASSIFIER_RECORD_H

#define IPCS_CLASSIFIER_RECORD_H_

#define IPCS_CLASSIFIER_RECORD_H

#include <stdint.h>

#include <stdint.h>

#include "ns3/ipv4-address.h"

#include "ns3/ipv4-address.h"

Lines 168-171	Link Here

168

169

; // namespace ns3

169

; // namespace ns3

170

171

#endif /* IPCS_CLASSIFIER_RECORD2_H_ */

171

#endif /* IPCS_CLASSIFIER_RECORD_H */

(-)a/src/wimax/model/ipcs-classifier.h (-3 / +4 lines)

Lines 19-26	Link Here

*/

*/

#ifndef IPCSCLASSIFIER_H_

#ifndef IPCS_CLASSIFIER_H

#define IPCSCLASSIFIER_H_

#define IPCS_CLASSIFIER_H

#include <stdint.h>

#include <stdint.h>

#include <vector>

#include <vector>

#include "ss-service-flow-manager.h"

#include "ss-service-flow-manager.h"

Lines 50-53	Link Here

; // namespace ns3

; // namespace ns3

#endif /* IPCSCLASSIFIER_H_ */

#endif /* IPCS_CLASSIFIER_H */




 *                              <amine.ismail@udcast.com>
 */

#ifndef SIMPLE_OFDM_SEND_PARAM_H
#define SIMPLE_OFDM_SEND_PARAM_H

#include <list>
#include "wimax-channel.h"
#include "bvec.h"
#include "wimax-phy.h"
#include "ns3/propagation-loss-model.h"

#ifndef SIMPLEOFDMSENDPARAM_H_
#define SIMPLEOFDMSENDPARAM_H_

namespace ns3 {

/**


};
} // namespace ns3

#endif /* SIMPLE_OFDM_SEND_PARAM_H */

(-)a/src/wimax/model/snr-to-block-error-rate-manager.h (-3 / +3 lines)

Lines 20-27	Link Here

*/

*/

#ifndef SNRTOBLOCKERRORRATEMANAGER_H_

#ifndef SNR_TO_BLOCK_ERROR_RATE_MANAGER_H

#define SNRTOBLOCKERRORRATEMANAGER_H_

#define SNR_TO_BLOCK_ERROR_RATE_MANAGER_H

#include "ns3/snr-to-block-error-rate-record.h"

#include "ns3/snr-to-block-error-rate-record.h"

#include <vector>

#include <vector>

Lines 101-104	Link Here

101

};

101

};

102

103

104

#endif /* SNRTOBLOCKERRORRATEMANAGER_H_ */

104

#endif /* SNR_TO_BLOCK_ERROR_RATE_MANAGER_H */

(-)a/src/wimax/model/snr-to-block-error-rate-record.h (-3 / +4 lines)

Lines 19-26	Link Here

 *                              <amine.ismail@udcast.com>

 *                              <amine.ismail@udcast.com>

*/

*/

#ifndef SNRTOBLOCKERRORRATERECORD_H_

#ifndef SNR_TO_BLOCK_ERROR_RATE_RECORD_H

#define SNRTOBLOCKERRORRATERECORD_H_

#define SNR_TO_BLOCK_ERROR_RATE_RECORD_H

namespace ns3 {

namespace ns3 {

/**

/**

Lines 109-112	Link Here

109

110

111

112

#endif /* SNRTOBLOCKERRORRATE_H_ */

113

#endif /* SNR_TO_BLOCK_ERROR_RATE_RECORD_H */

(-)a/src/wimax/model/wimax-tlv.h (-7 / +6 lines)

Lines 19-24	Link Here

*/

*/

#ifndef WIMAX_TLV_H

#define WIMAX_TLV_H

#define WIMAX_TLV_EXTENDED_LENGTH_MASK 0x80

#include "ns3/ipv4-address.h"

#include "ns3/ipv4-address.h"

#include <stdlib.h>

#include <stdlib.h>

#include "ns3/log.h"

#include "ns3/log.h"

Lines 27-38	Link Here

#include "ns3/header.h"

#include "ns3/header.h"

#include <vector>

#include <vector>

#ifndef WIMAXTLV_H_

#define WIMAXTLV_H_

#define WIMAX_TLV_EXTENDED_LENGTH_MASK 0x80

namespace ns3 {

namespace ns3 {

/**

/**

Lines 372-375	Link Here

372

371

373

372

374

373

375

#endif /* TLV_H_ */

374

#endif /* WIMAX_TLV_H */

Return to bug 1203