Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

CR/LF conversion

Removed whitespaces at the end of lines
  • Loading branch information...
commit 79cc10db0247e2a50dee5381b09a29e0dda5df7f 1 parent d98efa8
@rhornig rhornig authored
Showing with 5,219 additions and 5,222 deletions.
  1. +5 −5 CREDITS
  2. +2 −2 ChangeLog
  3. +7 −7 INSTALL
  4. +1 −1  License
  5. +1 −1  README
  6. +1,419 −1,419 __CPACKET_PATCH
  7. +1 −1  __MISSING_MODELS
  8. +15 −15 __TODO
  9. +323 −323 __gamer_inet_patch
  10. +20 −20 __runtime-errors
  11. +1 −1  _scripts/genrun
  12. +3 −3 _scripts/makedist
  13. +3 −3 _scripts/xmlschema/XMLSchema.dtd
  14. +1 −1  _scripts/xmlschema/datatypes.dtd
  15. +1 −1  _scripts/xsd2html/x.cmd
  16. +2 −2 _scripts/xsd2html/xsd2html.sh
  17. +9 −9 _scripts/xsd2html/xsd2html.xsl
  18. +22 −22 doc/opp.css
  19. +1 −1  doc/src/tcp/doxyfile
  20. +0 −1  doc/src/tcp/opp.css
  21. +0 −1  doc/tutorial/opp.css
  22. +0 −1  doc/walkthrough/opp.css
  23. +4 −4 doc/walkthrough/tutorial.html
  24. +468 −468 doxy.cfg
  25. +452 −452 etc/OSPF.xsd
  26. +5 −5 examples/adhoc/ieee80211/fingerprints.ini
  27. +5 −5 examples/adhoc/mf80211/fingerprints.ini
  28. +2 −2 examples/adhoc/mobility/README
  29. +1 −1  examples/emulation/extclient/ExtClient.ned
  30. +4 −4 examples/emulation/extclient/README
  31. +11 −11 examples/emulation/traceroute/README
  32. +3 −3 examples/ethernet/arptest/README
  33. +5 −5 examples/ethernet/arptest/fingerprints.ini
  34. +3 −3 examples/ethernet/arptest2/README
  35. +3 −3 examples/ethernet/lans/addresstable.txt
  36. +5 −5 examples/ethernet/lans/fingerprints-largenet.ini
  37. +5 −5 examples/ethernet/lans/fingerprints.ini
  38. +1 −1  examples/inet/bulktransfer/README
  39. +5 −5 examples/inet/flatnet/fingerprints.ini
  40. +4 −4 examples/inet/multicast/README
  41. +5 −5 examples/inet/nclients/fingerprints.ini
  42. +5 −5 examples/inet/nclients/fingerprints2.ini
  43. +1 −1  examples/inet/redtest/REDTestDebug.ned
  44. +1 −1  examples/ipv6/!WORK_IN_PROGRESS!
  45. +1 −1  examples/ipv6/demonetworketh/DemoNetworkEth.ned
  46. +1 −1  examples/ipv6/nclients/README
  47. +3 −3 examples/mpls/ldp/README
  48. +2 −2 examples/mpls/net37/README
  49. +1 −1  examples/mpls/testte_failure/README
  50. +2 −2 examples/mpls/testte_reroute/README
  51. +1 −1  examples/mpls/testte_reroute/scenario.xml
  52. +2 −2 examples/mpls/testte_routing/README
  53. +1 −1  examples/mpls/testte_tunnel/README
  54. +1 −1  examples/ospfv2/fulltest/RT6.irt
  55. +1 −1  examples/package.ned
  56. +1 −1  examples/rundemo.bat
  57. +4 −4 examples/sctp/multihomed/README
  58. +1 −1  examples/sctp/multihomed/omnetpp.ini
  59. +1 −1  examples/sctp/nclients/README
  60. +14 −14 examples/sctp/nclients/trace.nam
  61. +1 −1  examples/wireless/handover/README
  62. +1 −1  examples/wireless/lan80211/README
  63. +21 −21 migrate/mergenedconns.cmd
  64. +21 −21 migrate/migratecpp.cmd
  65. +19 −19 migrate/migrateini.cmd
  66. +20 −20 migrate/migratened.cmd
  67. +1 −1  obsolete/README
  68. +2 −2 obsolete/examples/mpls/!WORK_IN_PROGRESS!
  69. +6 −6 obsolete/examples/mpls/ldp-mpls1/omnetpp.ini1
  70. +1 −1  obsolete/examples/mpls/test/lib1.table
  71. +1 −1  obsolete/examples/mpls/test/lib5.table
  72. +6 −6 obsolete/examples/mpls/test/omnetpp.ini1
  73. +1 −1  obsolete/examples/mpls/test/prt1.table
  74. +2 −2 obsolete/examples/mpls/testte3/README
  75. +3 −3 obsolete/examples/mpls/testte4/README
  76. +1 −1  obsolete/examples/mpls/testte6/README
  77. +3 −3 obsolete/examples/tcptester/ChangeLog
  78. +1 −1  obsolete/ipv4d/README
  79. +10 −10 obsolete/ldp/tcpclientproc.ned
  80. +10 −10 obsolete/ldp/tcpserverproc.ned
  81. +1 −1  obsolete/minitcp/Readme
  82. +1 −1  obsolete/ospftest/ospftestnetwork_config/RT6.irt
  83. +1 −1  obsolete/rsvp_te/ChangeLog
  84. +35 −35 obsolete/scripts/scripts/CMakeListGen.rb
  85. +31 −31 obsolete/scripts/scripts/RImportOmnet.rb
  86. +2 −2 obsolete/scripts/scripts/functions
  87. +6 −6 obsolete/scripts/scripts/functions.R
  88. +38 −38 obsolete/scripts/scripts/generatexmlreader.rb
  89. +41 −41 obsolete/scripts/scripts/graph-R.sh
  90. +10 −10 obsolete/scripts/scripts/graph-calc.sh
  91. +6 −6 obsolete/scripts/scripts/graph-omnetpp-runs.sh
  92. +6 −6 obsolete/scripts/scripts/graph-plot-graph.sh
  93. +1 −1  obsolete/scripts/scripts/graph-simple-saitcal.sh
  94. +1 −1  obsolete/scripts/scripts/graph-simple.sh
  95. +11 −11 obsolete/scripts/scripts/graph.sh
  96. +7 −7 obsolete/scripts/scripts/ipv6suite.spec
  97. +33 −33 obsolete/scripts/scripts/ipv6suite_test.py
  98. +7 −7 obsolete/scripts/scripts/measure-handoff.rb
  99. +14 −14 obsolete/scripts/scripts/omnetpp.spec
  100. +9 −9 obsolete/scripts/scripts/priorRev.rb
  101. +9 −9 obsolete/tcpmodule/ChangeLog
  102. +2 −2 obsolete/tcpmodule/TODO
  103. +30 −30 src/applications/sctpapp/SCTPClient.cc
  104. +16 −16 src/applications/sctpapp/SCTPClient.h
  105. +1 −1  src/applications/sctpapp/SCTPClient.ned
  106. +39 −39 src/applications/sctpapp/SCTPPeer.cc
  107. +6 −6 src/applications/sctpapp/SCTPPeer.h
  108. +1 −1  src/applications/sctpapp/SCTPPeer.ned
  109. +3 −3 src/applications/sctpapp/SCTPServer.ned
  110. +7 −7 src/applications/udpapp/ChangeLog
  111. +34 −34 src/base/ChangeLog
  112. +6 −6 src/linklayer/ethernet/ChangeLog
  113. +2 −2 src/linklayer/ethernet/README
  114. +2 −2 src/linklayer/ext/ExtInterface.h
  115. +31 −31 src/linklayer/ext/ExtInterface.ned
  116. +10 −10 src/linklayer/ieee80211/mac/ChangeLog
  117. +1 −1  src/linklayer/ieee80211/mac/Ieee80211Mac.dot
  118. +6 −6 src/linklayer/ieee80211/mgmt/ChangeLog
  119. +1 −1  src/linklayer/mf80211/!WORK_IN_PROGRESS!
  120. +2 −2 src/linklayer/ppp/ChangeLog
  121. +1 −1  src/linklayer/ppp/DuplicatesGenerator.h
  122. +354 −354 src/linklayer/ppp/PPP_cc.tmp
  123. +83 −83 src/linklayer/ppp/PPP_h.tmp
  124. +1 −1  src/makefrag
  125. +1 −1  src/mobility/BasicMobility.cc
  126. +1 −1  src/mobility/BonnMotionFileCache.cc
  127. +4 −4 src/networklayer/arp/ChangeLog
  128. +1 −1  src/networklayer/autorouting/ChangeLog
  129. +26 −26 src/networklayer/common/ChangeLog
  130. +3 −3 src/networklayer/contract/ChangeLog
  131. +1 −1  src/networklayer/extras/NetworkInfo.ned
  132. +5 −5 src/networklayer/icmpv6/ChangeLog
  133. +1 −1  src/networklayer/icmpv6/ND-tables.dot
  134. +1 −1  src/networklayer/icmpv6/NUD.dot
  135. +4 −4 src/networklayer/icmpv6/__TODO
  136. +9 −9 src/networklayer/ipv4/ChangeLog
  137. +1 −1  src/networklayer/ipv6/!WORK_IN_PROGRESS!
  138. +11 −11 src/networklayer/ipv6/ChangeLog
  139. +1 −1  src/networklayer/ldp/ChangeLog
  140. +1 −1  src/networklayer/mpls/ChangeLog
  141. +1 −1  src/networklayer/mpls/LIBTable.ned
  142. +1 −1  src/networklayer/queue/!WORK_IN_PROGRESS!
  143. +4 −4 src/networklayer/queue/ChangeLog
  144. +3 −3 src/nodes/inet/StandardHost.ned
  145. +1 −1  src/package.ned
  146. +1 −1  src/run_inet
  147. +3 −3 src/transport/contract/ChangeLog
  148. +1 −1  src/transport/contract/SCTPCommand.h
  149. +2 −2 src/transport/contract/SCTPCommand.msg
  150. +31 −31 src/transport/contract/SCTPSocket.cc
  151. +8 −8 src/transport/contract/SCTPSocket.h
  152. +32 −32 src/transport/rtp/ChangeLog
  153. +259 −259 src/transport/rtp/RTPInnerPacket.msg.todo
  154. +79 −79 src/transport/rtp/RTPInterfacePacket.msg.todo
  155. +83 −83 src/transport/rtp/RTPPacket.msg.todo
  156. +46 −46 src/transport/rtp/RTPSenderControlMessage.msg
  157. +36 −36 src/transport/rtp/RTPSenderStatusMessage.msg
  158. +1 −1  src/transport/rtp/profiles/avprofile/RTPAVProfileSampleBasedAudioReceiver.h.off
  159. +58 −58 src/transport/rtp/profiles/avprofile/RTPMpegPacket.msg
  160. +17 −17 src/transport/sctp/SCTP.h
  161. +1 −1  src/transport/sctp/SCTP.ned
  162. +1 −1  src/transport/sctp/SCTPAlg.cc
  163. +75 −75 src/transport/sctp/SCTPAssociation.h
  164. +36 −36 src/transport/sctp/SCTPAssociationEventProc.cc
  165. +256 −256 src/transport/sctp/SCTPAssociationRcvMessage.cc
  166. +40 −40 src/transport/sctp/SCTPCCFunctions.cc
  167. +8 −8 src/transport/sctp/SCTPMessage.h
  168. +11 −11 src/transport/sctp/SCTPQueue.cc
  169. +9 −9 src/transport/sctp/SCTPQueue.h
  170. +12 −12 src/transport/sctp/SCTPReceiveStream.cc
  171. +2 −2 src/transport/sctp/SCTPReceiveStream.h
  172. +26 −26 src/transport/sctp/SCTPSSFunctions.cc
  173. +2 −2 src/transport/sctp/SCTPSendStream.cc
  174. +2 −2 src/transport/sctp/SCTPSendStream.h
  175. +6 −6 src/transport/tcp/ChangeLog
  176. +1 −1  src/transport/tcp/ITCP.ned
  177. +3 −3 src/transport/tcp/README
  178. +23 −23 src/transport/tcp/TCP.ned
  179. +2 −2 src/transport/tcp/TCPSACKRexmitQueue.cc
  180. +3 −3 src/transport/tcp/TCPSACKRexmitQueue.h
  181. +6 −6 src/transport/tcp/flavours/Changes-20051129.txt
  182. +1 −1  src/transport/tcp/flavours/TCPBaseAlg.h
  183. +9 −9 src/transport/tcp/flavours/TCPNewReno.cc
  184. +2 −2 src/transport/tcp/flavours/TCPReno.cc
  185. +4 −4 src/transport/tcp_old/ChangeLog
  186. +11 −11 src/transport/tcp_old/README
  187. +6 −6 src/transport/tcp_old/flavours/Changes-20051129.txt
  188. +2 −2 src/util/headerserializers/IPSerializer.cc
  189. +1 −1  src/util/headerserializers/headers/tcp.h
  190. +5 −5 src/world/ChannelControl.ned
  191. +1 −1  tests/ipv6/IPv6Address_1.test
  192. +1 −1  tests/newtcp/test/!NOTE!
  193. +1 −1  tests/newtcp/test/tcp_stresstest_2.test
View
10 CREDITS
@@ -13,14 +13,14 @@ Patch for getting Ethernet and ARP working with IP; ARPTest example, 2004:
INET Framework maintainer:
* Andras Varga <andras@omnetpp.org>
-The INET Framework is loosely based on the IPSuite from University of
-Karlsruhe. After by extensive restructuring and rewrite, very little
-of the original code could be kept -- most if it has been completely
+The INET Framework is loosely based on the IPSuite from University of
+Karlsruhe. After by extensive restructuring and rewrite, very little
+of the original code could be kept -- most if it has been completely
rewritten in 2003-2004 by Andras Varga.
-Changes include: UDP, IP, PPP, TCP reimplemented; TCPSocket added;
+Changes include: UDP, IP, PPP, TCP reimplemented; TCPSocket added;
Ethernet and MPLS models integrated; extensive refactoring on MPLS
-and RSVP; LDP reimplemented; added ARP; added app models for TCP and
+and RSVP; LDP reimplemented; added ARP; added app models for TCP and
Ethernet; added network configurators; added neddoc documentation.
View
4 ChangeLog
@@ -1,3 +1,3 @@
-See WHATSNEW for an overview of changes from release to release, or
-ChangeLogs in individual subdirectories for a more detailed list of
+See WHATSNEW for an overview of changes from release to release, or
+ChangeLogs in individual subdirectories for a more detailed list of
changes of that component.
View
14 INSTALL
@@ -6,8 +6,8 @@ The INET Framework can be compiled on any platform supported by OMNeT++.
PREREQUISITES
You should have a working OMNeT++ installation, version 4.0 or later.
-If you are running on Windows you will have to install the winpcap driver,
-which is used by INET to capture network packets from external interfaces
+If you are running on Windows you will have to install the winpcap driver,
+which is used by INET to capture network packets from external interfaces
(visit http://www.winpcap.org)
General
@@ -19,7 +19,7 @@ General
and run INET.
2. Extract the downloaded tarball into a directory of your choice (usually into your
- workspace directory, if you are using the IDE). NOTE: The built-in Windows
+ workspace directory, if you are using the IDE). NOTE: The built-in Windows
archiver has bugs and cannot extract the file correctly. Use some other archiver
or do it from command line (tar xvfz inet-yyyymmdd-opp4-src.tgz)
@@ -29,7 +29,7 @@ If you are building from command line:
4. Type "make makefiles". This should generate the makefiles for you automatically.
-5. Type "make" to build the inet executable (debug version). Use "make MODE=release"
+5. Type "make" to build the inet executable (debug version). Use "make MODE=release"
to build release version.
6. you can run specific examples by changing into the example's directory and executing "./run"
@@ -40,7 +40,7 @@ If you are using the IDE:
The extracted directory must be a subdirectory of the workspace dir.
4. Import the project using: File | Import | General | Existing projects into Workspace.
- Then select the workspace dir as the root directory, and be sure NOT to check the
+ Then select the workspace dir as the root directory, and be sure NOT to check the
"Copy projects into workspace" box. Click Finish.
5. Open the project (if already not open) and wait until the indexer finishes.
@@ -55,10 +55,10 @@ Change into examples/ and type "./rundemo".
Note:
-----
-- by default INET is creating a shared library (libinet.dll, libinet.so etc.)
+- by default INET is creating a shared library (libinet.dll, libinet.so etc.)
in the "src" directory. To use the shared library you can use the "opp_run"
command to load it dynamically. Open the "src/run_inet" script to see how
to do it.
- If you add/remove files/directories later in the src directory, you MUST
- re-create your makefile. Run "make makefiles" again if you are building
+ re-create your makefile. Run "make makefiles" again if you are building
from the command line. (The IDE does it for you automatically)
View
2  License
@@ -1,4 +1,4 @@
The OMNeT++/OMNEST INET Framework is composed of several parts, each of which
-has its own license, either GPL or LGPL. As a rule, every source file should
+has its own license, either GPL or LGPL. As a rule, every source file should
contain the appropriate copyright notice and license conditions.
View
2  README
@@ -47,7 +47,7 @@ Linux/Unix), and get the INET executable load it dynamically.
If you want to use extarnal intefaces in INET, please install libpcap-dev (on linux)
or winpcap (on windows from www.winpcap.org), then re-run the omnetpp configuration
-script (./configure). You should also enable the pcap support by editing the
+script (./configure). You should also enable the pcap support by editing the
src/makefrag and the regeneration the INET makefiles (with the "make makefiles" command)
Directory structure
View
2,838 __CPACKET_PATCH
1,419 additions, 1,419 deletions not shown
View
2  __MISSING_MODELS
@@ -1,6 +1,6 @@
Qeueing (we have: FIFO, RED):
CBQ
- WFQ
+ WFQ
RIO
Round Robin
Fair queueing Round Robin
View
30 __TODO
@@ -1,6 +1,6 @@
TODO: UDPSocket::Callback::socketDatagramArrived() - change arg cMessage* to cPacket*
-TODO: eliminate ARP overhead for PPP interfaces;
+TODO: eliminate ARP overhead for PPP interfaces;
[Ingmar Baumgart email, 2008 dec 10, "INET Framework: ARP performance issue"]
The only issue which results in about 10% slowdown in our simulations is
the unnecessary use of the ARP module for PPP interfaces. A quick fix
@@ -20,10 +20,10 @@ TODO: MTU patch from Irene Rungeler
TODO: add SCTP to the whatsnew file
- MAKE IT POSSIBLE TO USE DIFFERENT TYPES FOR EACH ELEMENT OF "LIKE" SUBMODULE VECTORS!
- In StandardHost etc, change
- udpApp[numUdpApps]: <udpAppType> like IUDPApp;
+ In StandardHost etc, change
+ udpApp[numUdpApps]: <udpAppType> like IUDPApp;
to
- udpApp[numUdpApps]: <> like IUDPApp;
+ udpApp[numUdpApps]: <> like IUDPApp;
TODO:
@@ -47,7 +47,7 @@ OMNeT++ INET Fw, and come to the conclusion that they are hard to compare,
due to differences in the radio model and MAC parameterization. Then they go
on to wrap ns2's 802.11 model into an OMNeT++ simple module, and with that,
the OMNeT++ simulation (not too surprisingly) shows excellent correspondence
-with the ns2 simulation :)
+with the ns2 simulation :)
http://i30www.ira.uka.de/research/documents/p2p/2008/towards_comparable_netw
ork_simulations.pdf
@@ -82,7 +82,7 @@ TODO: IRoutingTable6, ITED, etc!
TODO routingTable optimizations from Gamer!
-TODO: Document: decide interfaceId vs interfacePointer! issue: IPRoutingDecision contains interfaceID.
+TODO: Document: decide interfaceId vs interfacePointer! issue: IPRoutingDecision contains interfaceID.
if we change it to pointer, messages that are underway in the host during a deleteInterface()
may crash!!! solution: use a vector inside InterfaceTable, and let each deleteInterface()
leave a hole in it?
@@ -112,36 +112,36 @@ put all c++ code into "inet" namespace
- get quagga to work
--------
- add IdealRadio, DistanceBasedRadio, GilbertElliotRadio.
- in DistanceBasedRadio: decouple transmission range from interference range
+ in DistanceBasedRadio: decouple transmission range from interference range
(ie use 2 different module parameters)
--------
-- model link failures, via isDown() method of InterfaceEntry. L2 modules
+- model link failures, via isDown() method of InterfaceEntry. L2 modules
should understand isDown(), and FailureManager should be enhanced with
linkdown/linkup commands. See email on list archive on 9/17/2006 10:34 AM
--------
- create NetworkInterfaces/Base subdirectory: AirFrame, WirelessMacBase,
ChannelAccess, etc.
--------
-- Ieee80211Mac to fire TxNotifDetails when Ack arrives for a frame. Mgmt layer
+- Ieee80211Mac to fire TxNotifDetails when Ack arrives for a frame. Mgmt layer
to use this notification to learn when ProbeRequest or AssociationResponse
has been transmitted.
--------
- ChannelControl: grid; instead of having pMax parameter, it should ask all
radios and collect pMax from them! (or, directly the range!)
--------
-- radio models: when calculating the probability of bit errors, snirMIN is
- assumed for the whole duration of the frame! This means that if snir
- changes along the packet duration, we overestimate the probability of
+- radio models: when calculating the probability of bit errors, snirMIN is
+ assumed for the whole duration of the frame! This means that if snir
+ changes along the packet duration, we overestimate the probability of
bit error. (there should be proper integration there)
--------
-- IReceptionModel:
+- IReceptionModel:
- improve it to be able to accomodate antenna gain: calculation function
should take node positions, antenna directions (maybe this should be in
some IDirectionalReceptionmodel, plugging into some AbstractDirectionalRadio?)
- allow for implementing "good/bad channel"-type radio models (Gilbert-Elliot)
e.g. containsBadChannelState(starttime, endtime)
- allow the radio model to add extra noise over time, or modify received power
- over time, e.g. using functions like
+ over time, e.g. using functions like
PowerList calculateReceivedPower(...)
PowerList ambientNoise(...)
(maybe this should be some IDetailedReceptionModel, plugging into
@@ -149,7 +149,7 @@ put all c++ code into "inet" namespace
--------
- AbstractRadio: consider: don't sent up the packet if there're bit errors,
just fire some specific radio state change notification! would simplify the
- Ieee80211Mac state machine a lot!
+ Ieee80211Mac state machine a lot!
--------
- tummiepiggy's TCP bug ("TCP_S_FIN_WAIT_1 timeout" on mailing list)
--------
View
646 __gamer_inet_patch
@@ -1,323 +1,323 @@
-diff -r src\base\ModuleAccess.h src-orig\base\ModuleAccess.h
-60c60
-< cModule *m = findModuleWherever(name, name, simulation.contextModule());
----
-> cModule *m = findModuleSomewhereUp(name, simulation.contextModule());
-diff -r src\linklayer\ppp\PPP.cc src-orig\linklayer\ppp\PPP.cc
-170,173d169
-< //
-< // disable notification board for speedup
-< //
-< #ifndef _MAX_SPEED
-177d172
-< #endif
-198,199d192
-<
-< #ifndef _MAX_SPEED
-207d199
-< #endif
-223,224d214
-<
-< #ifndef _MAX_SPEED
-228d217
-< #endif
-diff -r src\networklayer\contract\IPControlInfo.msg src-orig\networklayer\contract\IPControlInfo.msg
-1c1
-< //
----
-> //
-64,68d63
-< //
-< // Scharf M.: for attack tracing, each packet contains an attack id
-< //
-< short attackTag = 0;
-<
-diff -r src\networklayer\contract\IPv6ControlInfo.msg src-orig\networklayer\contract\IPv6ControlInfo.msg
-59,62d58
-< //
-< // Scharf M.: for attack tracing, each packet contains an attack id
-< //
-< short attackTag = 0;
-diff -r src\networklayer\ipv4\IP.cc src-orig\networklayer\ipv4\IP.cc
-404,409c404
-< if (hasGate("transportOut",gateindex) && gate("transportOut",gateindex)->toGate()->isConnected()) {
-< send(packet, "transportOut", gateindex);
-< }
-< else {
-< EV << "Dropped a packet that was adressed to an unconnected Service\n";
-< }
----
-> send(packet, "transportOut", gateindex);
-diff -r src\networklayer\ipv4\IPDatagram.msg src-orig\networklayer\ipv4\IPDatagram.msg
-2,4c2,17
-< // altered version of the IPDatagram Message originally given in
-< // INET-Framework
-< // This message uses the RFC-conform IP-Options
----
-> // Copyright (C) 2000 Institut fuer Telematik, Universitaet Karlsruhe
-> // Copyright (C) 2004 Andras Varga
-> //
-> // This program is free software; you can redistribute it and/or
-> // modify it under the terms of the GNU General Public License
-> // as published by the Free Software Foundation; either version 2
-> // of the License, or (at your option) any later version.
-> //
-> // 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.
-33,58c46,57
-< //
-< // IP options class
-< //
-< enum IPOptionClass
-< {
-< IPOPTION_CLASS_CONTROL = 0;
-< IPOPTION_CLASS_RESERVED = 1;
-< IPOPTION_CLASS_DEBUGGING = 2;
-< IPOPTION_CLASS_RESERVED2 = 3;
-< };
-< //
-< // IP option numbers
-< //
-< enum IPOption
-< {
-< IPOPTION_END_OF_OPTIONS = 0;
-< IPOPTION_NO_OPTION = 1;
-< IPOPTION_SECURITY = 2;
-< IPOPTION_LOOSE_SOURCE_ROUTING = 3;
-< IPOPTION_TIMESTAMP = 4;
-< IPOPTION_RECORD_ROUTE = 7;
-< IPOPTION_STREAM_ID = 8;
-< IPOPTION_STRICT_SOURCE_ROUTING = 9;
-< IPOPTION_ROUTER_ALERT = 20;
-< };
-<
----
-> //
-> // IP options. Beware: these are not the "official" (RFC) codes!
-> //
-> enum IPOption
-> {
->
-> IPOPTION_NO_OPTION = 0;
-> IPOPTION_RECORD_ROUTE = 1;
-> IPOPTION_TIMESTAMP = 2;
-> IPOPTION_LOOSE_SOURCE_ROUTING = 3;
-> IPOPTION_STRICT_SOURCE_ROUTING = 4;
-> }
-127a127
->
-135,140c135,136
-< //
-< //# FIXME:
-< // a) modify header length when options are present
-< // b) the RFC says, that more than one IP-Option is allowed
-< //
-< int optionCode enum(IPOption) = IPOPTION_NO_OPTION;
----
->
-> int optionCode enum(IPOption) = IPOPTION_NO_OPTION; //# FIXME modify header length when options are present
-144,148d139
-<
-< //
-< // Scharf M.: for attack tracing, each ip packet contains an attackTag
-< //
-< short attackTag = 0;
-diff -r src\networklayer\ipv4\RoutingTable.cc src-orig\networklayer\ipv4\RoutingTable.cc
-36c36
-< #include "assert.h"
----
->
-103,105d102
-< #ifdef _MAX_SPEED
-< defaultRoute = NULL;
-< #endif
-249d245
-< #ifndef _MAX_SPEED
-251,254d246
-< #else
-< Enter_Method("interfaceByAddress()=?");
-< #endif
-<
-284d275
-< #ifndef _MAX_SPEED
-286,288d276
-< #else
-< Enter_Method("localDeliver() y/n");
-< #endif
-296,301d283
-< #ifdef _MAX_SPEED
-< else if (i>0) { // ib: ugly speed hack: singlehomed, skip lo0
-< return false;
-< }
-< #endif
-<
-308d289
-< #ifndef _MAX_SPEED
-310,312d290
-< #else
-< Enter_Method("multicastLocalDeliver() y/n");
-< #endif
-331,349d308
-<
-< #ifdef _MAX_SPEED
-< RouteHashMap::iterator r = routeCache.find(dest.getInt());
-<
-< if(r != routeCache.end())
-< return r->second;
-< else
-< {
-< //
-< // maybe a route to another AS
-< //
-< r = routeCache.find(dest.doAnd(longestNetMask).getInt());
-< if(r != routeCache.end())
-< return r->second;
-< else
-< return defaultRoute;
-< }
-< #endif //_MAX_SPEED
-<
-360,365d318
-<
-< //#ifdef _MAX_SPEED
-< // routeCache.insert(RouteCacheEntry(dest.getInt(), bestRoute));
-< // assert(routeCache.count(dest.getInt()) == 1);
-< //#endif //_MAX_SPEED
-<
-371d323
-< #ifndef _MAX_SPEED
-373,375d324
-< #else
-< Enter_Method("interfaceForDestAddr()=?");
-< #endif
-384d332
-< #ifndef _MAX_SPEED
-386,388d333
-< #else
-< Enter_Method("gatewayForDestAddr()=?");
-< #endif
-398d342
-< #ifndef _MAX_SPEED
-400,402d343
-< #else
-< Enter_Method("multicastRoutesFor()=?");
-< #endif
-463c404
-< #ifndef _MAX_SPEED
----
->
-473,505d413
-< #endif
-< #ifdef _MAX_SPEED
-< if((entry->host.isUnspecified() || entry->netmask.isUnspecified()) )
-< {
-< //
-< // add the default route
-< //
-< if(defaultRoute == NULL)
-< defaultRoute = entry;
-< else
-< opp_error("there already exists a default route");
-< }
-< else
-< {
-< if(longestNetMask.isUnspecified())
-< {
-< if(!entry->netmask.isUnspecified())
-< longestNetMask.set(entry->netmask.getInt());
-< }
-< else
-< {
-< if(!entry->netmask.isUnspecified())
-< if(longestNetMask.getInt() > entry->netmask.getInt())
-< longestNetMask.set(entry->netmask.getInt());
-< }
-< //
-< // add route to hash
-< //
-< routeCache.insert(RouteCacheEntry(entry->host.getInt(), entry));
-< }
-< //routeCache.erase(entry->host.getInt());
-< //assert(routeCache.count(entry->host.getInt()) == 0);
-< #endif //_MAX_SPEED
-514,521d421
-< #ifdef _MAX_SPEED
-< routeCache.erase(entry->host.getInt());
-< assert(routeCache.count(entry->host.getInt()) == 0);
-< return true;
-< #endif
-< //#ifdef _MAX_SPEED
-< // routeCache.clear(); //bad fix, but erase doesn't work
-< //#endif //_MAX_SPEED
-526,530d425
-< //#ifdef _MAX_SPEED
-< // routeCache.erase(entry->host.getInt()); //buggy
-< // assert(routeCache.count(entry->host.getInt()) == 0);
-< //#endif //_MAX_SPEED
-<
-539,543d433
-< //#ifdef _MAX_SPEED
-< // routeCache.erase(entry->host.getInt());
-< // assert(routeCache.count(entry->host.getInt()) == 0);
-< //#endif //_MAX_SPEED
-<
-diff -r src\networklayer\ipv4\RoutingTable.h src-orig\networklayer\ipv4\RoutingTable.h
-33,35d32
-< #ifdef _MAX_SPEED
-< #include <ext/hash_map>
-< #endif
-163,170d159
-<
-< #ifdef _MAX_SPEED
-< typedef __gnu_cxx::hash_map<u_int32_t, RoutingEntry*> RouteHashMap;
-< typedef std::pair<u_int32_t, RoutingEntry*> RouteCacheEntry;
-< RouteHashMap routeCache;
-< RoutingEntry *defaultRoute;
-< IPAddress longestNetMask;
-< #endif
-diff -r src\transport\tcp\TCPConnection.h src-orig\transport\tcp\TCPConnection.h
-299c299
-< virtual bool performStateTransition(const TCPEventCode& event);
----
-> bool performStateTransition(const TCPEventCode& event);
-326c326
-< virtual TCPEventCode processSegmentInListen(TCPSegment *tcpseg, IPvXAddress src, IPvXAddress dest);
----
-> TCPEventCode processSegmentInListen(TCPSegment *tcpseg, IPvXAddress src, IPvXAddress dest);
-342c342
-< virtual TCPConnection *cloneListeningConnection();
----
-> TCPConnection *cloneListeningConnection();
-453c453
-< virtual ~TCPConnection();
----
-> ~TCPConnection();
-diff -r src\transport\udp\UDP.cc src-orig\transport\udp\UDP.cc
-45,46d44
-< const char *ERROR_IP_ADDRESS = "10.0.0.255";
-< const int UDP_HEADER_BYTES = 8;
-345d342
-< datagram->setLength(datagram->encapsulatedMsg()->length());
-diff -r src\transport\udp\UDP.h src-orig\transport\udp\UDP.h
-1c1
-< //
----
-> //
-32d31
-< #include "UDPPacket.h"
-38a38,39
-> const char *ERROR_IP_ADDRESS = "10.0.0.255";
-> const int UDP_HEADER_BYTES = 8;
-103,106c104
-< //
-< // hack --> override in UDP_hack
-< //
-< virtual void processUndeliverablePacket(UDPPacket *udpPacket, cPolymorphic *ctrl);
----
-> void processUndeliverablePacket(UDPPacket *udpPacket, cPolymorphic *ctrl);
+diff -r src\base\ModuleAccess.h src-orig\base\ModuleAccess.h
+60c60
+< cModule *m = findModuleWherever(name, name, simulation.contextModule());
+---
+> cModule *m = findModuleSomewhereUp(name, simulation.contextModule());
+diff -r src\linklayer\ppp\PPP.cc src-orig\linklayer\ppp\PPP.cc
+170,173d169
+< //
+< // disable notification board for speedup
+< //
+< #ifndef _MAX_SPEED
+177d172
+< #endif
+198,199d192
+<
+< #ifndef _MAX_SPEED
+207d199
+< #endif
+223,224d214
+<
+< #ifndef _MAX_SPEED
+228d217
+< #endif
+diff -r src\networklayer\contract\IPControlInfo.msg src-orig\networklayer\contract\IPControlInfo.msg
+1c1
+< //
+---
+> //
+64,68d63
+< //
+< // Scharf M.: for attack tracing, each packet contains an attack id
+< //
+< short attackTag = 0;
+<
+diff -r src\networklayer\contract\IPv6ControlInfo.msg src-orig\networklayer\contract\IPv6ControlInfo.msg
+59,62d58
+< //
+< // Scharf M.: for attack tracing, each packet contains an attack id
+< //
+< short attackTag = 0;
+diff -r src\networklayer\ipv4\IP.cc src-orig\networklayer\ipv4\IP.cc
+404,409c404
+< if (hasGate("transportOut",gateindex) && gate("transportOut",gateindex)->toGate()->isConnected()) {
+< send(packet, "transportOut", gateindex);
+< }
+< else {
+< EV << "Dropped a packet that was adressed to an unconnected Service\n";
+< }
+---
+> send(packet, "transportOut", gateindex);
+diff -r src\networklayer\ipv4\IPDatagram.msg src-orig\networklayer\ipv4\IPDatagram.msg
+2,4c2,17
+< // altered version of the IPDatagram Message originally given in
+< // INET-Framework
+< // This message uses the RFC-conform IP-Options
+---
+> // Copyright (C) 2000 Institut fuer Telematik, Universitaet Karlsruhe
+> // Copyright (C) 2004 Andras Varga
+> //
+> // This program is free software; you can redistribute it and/or
+> // modify it under the terms of the GNU General Public License
+> // as published by the Free Software Foundation; either version 2
+> // of the License, or (at your option) any later version.
+> //
+> // 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.
+33,58c46,57
+< //
+< // IP options class
+< //
+< enum IPOptionClass
+< {
+< IPOPTION_CLASS_CONTROL = 0;
+< IPOPTION_CLASS_RESERVED = 1;
+< IPOPTION_CLASS_DEBUGGING = 2;
+< IPOPTION_CLASS_RESERVED2 = 3;
+< };
+< //
+< // IP option numbers
+< //
+< enum IPOption
+< {
+< IPOPTION_END_OF_OPTIONS = 0;
+< IPOPTION_NO_OPTION = 1;
+< IPOPTION_SECURITY = 2;
+< IPOPTION_LOOSE_SOURCE_ROUTING = 3;
+< IPOPTION_TIMESTAMP = 4;
+< IPOPTION_RECORD_ROUTE = 7;
+< IPOPTION_STREAM_ID = 8;
+< IPOPTION_STRICT_SOURCE_ROUTING = 9;
+< IPOPTION_ROUTER_ALERT = 20;
+< };
+<
+---
+> //
+> // IP options. Beware: these are not the "official" (RFC) codes!
+> //
+> enum IPOption
+> {
+>
+> IPOPTION_NO_OPTION = 0;
+> IPOPTION_RECORD_ROUTE = 1;
+> IPOPTION_TIMESTAMP = 2;
+> IPOPTION_LOOSE_SOURCE_ROUTING = 3;
+> IPOPTION_STRICT_SOURCE_ROUTING = 4;
+> }
+127a127
+>
+135,140c135,136
+< //
+< //# FIXME:
+< // a) modify header length when options are present
+< // b) the RFC says, that more than one IP-Option is allowed
+< //
+< int optionCode enum(IPOption) = IPOPTION_NO_OPTION;
+---
+>
+> int optionCode enum(IPOption) = IPOPTION_NO_OPTION; //# FIXME modify header length when options are present
+144,148d139
+<
+< //
+< // Scharf M.: for attack tracing, each ip packet contains an attackTag
+< //
+< short attackTag = 0;
+diff -r src\networklayer\ipv4\RoutingTable.cc src-orig\networklayer\ipv4\RoutingTable.cc
+36c36
+< #include "assert.h"
+---
+>
+103,105d102
+< #ifdef _MAX_SPEED
+< defaultRoute = NULL;
+< #endif
+249d245
+< #ifndef _MAX_SPEED
+251,254d246
+< #else
+< Enter_Method("interfaceByAddress()=?");
+< #endif
+<
+284d275
+< #ifndef _MAX_SPEED
+286,288d276
+< #else
+< Enter_Method("localDeliver() y/n");
+< #endif
+296,301d283
+< #ifdef _MAX_SPEED
+< else if (i>0) { // ib: ugly speed hack: singlehomed, skip lo0
+< return false;
+< }
+< #endif
+<
+308d289
+< #ifndef _MAX_SPEED
+310,312d290
+< #else
+< Enter_Method("multicastLocalDeliver() y/n");
+< #endif
+331,349d308
+<
+< #ifdef _MAX_SPEED
+< RouteHashMap::iterator r = routeCache.find(dest.getInt());
+<
+< if(r != routeCache.end())
+< return r->second;
+< else
+< {
+< //
+< // maybe a route to another AS
+< //
+< r = routeCache.find(dest.doAnd(longestNetMask).getInt());
+< if(r != routeCache.end())
+< return r->second;
+< else
+< return defaultRoute;
+< }
+< #endif //_MAX_SPEED
+<
+360,365d318
+<
+< //#ifdef _MAX_SPEED
+< // routeCache.insert(RouteCacheEntry(dest.getInt(), bestRoute));
+< // assert(routeCache.count(dest.getInt()) == 1);
+< //#endif //_MAX_SPEED
+<
+371d323
+< #ifndef _MAX_SPEED
+373,375d324
+< #else
+< Enter_Method("interfaceForDestAddr()=?");
+< #endif
+384d332
+< #ifndef _MAX_SPEED
+386,388d333
+< #else
+< Enter_Method("gatewayForDestAddr()=?");
+< #endif
+398d342
+< #ifndef _MAX_SPEED
+400,402d343
+< #else
+< Enter_Method("multicastRoutesFor()=?");
+< #endif
+463c404
+< #ifndef _MAX_SPEED
+---
+>
+473,505d413
+< #endif
+< #ifdef _MAX_SPEED
+< if((entry->host.isUnspecified() || entry->netmask.isUnspecified()) )
+< {
+< //
+< // add the default route
+< //
+< if(defaultRoute == NULL)
+< defaultRoute = entry;
+< else
+< opp_error("there already exists a default route");
+< }
+< else
+< {
+< if(longestNetMask.isUnspecified())
+< {
+< if(!entry->netmask.isUnspecified())
+< longestNetMask.set(entry->netmask.getInt());
+< }
+< else
+< {
+< if(!entry->netmask.isUnspecified())
+< if(longestNetMask.getInt() > entry->netmask.getInt())
+< longestNetMask.set(entry->netmask.getInt());
+< }
+< //
+< // add route to hash
+< //
+< routeCache.insert(RouteCacheEntry(entry->host.getInt(), entry));
+< }
+< //routeCache.erase(entry->host.getInt());
+< //assert(routeCache.count(entry->host.getInt()) == 0);
+< #endif //_MAX_SPEED
+514,521d421
+< #ifdef _MAX_SPEED
+< routeCache.erase(entry->host.getInt());
+< assert(routeCache.count(entry->host.getInt()) == 0);
+< return true;
+< #endif
+< //#ifdef _MAX_SPEED
+< // routeCache.clear(); //bad fix, but erase doesn't work
+< //#endif //_MAX_SPEED
+526,530d425
+< //#ifdef _MAX_SPEED
+< // routeCache.erase(entry->host.getInt()); //buggy
+< // assert(routeCache.count(entry->host.getInt()) == 0);
+< //#endif //_MAX_SPEED
+<
+539,543d433
+< //#ifdef _MAX_SPEED
+< // routeCache.erase(entry->host.getInt());
+< // assert(routeCache.count(entry->host.getInt()) == 0);
+< //#endif //_MAX_SPEED
+<
+diff -r src\networklayer\ipv4\RoutingTable.h src-orig\networklayer\ipv4\RoutingTable.h
+33,35d32
+< #ifdef _MAX_SPEED
+< #include <ext/hash_map>
+< #endif
+163,170d159
+<
+< #ifdef _MAX_SPEED
+< typedef __gnu_cxx::hash_map<u_int32_t, RoutingEntry*> RouteHashMap;
+< typedef std::pair<u_int32_t, RoutingEntry*> RouteCacheEntry;
+< RouteHashMap routeCache;
+< RoutingEntry *defaultRoute;
+< IPAddress longestNetMask;
+< #endif
+diff -r src\transport\tcp\TCPConnection.h src-orig\transport\tcp\TCPConnection.h
+299c299
+< virtual bool performStateTransition(const TCPEventCode& event);
+---
+> bool performStateTransition(const TCPEventCode& event);
+326c326
+< virtual TCPEventCode processSegmentInListen(TCPSegment *tcpseg, IPvXAddress src, IPvXAddress dest);
+---
+> TCPEventCode processSegmentInListen(TCPSegment *tcpseg, IPvXAddress src, IPvXAddress dest);
+342c342
+< virtual TCPConnection *cloneListeningConnection();
+---
+> TCPConnection *cloneListeningConnection();
+453c453
+< virtual ~TCPConnection();
+---
+> ~TCPConnection();
+diff -r src\transport\udp\UDP.cc src-orig\transport\udp\UDP.cc
+45,46d44
+< const char *ERROR_IP_ADDRESS = "10.0.0.255";
+< const int UDP_HEADER_BYTES = 8;
+345d342
+< datagram->setLength(datagram->encapsulatedMsg()->length());
+diff -r src\transport\udp\UDP.h src-orig\transport\udp\UDP.h
+1c1
+< //
+---
+> //
+32d31
+< #include "UDPPacket.h"
+38a38,39
+> const char *ERROR_IP_ADDRESS = "10.0.0.255";
+> const int UDP_HEADER_BYTES = 8;
+103,106c104
+< //
+< // hack --> override in UDP_hack
+< //
+< virtual void processUndeliverablePacket(UDPPacket *udpPacket, cPolymorphic *ctrl);
+---
+> void processUndeliverablePacket(UDPPacket *udpPacket, cPolymorphic *ctrl);
View
40 __runtime-errors
@@ -1,20 +1,20 @@
-
-current errors: (may 7, 2008)
-<!> Error in module (TCP) BulkTransfer.client1.tcp (id=13): User error: ASSERT: condition seqLE(begin,fromSeq) && seqLE(fromSeq+numBytes,end) false in function TCPVirtualDataSendQueue::createSegmentWithBytes, transport/tcp/queues\TCPVirtualDataSendQueue.cc line 61.
-<!> Error in module (TCP) ARPTest.client.tcp (id=166): User error: ASSERT: condition seqLE(begin,fromSeq) && seqLE(fromSeq+numBytes,end) false in function TCPVirtualDataSendQueue::createSegmentWithBytes, transport/tcp/queues\TCPVirtualDataSendQueue.cc line 61.
-<!> Error in module (TCP) ARPTest.server.tcp (id=105): User error: ASSERT: condition seqLE(begin,fromSeq) && seqLE(fromSeq+numBytes,end) false in function TCPVirtualDataSendQueue::createSegmentWithBytes, transport/tcp/queues\TCPVirtualDataSendQueue.cc line 61.
-
-
-<!> Error in module (ScenarioManager) REDTest.scenarioManager (id=4): The simulation wanted to ask a question, set cmdenv-interactive=true to allow it: "Enter parameter `REDTest.scenarioManager.script':".
-<!> Error in module (ScenarioManager) REDTest.scenarioManager (id=4): The simulation wanted to ask a question, set cmdenv-interactive=true to allow it: "Enter parameter `REDTest.scenarioManager.script':".
-<!> Error in module (ScenarioManager) REDTest.scenarioManager (id=4): The simulation wanted to ask a question, set cmdenv-interactive=true to allow it: "Enter parameter `REDTest.scenarioManager.script':".
-
-<!> Error in module (ScenarioManager) RSVPTE4.scenarioManager (id=15): User error: Cannot replace module `RSVPTE4.LSR4' with a module of type `RSVP_FAILED': No such module type.
-<!> Error in module (ScenarioManager) LDPTEST.scenarioManager (id=12): User error: Cannot replace module `LDPTEST.LSR2' with a module of type `LDP_FAILED': No such module type.
-
-<!> Error in module (RSVP) RSVPTE4.LSR1.rsvp (id=22): User error: not a local peer: 10.1.1.1.
-
-<!> Error during startup/shutdown: (cMessageHeap)scheduled-events: dropAndDelete(): not owner of object (cObject). Aborting.
-
-<!> Error in module (EtherMAC) NClientsEth.r1.eth[0].mac (id=20): Cannot convert 1.93811e+007 to simtime_t: out of range (-9223372.036854775807,9223372.036854775807), allowed by scale exponent -12.
-
+
+current errors: (may 7, 2008)
+<!> Error in module (TCP) BulkTransfer.client1.tcp (id=13): User error: ASSERT: condition seqLE(begin,fromSeq) && seqLE(fromSeq+numBytes,end) false in function TCPVirtualDataSendQueue::createSegmentWithBytes, transport/tcp/queues\TCPVirtualDataSendQueue.cc line 61.
+<!> Error in module (TCP) ARPTest.client.tcp (id=166): User error: ASSERT: condition seqLE(begin,fromSeq) && seqLE(fromSeq+numBytes,end) false in function TCPVirtualDataSendQueue::createSegmentWithBytes, transport/tcp/queues\TCPVirtualDataSendQueue.cc line 61.
+<!> Error in module (TCP) ARPTest.server.tcp (id=105): User error: ASSERT: condition seqLE(begin,fromSeq) && seqLE(fromSeq+numBytes,end) false in function TCPVirtualDataSendQueue::createSegmentWithBytes, transport/tcp/queues\TCPVirtualDataSendQueue.cc line 61.
+
+
+<!> Error in module (ScenarioManager) REDTest.scenarioManager (id=4): The simulation wanted to ask a question, set cmdenv-interactive=true to allow it: "Enter parameter `REDTest.scenarioManager.script':".
+<!> Error in module (ScenarioManager) REDTest.scenarioManager (id=4): The simulation wanted to ask a question, set cmdenv-interactive=true to allow it: "Enter parameter `REDTest.scenarioManager.script':".
+<!> Error in module (ScenarioManager) REDTest.scenarioManager (id=4): The simulation wanted to ask a question, set cmdenv-interactive=true to allow it: "Enter parameter `REDTest.scenarioManager.script':".
+
+<!> Error in module (ScenarioManager) RSVPTE4.scenarioManager (id=15): User error: Cannot replace module `RSVPTE4.LSR4' with a module of type `RSVP_FAILED': No such module type.
+<!> Error in module (ScenarioManager) LDPTEST.scenarioManager (id=12): User error: Cannot replace module `LDPTEST.LSR2' with a module of type `LDP_FAILED': No such module type.
+
+<!> Error in module (RSVP) RSVPTE4.LSR1.rsvp (id=22): User error: not a local peer: 10.1.1.1.
+
+<!> Error during startup/shutdown: (cMessageHeap)scheduled-events: dropAndDelete(): not owner of object (cObject). Aborting.
+
+<!> Error in module (EtherMAC) NClientsEth.r1.eth[0].mac (id=20): Cannot convert 1.93811e+007 to simtime_t: out of range (-9223372.036854775807,9223372.036854775807), allowed by scale exponent -12.
+
View
2  _scripts/genrun
@@ -42,4 +42,4 @@ for i in $DIRS; do
svn add $i/run
echo '..\..\..\src\run_inet %*' >$i/run.cmd
svn add $i/run.cmd
-done
+done
View
6 _scripts/makedist
@@ -4,7 +4,7 @@ cd `dirname $0`/.. || { echo --- error changing to the inet root directory ---;
INET_ROOT=`pwd`
if [ "$BUILDID" = "" ]; then
-# generate our own build identifier
+# generate our own build identifier
export BUILDID=`date +%Y%m%d`
fi
@@ -24,9 +24,9 @@ fi
rm -rf $DIRNAME/_scripts
rm -rf $DIRNAME/obsolete
-# pack and create tar.gz archives
+# pack and create tar.gz archives
echo Creating $FILENAME.
rm -f $FILENAME
-tar cfz $FILENAME $DIRNAME || { echo --- error creating INET-....tgz ---; exit 1;}
+tar cfz $FILENAME $DIRNAME || { echo --- error creating INET-....tgz ---; exit 1;}
rm -rf /tmp/$DIRNAME
View
6 _scripts/xmlschema/XMLSchema.dtd
@@ -130,7 +130,7 @@
because at the Infoset level where schemas operate,
xmlns(:prefix) is NOT an attribute! -->
<!-- The declaration of xmlns is a convenience for schema authors -->
-
+
<!-- The id attribute here and below is for use in external references
from non-schemas using simple fragment identifiers.
It is NOT used for schema-to-schema reference, internal or
@@ -174,7 +174,7 @@
id ID #IMPLIED
%simpleContentAttrs;>
-<!-- restriction should use the simple branch from part2, not the
+<!-- restriction should use the simple branch from part2, not the
one defined above; extension should have no particle -->
<!ELEMENT %extension; (%particleAndAttrs;)>
@@ -214,7 +214,7 @@
<!-- default and fixed are mutually exclusive -->
<!ELEMENT %group; ((%annotation;)?,(%mgs;)?)>
-<!ATTLIST %group;
+<!ATTLIST %group;
name %NCName; #IMPLIED
ref %QName; #IMPLIED
minOccurs %nonNegativeInteger; #IMPLIED
View
2  _scripts/xmlschema/datatypes.dtd
@@ -86,7 +86,7 @@
"%pattern; | %enumeration; | %whiteSpace; | %length; |
%maxLength; | %minLength;">
<!ENTITY % facet "%ordered; | %unordered;">
-<!ENTITY % facetAttr
+<!ENTITY % facetAttr
"value CDATA #REQUIRED
id ID #IMPLIED">
<!ENTITY % fixedAttr "fixed %boolean; #IMPLIED">
View
2  _scripts/xsd2html/x.cmd
@@ -1,4 +1,4 @@
-@echo off
+@echo off
PATH=C:\home\tools\libxslt-1.0.27.win32\util;%PATH%
del /q html\*
xsltproc -o netconf.html xsd2html.xsl netconf.xsd
View
4 _scripts/xsd2html/xsd2html.sh
@@ -13,7 +13,7 @@ outdir=html
if [ -n $DOT ]; then
have_dot=yes
-fi
+fi
while [ $# -gt 0 ]; do
case "$1" in
@@ -78,7 +78,7 @@ if [ "$have_dot" = "yes" ]; then
echo
echo 'see warnings from '$DOT' in '$outdir'/dot.err';
else
- rm $outdir/dot.err
+ rm $outdir/dot.err
fi
fi
View
18 _scripts/xsd2html/xsd2html.xsl
@@ -3,7 +3,7 @@
Author: Andras Varga, based on xsd2html.xsl by Christopher R. Maden
http://crism.maden.org/consulting/pub/xsl/xsd2html.xsl
-->
-<xsl:stylesheet version="1.0"
+<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:date="http://exslt.org/dates-and-times"
@@ -68,7 +68,7 @@
<xsl:call-template name="toc"/>
</xsl:with-param>
</xsl:call-template>
-
+
<!-- generate html -->
<xsl:call-template name="write-html-page">
<xsl:with-param name="href" select="'overview.html'"/>
@@ -156,11 +156,11 @@
<xsl:value-of select="@name"/> [URL="<xsl:value-of select="@name"/>.html",fillcolor="#fff700",tooltip="element <xsl:value-of select="@name"/>"];
<xsl:for-each select=".//xs:element[@ref]">
<xsl:value-of select="@ref"/> [URL="<xsl:value-of select="@ref"/>.html",fillcolor="#fffcaf",tooltip="element <xsl:value-of select="@ref"/>"];
- <xsl:value-of select="$name"/> -> <xsl:value-of select="@ref"/>;
+ <xsl:value-of select="$name"/> -> <xsl:value-of select="@ref"/>;
</xsl:for-each>
<xsl:for-each select="//xs:element[.//xs:element[@ref=$name]]">
<xsl:value-of select="@name"/> [URL="<xsl:value-of select="@name"/>.html",fillcolor="#fffcaf",tooltip="element <xsl:value-of select="@name"/>"];
- <xsl:value-of select="@name"/> -> <xsl:value-of select="$name"/>;
+ <xsl:value-of select="@name"/> -> <xsl:value-of select="$name"/>;
</xsl:for-each>
}
</xsl:template>
@@ -219,8 +219,8 @@
<xsl:template match="xs:attribute"/>
<xsl:template match="xs:attributeGroup[@ref]" mode="attGroup">
- <h3>Attribute Group <a href="{@ref}.html"> <xsl:value-of select="@ref"/>
- </a> </h3>
+ <h3>Attribute Group <a href="{@ref}.html"> <xsl:value-of select="@ref"/>
+ </a> </h3>
</xsl:template>
<xsl:template match="xs:attributeGroup[@name]">
<xsl:call-template name="write-html-page">
@@ -231,7 +231,7 @@
<xsl:value-of select="@name"/>
</h2>
<table border="1">
- <xsl:apply-templates select="descendant::xs:attribute"
+ <xsl:apply-templates select="descendant::xs:attribute"
mode="attributes"/>
</table>
</xsl:with-param>
@@ -353,7 +353,7 @@
</table>
</xsl:if>
<xsl:if test="descendant::xs:attributeGroup[@ref]">
- <xsl:apply-templates select="descendant::xs:attributeGroup"
+ <xsl:apply-templates select="descendant::xs:attributeGroup"
mode="attGroup"/>
</xsl:if>
</xsl:with-param>
@@ -450,7 +450,7 @@
<xsl:value-of select="$name"/> -> <xsl:value-of select="@ref"/>;
</xsl:for-each>
</xsl:for-each>
- }
+ }
</xsl:template>
<xsl:template match="xs:choice/xs:sequence | xs:sequence/xs:sequence">
View
44 doc/opp.css
@@ -16,29 +16,29 @@ TD.mdname { background-color: #f2f2ff; font-weight: bold; color: #602020; width:
DIV.groupHeader { margin-left: 16px; margin-top: 12px; margin-bottom: 6px; font-weight: bold }
DIV.groupText { margin-left: 16px; font-style: italic; font-size: smaller }
BODY { background: white }
-TD.indexkey {
- background-color: #eeeeff;
- font-weight: bold;
- padding-right : 10px;
- padding-top : 2px;
- padding-left : 10px;
- padding-bottom : 2px;
- margin-left : 0px;
- margin-right : 0px;
- margin-top : 2px;
- margin-bottom : 2px
+TD.indexkey {
+ background-color: #eeeeff;
+ font-weight: bold;
+ padding-right : 10px;
+ padding-top : 2px;
+ padding-left : 10px;
+ padding-bottom : 2px;
+ margin-left : 0px;
+ margin-right : 0px;
+ margin-top : 2px;
+ margin-bottom : 2px
}
-TD.indexvalue {
- background-color: #eeeeff;
- font-style: italic;
- padding-right : 10px;
- padding-top : 2px;
- padding-left : 10px;
- padding-bottom : 2px;
- margin-left : 0px;
- margin-right : 0px;
- margin-top : 2px;
- margin-bottom : 2px
+TD.indexvalue {
+ background-color: #eeeeff;
+ font-style: italic;
+ padding-right : 10px;
+ padding-top : 2px;
+ padding-left : 10px;
+ padding-bottom : 2px;
+ margin-left : 0px;
+ margin-right : 0px;
+ margin-top : 2px;
+ margin-bottom : 2px
}
span.keyword { color: #008000 }
span.keywordtype { color: #604020 }
View
2  doc/src/tcp/doxyfile
@@ -462,7 +462,7 @@ EXCLUDE_PATTERNS =
# directories that contain example code fragments that are included (see
# the \include command).
-EXAMPLE_PATH =
+EXAMPLE_PATH =
# If the value of the EXAMPLE_PATH tag contains directories, you can use the
# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
View
1  doc/src/tcp/opp.css
@@ -11,4 +11,3 @@ th { font-size:10pt; text-align:left; vertical-align:top; background:#E0E0f0 }
td { font-size:10pt; text-align:left; vertical-align:top }
tt { font-family:Courier,Courier New,Fixed,Terminal }
img { border:none }
-
View
1  doc/tutorial/opp.css
@@ -11,4 +11,3 @@ th { font-size:10pt; text-align:left; vertical-align:top; background:#E0E0f0 }
td { font-size:10pt; text-align:left; vertical-align:top }
tt { font-family:Courier,Courier New,Fixed,Terminal }
img { border:none }
-
View
1  doc/walkthrough/opp.css
@@ -11,4 +11,3 @@ th { font-size:10pt; text-align:left; vertical-align:top; background:#E0E0f0 }
td { font-size:10pt; text-align:left; vertical-align:top }
tt { font-family:Courier,Courier New,Fixed,Terminal }
img { border:none }
-
View
8 doc/walkthrough/tutorial.html
@@ -977,9 +977,9 @@
<p>
In the above code, after we successfully extracted the MAC address out of the cache,
sending of the IP datagram was done via the <tt>sendPacketToMAC()</tt> function.
-This function has been copied below -- it just creates a control info object,
-puts the MAC address into it, attaches the object to the packet and sends it
-on gate <tt>"hwOut"</tt> which is connected to Ethernet's <tt>encap</tt> and
+This function has been copied below -- it just creates a control info object,
+puts the MAC address into it, attaches the object to the packet and sends it
+on gate <tt>"hwOut"</tt> which is connected to Ethernet's <tt>encap</tt> and
<tt>mac</tt> modules.
</p>
@@ -1001,7 +1001,7 @@
While ARP might not be the most important protocol on earth, it was chosen as the
topic of this tutorial because it is simple enough to be presented in such
a short space, and yet it does something interesting -- with the results
-immediately visible. And not least, it is well known and on everybody's desk
+immediately visible. And not least, it is well known and on everybody's desk
(who doesn't have Ethernet LAN?).
</p>
View
936 doxy.cfg
@@ -14,191 +14,191 @@
# Project related configuration options
#---------------------------------------------------------------------------
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.
PROJECT_NAME = "INET Framework for OMNeT++/OMNEST"
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER =
+PROJECT_NUMBER =
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
# where doxygen was started. If left blank the current directory will be used.
OUTPUT_DIRECTORY = doc/doxy
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of source
-# files, where putting all generated files in the same directory would otherwise
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of source
+# files, where putting all generated files in the same directory would otherwise
# cause performance problems for the file system.
CREATE_SUBDIRS = NO
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish,
-# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese,
-# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish,
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish,
+# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese,
+# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish,
# Swedish, and Ukrainian.
OUTPUT_LANGUAGE = English
-# This tag can be used to specify the encoding used in the generated output.
-# The encoding is not always determined by the language that is chosen,
-# but also whether or not the output is meant for Windows or non-Windows users.
-# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES
-# forces the Windows encoding (this is the default for the Windows binary),
-# whereas setting the tag to NO uses a Unix-style encoding (the default for
+# This tag can be used to specify the encoding used in the generated output.
+# The encoding is not always determined by the language that is chosen,
+# but also whether or not the output is meant for Windows or non-Windows users.
+# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES
+# forces the Windows encoding (this is the default for the Windows binary),
+# whereas setting the tag to NO uses a Unix-style encoding (the default for
# all platforms other than Windows).
USE_WINDOWS_ENCODING = YES
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
# Set to NO to disable this.
BRIEF_MEMBER_DESC = YES
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
# brief descriptions will be completely suppressed.
REPEAT_BRIEF = YES
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is used
-# as the annotated text. Otherwise, the brief description is used as-is. If left
-# blank, the following values are used ("$name" is automatically replaced with the
-# name of the entity): "The $name class" "The $name widget" "The $name file"
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is used
+# as the annotated text. Otherwise, the brief description is used as-is. If left
+# blank, the following values are used ("$name" is automatically replaced with the
+# name of the entity): "The $name class" "The $name widget" "The $name file"
# "is" "provides" "specifies" "contains" "represents" "a" "an" "the"
-ABBREVIATE_BRIEF =
+ABBREVIATE_BRIEF =
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
# description.
ALWAYS_DETAILED_SEC = NO
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited
-# members of a class in the documentation of that class as if those members were
-# ordinary class members. Constructors, destructors and assignment operators of
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited
+# members of a class in the documentation of that class as if those members were
+# ordinary class members. Constructors, destructors and assignment operators of
# the base classes will not be shown.
INLINE_INHERITED_MEMB = NO
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
# to NO the shortest path that makes the file name unique will be used.
FULL_PATH_NAMES = NO
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
# path to strip.
-STRIP_FROM_PATH =
+STRIP_FROM_PATH =
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
# are normally passed to the compiler using the -I flag.
-STRIP_FROM_INC_PATH =
+STRIP_FROM_INC_PATH =
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful is your file systems
# doesn't support long names like on DOS, Mac, or CD-ROM.
SHORT_NAMES = NO
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like the Qt-style comments (thus requiring an
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like the Qt-style comments (thus requiring an
# explicit @brief command for a brief description.
JAVADOC_AUTOBRIEF = NO
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
# description. Set this tag to YES if you prefer the old behaviour instead.
MULTILINE_CPP_IS_BRIEF = NO
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen
+# If the DETAILS_AT_TOP tag is set to YES then Doxygen
# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member
+# If set to NO, the detailed description appears after the member
# documentation.
DETAILS_AT_TOP = YES
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
# re-implements.
INHERIT_DOCS = YES
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
# all members of a group must be documented explicitly.
DISTRIBUTE_GROUP_DOC = NO
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
# Doxygen uses this value to replace tabs by spaces in code fragments.
TAB_SIZE = 8
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
# You can put \n's in the value part of an alias to insert newlines.
-ALIASES =
+ALIASES =
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
-# only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
# of all members will be omitted, etc.
OPTIMIZE_OUTPUT_FOR_C = NO
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources
-# only. Doxygen will then generate output that is more tailored for Java.
-# For instance, namespaces will be presented as packages, qualified scopes
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources
+# only. Doxygen will then generate output that is more tailored for Java.
+# For instance, namespaces will be presented as packages, qualified scopes
# will look different, etc.
OPTIMIZE_OUTPUT_JAVA = NO
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
# the \nosubgrouping command.
SUBGROUPING = YES
@@ -207,168 +207,168 @@ SUBGROUPING = YES
# Build related configuration options
#---------------------------------------------------------------------------
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
EXTRACT_ALL = YES
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
# will be included in the documentation.
EXTRACT_PRIVATE = YES
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
# will be included in the documentation.
EXTRACT_STATIC = NO
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
# If set to NO only classes defined in header files are included.
EXTRACT_LOCAL_CLASSES = YES
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
# If set to NO (the default) only methods in the interface are included.
EXTRACT_LOCAL_METHODS = NO
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
# This option has no effect if EXTRACT_ALL is enabled.
HIDE_UNDOC_MEMBERS = NO
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
# overviews. This option has no effect if EXTRACT_ALL is enabled.
HIDE_UNDOC_CLASSES = NO
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
# documentation.
HIDE_FRIEND_COMPOUNDS = NO
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
# function's detailed documentation block.
HIDE_IN_BODY_DOCS = NO
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
# Set it to YES to include the internal documentation.
INTERNAL_DOCS = NO
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
# and Mac users are advised to set this option to NO.
CASE_SENSE_NAMES = NO
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
# documentation. If set to YES the scope will be hidden.
HIDE_SCOPE_NAMES = NO
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
# of that file.
SHOW_INCLUDE_FILES = YES
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
# is inserted in the documentation for inline members.
INLINE_INFO = YES
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
# declaration order.
SORT_MEMBER_DOCS = YES
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
# declaration order.
SORT_BRIEF_DOCS = NO
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
+# Note: This option applies only to the class list, not to the
# alphabetical list.
SORT_BY_SCOPE_NAME = NO
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
# commands in the documentation.
GENERATE_TODOLIST = YES
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
# commands in the documentation.
GENERATE_TESTLIST = YES
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
# commands in the documentation.
GENERATE_BUGLIST = YES
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
# \deprecated commands in the documentation.
GENERATE_DEPRECATEDLIST= YES
-# The ENABLED_SECTIONS tag can be used to enable conditional
+# The ENABLED_SECTIONS tag can be used to enable conditional
# documentation sections, marked by \if sectionname ... \endif.
-ENABLED_SECTIONS =
+ENABLED_SECTIONS =
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
-# documentation can be controlled using \showinitializer or \hideinitializer
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or define consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and defines in the
+# documentation can be controlled using \showinitializer or \hideinitializer
# command in the documentation regardless of this setting.
MAX_INITIALIZER_LINES = 30
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
# list will mention the files that were used to generate the documentation.
SHOW_USED_FILES = YES
-# If the sources in your project are distributed over multiple directories
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
+# If the sources in your project are distributed over multiple directories
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
# in the documentation.
SHOW_DIRECTORIES = YES
@@ -377,136 +377,136 @@ SHOW_DIRECTORIES = YES
# configuration options related to warning and progress messages
#---------------------------------------------------------------------------
-# The QUIET tag can be used to turn on/off the messages that are generated
+# The QUIET tag can be used to turn on/off the messages that are generated
# by doxygen. Possible values are YES and NO. If left blank NO is used.
QUIET = YES
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
# NO is used.
WARNINGS = YES
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
# automatically be disabled.
WARN_IF_UNDOCUMENTED = YES
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
# don't exist or using markup commands wrongly.
WARN_IF_DOC_ERROR = YES
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
# warning originated and the warning text.
WARN_FORMAT = "$file:$line: $text"
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
# to stderr.
-WARN_LOGFILE =
+WARN_LOGFILE =
#---------------------------------------------------------------------------
# configuration options related to the input files
#---------------------------------------------------------------------------
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
-INPUT =
+INPUT =
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp
# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm
-FILE_PATTERNS =
+FILE_PATTERNS =
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
# If left blank NO is used.
RECURSIVE = YES
-# The EXCLUDE tag can be used to specify files and/or directories that should
-# excluded from the INPUT source files. This way you can easily exclude a
+# The EXCLUDE tag can be used to specify files and/or directories that should
+# excluded from the INPUT source files. This way you can easily exclude a
# subdirectory from a directory tree whose root is specified with the INPUT tag.
EXCLUDE = obsolete \
tests \
doc/src
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories
# that are symbolic links (a Unix filesystem feature) are excluded from the input.
EXCLUDE_SYMLINKS = NO
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
# certain files from those directories.
EXCLUDE_PATTERNS = *_m.cc \
*_n.cc
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
# the \include command).
-EXAMPLE_PATH =
+EXAMPLE_PATH =
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
# blank all files are included.
-EXAMPLE_PATTERNS =
+EXAMPLE_PATTERNS =
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
# Possible values are YES and NO. If left blank NO is used.
EXAMPLE_RECURSIVE = NO
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
# the \image command).
-IMAGE_PATH =
+IMAGE_PATH =
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output. If FILTER_PATTERNS is specified, this tag will be
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output. If FILTER_PATTERNS is specified, this tag will be
# ignored.
-INPUT_FILTER =
+INPUT_FILTER =
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
# is applied to all files.
-FILTER_PATTERNS =
+FILTER_PATTERNS =
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
# files to browse (i.e. when SOURCE_BROWSER is set to YES).
FILTER_SOURCE_FILES = NO
@@ -515,38 +515,38 @@ FILTER_SOURCE_FILES = NO
# configuration options related to source browsing
#---------------------------------------------------------------------------
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
# VERBATIM_HEADERS is set to NO.
SOURCE_BROWSER = NO
-# Setting the INLINE_SOURCES tag to YES will include the body
+# Setting the INLINE_SOURCES tag to YES will include the body
# of functions and classes directly in the documentation.
INLINE_SOURCES = YES
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
# fragments. Normal C and C++ comments will always remain visible.
STRIP_CODE_COMMENTS = YES
-# If the REFERENCED_BY_RELATION tag is set to YES (the default)
-# then for each documented function all documented
+# If the REFERENCED_BY_RELATION tag is set to YES (the default)
+# then for each documented function all documented
# functions referencing it will be listed.
REFERENCED_BY_RELATION = YES
-# If the REFERENCES_RELATION tag is set to YES (the default)
-# then for each documented function all documented entities
+# If the REFERENCES_RELATION tag is set to YES (the default)
+# then for each documented function all documented entities
# called/used by that function will be listed.
REFERENCES_RELATION = NO
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
# which an include is specified. Set to NO to disable this.
VERBATIM_HEADERS = NO
@@ -555,133 +555,133 @@ VERBATIM_HEADERS = NO
# configuration options related to the alphabetical class index
#---------------------------------------------------------------------------
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project