[Ns-commits] mathieu/ns-3-bug602

[code@nsnam.ece.gatech.edu]

---- align coding style
user: Mathieu Lacage <mathieu.lacage at sophia.inria.fr>
files: src/devices/wifi/adhoc-wifi-mac.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/7464beb31586


---- add newly-created state to state list.
user: Mathieu Lacage <mathieu.lacage at sophia.inria.fr>
files: src/devices/wifi/wifi-remote-station-manager.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/ccbdc2b19ea5


---- Fix bug 779: NixVectorRouting ignores specified outgoing interface in RouteOutput
user: Josh Pelkey <jpelkey at gatech.edu>
files: src/routing/nix-vector-routing/ipv4-nix-vector-routing.cc src/routing/nix-vector-routing/ipv4-nix-vector-routing.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/408970e134cb


---- Forgot code freeze.  Revert nix-vector bug fix for bug 779
user: Josh Pelkey <jpelkey at gatech.edu>
files: src/routing/nix-vector-routing/ipv4-nix-vector-routing.cc src/routing/nix-vector-routing/ipv4-nix-vector-routing.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/a46168c7f4a2


---- bug 725: wifi fragmentation and RTS cannot be used at the same time
user: Mathieu Lacage <mathieu.lacage at sophia.inria.fr>
files: src/devices/wifi/dca-txop.cc src/devices/wifi/dca-txop.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/c4b8a337fc29


---- bug 767:  Incorrect modulation for 802.11a modes
user: Mathieu Lacage <mathieu.lacage at sophia.inria.fr>
files: src/devices/wifi/wifi-mode.cc src/devices/wifi/wifi-mode.h src/devices/wifi/wifi-phy.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/a24cd8dce646


---- bug 752: Object::DoStart is not executed for objects created at t > 0
user: Mathieu Lacage <mathieu.lacage at sophia.inria.fr>
files: src/node/node.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/8788d85a6c3e


---- Fix of bug 706: Backoff counting when starting NS
user: Kirill Andreev <andreev at iitp.ru>
files: src/devices/mesh/mesh-wifi-interface-mac.cc src/devices/mesh/mesh-wifi-interface-mac.h src/devices/wifi/adhoc-wifi-mac.cc src/devices/wifi/adhoc-wifi-mac.h src/devices/wifi/dca-txop.cc src/devices/wifi/dca-txop.h src/devices/wifi/edca-txop-n.cc src/devices/wifi/edca-txop-n.h src/devices/wifi/nqap-wifi-mac.cc src/devices/wifi/nqsta-wifi-mac.cc src/devices/wifi/nqsta-wifi-mac.h src/devices/wifi/qadhoc-wifi-mac.cc src/devices/wifi/qadhoc-wifi-mac.h src/devices/wifi/qap-wifi-mac.cc src/devices/wifi/qsta-wifi-mac.cc src/devices/wifi/qsta-wifi-mac.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/395e17028faf


---- Fix of bug 706: fixed regressions
user: Kirill Andreev <andreev at iitp.ru>
files: src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-0-1.pcap src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-1-1.pcap src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-2-1.pcap src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-3-1.pcap src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-4-1.pcap src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-0-1.pcap src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-1-1.pcap src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-2-1.pcap src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-3-1.pcap src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-4-1.pcap src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-5-1.pcap src/devices/mesh/dot11s/test/hwmp-simplest-regression-test-0-1.pcap src/devices/mesh/dot11s/test/hwmp-simplest-regression-test-1-1.pcap src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-0-1.pcap src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-1-1.pcap src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-2-1.pcap src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-3-1.pcap src/devices/mesh/dot11s/test/pmp-regression-test-0-1.pcap src/devices/mesh/dot11s/test/pmp-regression-test-1-1.pcap src/devices/mesh/flame/test/flame-regression-test-0-1.pcap src/devices/mesh/flame/test/flame-regression-test-1-1.pcap src/devices/mesh/flame/test/flame-regression-test-2-1.pcap src/routing/aodv/test/aodv-chain-regression-test-0-0.pcap src/routing/aodv/test/aodv-chain-regression-test-1-0.pcap src/routing/aodv/test/aodv-chain-regression-test-2-0.pcap src/routing/aodv/test/aodv-chain-regression-test-3-0.pcap src/routing/aodv/test/aodv-chain-regression-test-4-0.pcap src/routing/aodv/test/bug-606-test-0-0.pcap src/routing/aodv/test/bug-606-test-1-0.pcap src/routing/aodv/test/bug-606-test-2-0.pcap src/routing/olsr/test/bug780-0-0.pcap src/routing/olsr/test/bug780-1-0.pcap src/routing/olsr/test/bug780-2-0.pcap src/routing/olsr/test/olsr-tc-regression-test-0-1.pcap src/routing/olsr/test/olsr-tc-regression-test-1-1.pcap src/routing/olsr/test/olsr-tc-regression-test-2-1.pcap
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/025c764ba6b6


---- Revert bug 706 fix: Remove traces change for bug 706
user: Faker Moatamri <faker.moatamri at sophia.inria.fr>
files: src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-0-1.pcap src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-1-1.pcap src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-2-1.pcap src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-3-1.pcap src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-4-1.pcap src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-0-1.pcap src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-1-1.pcap src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-2-1.pcap src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-3-1.pcap src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-4-1.pcap src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-5-1.pcap src/devices/mesh/dot11s/test/hwmp-simplest-regression-test-0-1.pcap src/devices/mesh/dot11s/test/hwmp-simplest-regression-test-1-1.pcap src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-0-1.pcap src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-1-1.pcap src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-2-1.pcap src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-3-1.pcap src/devices/mesh/dot11s/test/pmp-regression-test-0-1.pcap src/devices/mesh/dot11s/test/pmp-regression-test-1-1.pcap src/devices/mesh/flame/test/flame-regression-test-0-1.pcap src/devices/mesh/flame/test/flame-regression-test-1-1.pcap src/devices/mesh/flame/test/flame-regression-test-2-1.pcap src/routing/aodv/test/aodv-chain-regression-test-0-0.pcap src/routing/aodv/test/aodv-chain-regression-test-1-0.pcap src/routing/aodv/test/aodv-chain-regression-test-2-0.pcap src/routing/aodv/test/aodv-chain-regression-test-3-0.pcap src/routing/aodv/test/aodv-chain-regression-test-4-0.pcap src/routing/aodv/test/bug-606-test-0-0.pcap src/routing/aodv/test/bug-606-test-1-0.pcap src/routing/aodv/test/bug-606-test-2-0.pcap src/routing/olsr/test/bug780-0-0.pcap src/routing/olsr/test/bug780-1-0.pcap src/routing/olsr/test/bug780-2-0.pcap src/routing/olsr/test/olsr-tc-regression-test-0-1.pcap src/routing/olsr/test/olsr-tc-regression-test-1-1.pcap src/routing/olsr/test/olsr-tc-regression-test-2-1.pcap
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/2792b4b2e255


---- Revert bug 706 fix because it breaks the regression testing
user: Faker Moatamri <faker.moatamri at sophia.inria.fr>
files: src/devices/mesh/mesh-wifi-interface-mac.cc src/devices/mesh/mesh-wifi-interface-mac.h src/devices/wifi/adhoc-wifi-mac.cc src/devices/wifi/adhoc-wifi-mac.h src/devices/wifi/dca-txop.cc src/devices/wifi/dca-txop.h src/devices/wifi/edca-txop-n.cc src/devices/wifi/edca-txop-n.h src/devices/wifi/nqap-wifi-mac.cc src/devices/wifi/nqsta-wifi-mac.cc src/devices/wifi/nqsta-wifi-mac.h src/devices/wifi/qadhoc-wifi-mac.cc src/devices/wifi/qadhoc-wifi-mac.h src/devices/wifi/qap-wifi-mac.cc src/devices/wifi/qsta-wifi-mac.cc src/devices/wifi/qsta-wifi-mac.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/509b5089a081


---- Merge revert
user: Faker Moatamri <faker.moatamri at sophia.inria.fr>
files: 
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/892efc87a151


---- Added tag ns-3.7-RC3 for changeset 892efc87a151
user: fmoatamr
files: .hgtags
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/be7ee94b8f79


---- Bug 781: Suppress the valgrind error: Invalid read size of 8 in TestSuite devices-mesh-dot11s-regression
user: Faker Moatamri <faker.moatamri at sophia.inria.fr>
files: test.py testpy.supp
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/766442c7f240


---- Fix bug 779: NixVectorRouting ignores specified outgoing interface in RouteOutput
user: Josh Pelkey <jpelkey at gatech.edu>
files: src/routing/nix-vector-routing/ipv4-nix-vector-routing.cc src/routing/nix-vector-routing/ipv4-nix-vector-routing.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/681058254595


---- Bug 786 - Make Ipv4Address hashable from Python
user: Gustavo J. A. M. Carneiro  <gjc at inescporto.pt>
files: bindings/python/ns3modulegen.py bindings/python/ns3modulegen_core_customizations.py
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/993998a62a6a


---- Update test.py to detect still reachable memory blocks as errors, it will fail if there is some reachable memory blocks reported by valgrind
user: fmoatamr
files: test.py
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/679c04aa43e7


---- [bug 690] remove inoperative NscTcp cwnd trace connect
user: Tom Henderson <tomh at tomh.org>
files: examples/tcp/tcp-nsc-lfn.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/c64c692147f6


---- update AUTHORS
user: Tom Henderson <tomh at tomh.org>
files: AUTHORS
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/72726df9dcaa


---- Update RELEASE_NOTES
user: Tom Henderson <tomh at tomh.org>
files: RELEASE_NOTES
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/feff99f292d5


---- Bug 790: Fix memory leak in routing-aodv-regression
user: Faker Moatamri <faker.moatamri at sophia.inria.fr>
files: src/internet-stack/ipv4-l3-protocol.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/8f94a0ca3964


---- Bug 792:  Neither test.py nor waf --valgrind catch all kinds of memory leaks
user: Craig Dowell <craigdo at ee.washington.edu>
files: test.py wutils.py
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/aa8364846523


---- Bug 793: no creation of a new simulator when calling simulator::cancel or remove or IsExpired
user: Faker Moatamri <faker.moatamri at sophia.inria.fr>
files: src/simulator/simulator.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/a0e24e8844da


---- Bug 793: remove remaining memory leaks due to not cleaned Simulator
user: Faker Moatamri <faker.moatamri at sophia.inria.fr>
files: src/contrib/event-garbage-collector.cc src/devices/wifi/wifi-test.cc src/helper/ipv4-address-helper.cc src/internet-stack/ipv4-test.cc src/internet-stack/ipv6-test.cc src/node/ipv4-address-generator.cc src/routing/aodv/aodv-test-suite.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/b89ce2e9eed5


---- Update Simulator::SetScheduler doxygen
user: Faker Moatamri <faker.moatamri at sophia.inria.fr>
files: src/simulator/simulator.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/17bf6ee332ba


---- Added tag ns-3.7-RC4 for changeset 17bf6ee332ba
user: fmoatamr
files: .hgtags
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/4bea960ec837


---- Fix python bindings build when threading features are disabled (e.g. mingw)
user: Gustavo J. A. M. Carneiro  <gjc at inescporto.pt>
files: bindings/python/ns3modulegen.py
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/d5527ca873af


---- Update the manual to reflect changes
user: Tom Henderson <tomh at tomh.org>
files: doc/manual/animation.texi doc/manual/flow-monitor.texi doc/manual/routing.texi
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/2c19126bf000


---- Update error model and olsr doxygen
user: Tom Henderson <tomh at tomh.org>
files: src/common/error-model.h src/routing/olsr/olsr.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/1e6ba48a48ea


---- Update AUTHORS list
user: Tom Henderson <tomh at tomh.org>
files: AUTHORS
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/69ab7fdf4bbe


---- Update RELEASE_NOTES
user: Faker Moatamri <faker.moatamri at sophia.inria.fr>
files: RELEASE_NOTES
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/c1bb479d73ff


---- Update version number to 3.7
user: fmoatamr
files: VERSION
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/be3fb855c65a


---- Added tag ns-3.7 for changeset be3fb855c65a
user: fmoatamr
files: .hgtags
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/75aceae57b35


---- Version back to ns-3-dev
user: fmoatamr
files: VERSION
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/6fc881b42bff


---- don't call ostream::write too often.
user: Mathieu Lacage <mathieu.lacage at sophia.inria.fr>
files: src/common/buffer.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/f449711db53c


---- Fix bug 747: Listening TCP socket closes on RST
user: Fabian Mauchle <fabian.mauchle at hsr.ch>
files: src/internet-stack/tcp-socket-impl.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/894221b51957


---- Bug 788: OLSR_NEIGH_HOLD_TIME should be 3 times OLSR_REFRESH_INTERVAL
user: Josh Pelkey <jpelkey at gatech.edu>
files: src/routing/olsr/olsr-routing-protocol.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/462ca2c19a92


---- Update release notes and changes for ns-3.8
user: Josh Pelkey <jpelkey at gatech.edu>
files: CHANGES.html RELEASE_NOTES
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/2fc170de5400


---- [bug 789] Globalrouting externalroutes to use the new GetRootExitDirections()
user: Antti Mäkelä <zarhan at cc.hut.fi>
files: src/routing/global-routing/global-route-manager-impl.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/71a3dd5e7a08


---- Remove deprecated, non-exported API from class SPFVertex
user: Tom Henderson <tomh at tomh.org>
files: src/routing/global-routing/global-route-manager-impl.cc src/routing/global-routing/global-route-manager-impl.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/f89e4d1715b1


---- enforce that style conforms to our coding style
user: Mathieu Lacage <mathieu.lacage at sophia.inria.fr>
files: utils/check-style.py
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/66ca055e81c0


---- merge with HEAD
user: Mathieu Lacage <mathieu.lacage at sophia.inria.fr>
files: 
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/aa754f49d2f3


---- avoid copying bytes one after the other.
user: Mathieu Lacage <mathieu.lacage at sophia.inria.fr>
files: src/common/buffer.cc src/common/buffer.h src/common/packet.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/69bcae35bc81


---- add missing doxygen
user: Mathieu Lacage <mathieu.lacage at sophia.inria.fr>
files: src/common/packet.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/6f9cffdc7ed0


---- Upgrade to a newer pybindgen version with support for multiple-inheritance
user: Gustavo J. A. M. Carneiro  <gjc at inescporto.pt>
files: bindings/python/wscript
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/3e3a1501496d


---- Rescan python bindings
user: Gustavo J. A. M. Carneiro  <gjc at inescporto.pt>
files: bindings/python/apidefs/gcc-ILP32/ns3_module_common.py bindings/python/apidefs/gcc-ILP32/ns3_module_internet_stack.py bindings/python/apidefs/gcc-ILP32/ns3_module_stats.py bindings/python/apidefs/gcc-ILP32/ns3_module_wifi.py bindings/python/apidefs/gcc-LP64/ns3_module_common.py bindings/python/apidefs/gcc-LP64/ns3_module_internet_stack.py bindings/python/apidefs/gcc-LP64/ns3_module_stats.py bindings/python/apidefs/gcc-LP64/ns3_module_wifi.py
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/0731d1f144a1


---- Upgrade waf from 1.5.9 to 1.5.11
user: Gustavo J. A. M. Carneiro  <gjc at inescporto.pt>
files: bindings/python/wscript src/wscript waf
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/7c66549b828d


---- Remove ns3::PbbPacket::SerializePacketTlv, it is not implemented
user: Gustavo J. A. M. Carneiro  <gjc at inescporto.pt>
files: bindings/python/apidefs/gcc-ILP32/ns3_module_node.py bindings/python/apidefs/gcc-LP64/ns3_module_node.py src/node/packetbb.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/afda15a818fa


---- Moving the propagation models of wifi from src/devices/wifi to src/common. The idea is to share them with the other wireless devices.
user: Mohamed Amine Ismail <amine.ismail at sophia.inria.fr>
files: src/common/jakes-propagation-loss-model.cc src/common/jakes-propagation-loss-model.h src/common/propagation-delay-model.cc src/common/propagation-delay-model.h src/common/propagation-loss-model-test-suite.cc src/common/propagation-loss-model.cc src/common/propagation-loss-model.h src/common/wscript src/devices/wifi/jakes-propagation-loss-model.cc src/devices/wifi/jakes-propagation-loss-model.h src/devices/wifi/propagation-delay-model.cc src/devices/wifi/propagation-delay-model.h src/devices/wifi/propagation-loss-model-test-suite.cc src/devices/wifi/propagation-loss-model.cc src/devices/wifi/propagation-loss-model.h src/devices/wifi/wifi-channel.cc src/devices/wifi/wifi-phy-test.cc src/devices/wifi/wifi-test.cc src/devices/wifi/wscript src/devices/wifi/yans-wifi-channel.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/b1a245ae00d4


---- Doxygen for check-style.py
user: Tom Henderson <tomh at tomh.org>
files: doc/doxygen.conf doc/modules utils/utils.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/6bbb0a2da4e7


---- Bug 778 - OLSR ignores specified outgoing interface in RouteOutput()
user: Tom Henderson <tomh at tomh.org>
files: src/routing/olsr/olsr-routing-protocol.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/4fef76630d66


---- Upgrade pybindgen to fix the any() bug (Python <= 2.4)
user: Gustavo J. A. M. Carneiro  <gjc at inescporto.pt>
files: bindings/python/wscript
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/e0fcc8ffcaad


---- add block ack headers
user: Mirko Banchi <mk.banchi at gmail.com>
files: src/devices/wifi/ctrl-headers.cc src/devices/wifi/ctrl-headers.h src/devices/wifi/wscript
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/34bd93988e2b


---- add action frames needed by block ack
user: Mirko Banchi <mk.banchi at gmail.com>
files: src/devices/wifi/mgt-headers.cc src/devices/wifi/mgt-headers.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/66f939e7aaec


---- add support for block ack frames in WifiMacHeader
user: Mirko Banchi <mk.banchi at gmail.com>
files: src/devices/wifi/wifi-mac-header.cc src/devices/wifi/wifi-mac-header.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/a09eebc83465


---- add BlockAckAgreement and OriginatorBlockAckAgreement objects
user: Mirko Banchi <mk.banchi at gmail.com>
files: src/devices/wifi/block-ack-agreement.cc src/devices/wifi/block-ack-agreement.h src/devices/wifi/originator-block-ack-agreement.cc src/devices/wifi/originator-block-ack-agreement.h src/devices/wifi/wscript
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/083b4c1ec98d


---- WifiMacQueue now supports head pushing
user: Mirko Banchi <mk.banchi at gmail.com>
files: src/devices/wifi/edca-txop-n.cc src/devices/wifi/edca-txop-n.h src/devices/wifi/wifi-mac-queue.cc src/devices/wifi/wifi-mac-queue.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/0588b01cd77e


---- handle wifi action frames in high MACs
user: Mirko Banchi <mk.banchi at gmail.com>
files: src/devices/wifi/edca-txop-n.cc src/devices/wifi/edca-txop-n.h src/devices/wifi/qadhoc-wifi-mac.cc src/devices/wifi/qadhoc-wifi-mac.h src/devices/wifi/qap-wifi-mac.cc src/devices/wifi/qap-wifi-mac.h src/devices/wifi/qsta-wifi-mac.cc src/devices/wifi/qsta-wifi-mac.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/9e400f6b8a2c


---- add support for block ack in MacLowTransmissionParameters
user: Mirko Banchi <mk.banchi at gmail.com>
files: src/devices/wifi/mac-low.cc src/devices/wifi/mac-low.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/2b9e06875b69


---- add support for block ack in MacLowTransmissionListener
user: Mirko Banchi <mk.banchi at gmail.com>
files: src/devices/wifi/edca-txop-n.cc src/devices/wifi/edca-txop-n.h src/devices/wifi/mac-low.cc src/devices/wifi/mac-low.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/10fbe045901e


---- MacLow now buffers QoS MPDUs under Block Ack
user: Mirko Banchi <mk.banchi at gmail.com>
files: src/devices/wifi/mac-low.cc src/devices/wifi/mac-low.h src/devices/wifi/qadhoc-wifi-mac.cc src/devices/wifi/qap-wifi-mac.cc src/devices/wifi/qos-utils.cc src/devices/wifi/qos-utils.h src/devices/wifi/qsta-wifi-mac.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/e9918be47f78


---- handle block ack and block ack request frames in MacLow
user: Mirko Banchi <mk.banchi at gmail.com>
files: src/devices/wifi/mac-low.cc src/devices/wifi/mac-low.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/dd5ece55acb9


---- add block ack timeouts
user: Mirko Banchi <mk.banchi at gmail.com>
files: src/devices/wifi/edca-txop-n.cc src/devices/wifi/edca-txop-n.h src/devices/wifi/mac-low.cc src/devices/wifi/mac-low.h src/devices/wifi/qadhoc-wifi-mac.cc src/devices/wifi/qadhoc-wifi-mac.h src/devices/wifi/qap-wifi-mac.cc src/devices/wifi/qap-wifi-mac.h src/devices/wifi/qsta-wifi-mac.cc src/devices/wifi/qsta-wifi-mac.h src/devices/wifi/wifi-mac.cc src/devices/wifi/wifi-mac.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/dd0accd82659


---- add WifiMacQueue::GetNPacketsByTidAndAddress method
user: Mirko Banchi <mk.banchi at gmail.com>
files: src/devices/wifi/wifi-mac-queue.cc src/devices/wifi/wifi-mac-queue.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/66bc2d3da45f


---- retrieve next sequence number without increment it
user: Mirko Banchi <mk.banchi at gmail.com>
files: src/devices/wifi/mac-tx-middle.cc src/devices/wifi/mac-tx-middle.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/111680cdfa52


---- add BlockAckManager object
user: Mirko Banchi <mk.banchi at gmail.com>
files: src/devices/wifi/block-ack-manager.cc src/devices/wifi/block-ack-manager.h src/devices/wifi/wscript
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/83ecf0c135b2


---- add support for blocking of qos packets in WifiMacQueue
user: Mirko Banchi <mk.banchi at gmail.com>
files: src/devices/wifi/qos-blocked-destinations.cc src/devices/wifi/qos-blocked-destinations.h src/devices/wifi/wifi-mac-queue.cc src/devices/wifi/wifi-mac-queue.h src/devices/wifi/wscript
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/65fbfd43d8e7


---- add support to block ack in EdcaTxopN
user: Mirko Banchi <mk.banchi at gmail.com>
files: src/devices/wifi/edca-txop-n.cc src/devices/wifi/edca-txop-n.h src/devices/wifi/qadhoc-wifi-mac.cc src/devices/wifi/qap-wifi-mac.cc src/devices/wifi/qsta-wifi-mac.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/5f82c5a7068e


---- add support to block ack tear down in MacLow
user: Mirko Banchi <mk.banchi at gmail.com>
files: src/devices/wifi/edca-txop-n.cc src/devices/wifi/edca-txop-n.h src/devices/wifi/mac-low.cc src/devices/wifi/mac-low.h src/devices/wifi/qadhoc-wifi-mac.cc src/devices/wifi/qap-wifi-mac.cc src/devices/wifi/qsta-wifi-mac.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/8a59a619c30e


---- add support to block ack tear down in EdcaTxopN
user: Mirko Banchi <mk.banchi at gmail.com>
files: src/devices/wifi/edca-txop-n.cc src/devices/wifi/edca-txop-n.h src/devices/wifi/qadhoc-wifi-mac.cc src/devices/wifi/qap-wifi-mac.cc src/devices/wifi/qsta-wifi-mac.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/4e64e751be07


---- add a block ack example
user: Mirko Banchi <mk.banchi at gmail.com>
files: examples/wireless/wifi-blockack.cc examples/wireless/wscript
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/bd34322d49c1


---- add block ack test suite
user: Mirko Banchi <mk.banchi at gmail.com>
files: src/devices/wifi/block-ack-test-suite.cc src/devices/wifi/wscript
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/0ca25e25b116


---- Add a new line at qos-blocked-destinations.cc to make builds work for gcc-3.4.6,4.0.4,4.1.2,4.2.4
user: Faker Moatamri <faker.moatamri at sophia.inria.fr>
files: src/devices/wifi/qos-blocked-destinations.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/f953bc93d9c3


---- random-variable - doc updated and new Zeta distribution
user: Tommaso Pecorella <tommaso.pecorella at unifi.it>
files: src/core/random-variable.cc src/core/random-variable.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/68bd5111f38c


---- remove useless comment for doxygen
user: Mirko Banchi <mk.banchi at gmail.com>
files: src/devices/wifi/originator-block-ack-agreement.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/3e7938bf28b9


---- Bug 748 -  Cloned TCP socket uses wrong source address
user: Fabian Mauchle <f1mauchl at hsr.ch>
files: src/internet-stack/ipv4-end-point.cc src/internet-stack/ipv4-end-point.h src/internet-stack/nsc-tcp-l4-protocol.cc src/internet-stack/nsc-tcp-socket-impl.cc src/internet-stack/nsc-tcp-socket-impl.h src/internet-stack/tcp-l4-protocol.cc src/internet-stack/tcp-socket-impl.cc src/internet-stack/tcp-socket-impl.h src/internet-stack/udp-l4-protocol.cc src/internet-stack/udp-socket-impl.cc src/internet-stack/udp-socket-impl.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/805783c866fc


---- addition of two ray ground model and tests
user: tomhewer at blackbook.local
files: src/common/propagation-loss-model-test-suite.cc src/common/propagation-loss-model.cc src/common/propagation-loss-model.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/def0efbb0fd5


---- [bug 794] Ipv4Mask constructor for /yy-notation is wrong
user: Antti Mäkelä <zarhan at cc.hut.fi>
files: src/node/ipv4-address.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/8dcb272f3c00


---- bug 731:  Send function in point-to-point-net-device fails to check the return value of the Dequeue function
user: Tom Henderson <tomh at tomh.org>
files: src/devices/point-to-point/point-to-point-net-device.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/bd6c06ad0f41


---- comparing with http://code.nsnam.org/ns-3-dev
user: Craig Dowell <craigdo at ee.washington.edu>
files: src/devices/emu/emu-net-device.cc src/devices/emu/emu-net-device.h src/devices/emu/wscript src/devices/tap-bridge/tap-bridge.cc src/devices/tap-bridge/tap-bridge.h src/devices/tap-bridge/wscript wscript wutils.py
wscript wutils.py
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/c85cb9b073a0


---- use NS_LOG_APPEND_CONTEXT instead of MY_DEBUG macro
user: Mirko Banchi <mk.banchi at gmail.com>
files: src/devices/wifi/dca-txop.cc src/devices/wifi/edca-txop-n.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/dba5c9b69c3b


---- [bug 806] Remove CSMA padding from IP datagrams
user: Bill Roome <wdr at bell-labs.com>
files: src/internet-stack/ipv4-l3-protocol.cc src/internet-stack/ipv6-l3-protocol.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/288416b082a4


---- ns3-tcp-socket test suite for socket-related TCP tests
user: Tom Henderson <tomh at tomh.org>
files: src/test/ns3tcp/ns3tcp-socket-test-suite.cc src/test/ns3tcp/wscript
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/36c591bbdabd


---- Steady-state RWP model
user: Denis Fakhriev <fakhriev at iitp.ru>
files: src/mobility/steady-state-random-waypoint-mobility-model.cc src/mobility/steady-state-random-waypoint-mobility-model.h src/mobility/wscript
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/34687dd4a727


---- Python: add needed annotations to ns3::GlobalRouter::GetInjectedRoute and ns3::Ipv4GlobalRouting::GetRoute.  Fixes bug #809.
user: Gustavo J. A. M. Carneiro  <gjc at inescporto.pt>
files: bindings/python/ns3modulescan.py
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/7929ba7d13bd


---- Make the BlockAckManager to prevent problem with Python bindings
user: Gustavo J. A. M. Carneiro  <gjc at inescporto.pt>
files: src/devices/wifi/block-ack-manager.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/053cef05e395


---- Python: rescan API
user: Gustavo J. A. M. Carneiro  <gjc at inescporto.pt>
files: bindings/python/apidefs/gcc-ILP32/callbacks_list.py bindings/python/apidefs/gcc-ILP32/ns3_module_common.py bindings/python/apidefs/gcc-ILP32/ns3_module_core.py bindings/python/apidefs/gcc-ILP32/ns3_module_global_routing.py bindings/python/apidefs/gcc-ILP32/ns3_module_wifi.py bindings/python/apidefs/gcc-LP64/callbacks_list.py bindings/python/apidefs/gcc-LP64/ns3_module_common.py bindings/python/apidefs/gcc-LP64/ns3_module_core.py bindings/python/apidefs/gcc-LP64/ns3_module_global_routing.py bindings/python/apidefs/gcc-LP64/ns3_module_wifi.py
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/328c7437944d


---- merge
user: Gustavo J. A. M. Carneiro  <gjc at inescporto.pt>
files: 
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/469a8a062093


---- [bug 804] null pointer references in internet-stack
user: Bill Roome <wdr at bell-labs.com>
files: src/internet-stack/ipv4-l3-protocol.cc src/internet-stack/tcp-l4-protocol.cc src/internet-stack/tcp-socket-impl.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/7a60b058e7b4


---- New API olsr::RoutingProtocol::GetRoutingTableEntries ()
user: Gustavo J. A. M. Carneiro  <gjc at inescporto.pt>
files: bindings/python/apidefs/gcc-ILP32/ns3_module_olsr.py bindings/python/apidefs/gcc-LP64/ns3_module_olsr.py src/routing/olsr/olsr-routing-protocol.cc src/routing/olsr/olsr-routing-protocol.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/42d6f24bd0f4


---- Fix builds for g++-3.4.6,4.0.4,4.1.2, in steady-state-random-waypoint-mobility-model.cc, it calls node.create (double instead of uint32_t)
user: Faker Moatamri <faker.moatamri at sophia.inria.fr>
files: src/mobility/steady-state-random-waypoint-mobility-model.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/f59c5ea2b75f


---- fix comments in example; change some defaults
user: Tom Henderson <tomh at tomh.org>
files: examples/csma/csma-raw-ip-socket.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/026548ddc1d0


---- Clean up some stale comments in examples
user: Tom Henderson <tomh at tomh.org>
files: examples/csma/csma-packet-socket.cc examples/csma/csma-ping.cc examples/error-model/simple-error-model.cc examples/routing/simple-global-routing.cc examples/routing/simple-point-to-point-olsr.cc examples/tunneling/virtual-net-device.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/80584c404aba


---- Update Object documentation
user: Tom Henderson <tomh at tomh.org>
files: doc/manual/objects.texi
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/d3338a5578a5


---- a couple of typos.
user: Andrey Mazo <mazo at iitp.ru>
files: CHANGES.html doc/manual/objects.texi
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/20ee319e7e71


---- Bug 815 - waf shell file descriptor leak. Patch by Tom Goff, slightly modified.
user: Gustavo J. A. M. Carneiro  <gjc at inescporto.pt>
files: waf-tools/shellcmd.py
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/80cd9b67a1bd


---- Bug 184: add ConfigureDefaults to GtkConfigStore, refactor the code and coding style, add comments
user: Faker Moatamri <faker.moatamri at sophia.inria.fr>
files: src/contrib/attribute-default-iterator.cc src/contrib/attribute-default-iterator.h src/contrib/attribute-iterator.cc src/contrib/attribute-iterator.h src/contrib/display-functions.cc src/contrib/display-functions.h src/contrib/gtk-config-store.cc src/contrib/gtk-config-store.h src/contrib/model-node-creator.cc src/contrib/model-node-creator.h src/contrib/model-typeid-creator.cc src/contrib/model-typeid-creator.h src/contrib/raw-text-config.cc src/contrib/wscript src/contrib/xml-config.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/73ea01eb5674


---- add example for linux containers
user: Craig Dowell <craigdo at ee.washington.edu>
files: examples/tap/lxc-left.conf examples/tap/lxc-right.conf examples/tap/tap-csma-virtual-machine.cc examples/tap/wscript
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/20a6dea3fbf0


---- branch merge
user: Craig Dowell <craigdo at ee.washington.edu>
files: 
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/ced6c14c957e


---- fix build, remove debugging code from tap example
user: Craig Dowell <craigdo at ee.washington.edu>
files: examples/tap/tap-csma-virtual-machine.cc src/contrib/display-functions.h src/contrib/model-node-creator.cc src/contrib/model-node-creator.h src/contrib/model-typeid-creator.cc src/contrib/model-typeid-creator.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/017e7a1cfa7c


---- WAF: allow NS-3 modules to compile pure C code sources mixed with the C++ ones
user: Gustavo J. A. M. Carneiro  <gjc at inescporto.pt>
files: src/wscript wscript
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/84c404ad1d26


---- remove internet stack since it just confuses things
user: Craig Dowell <craigdo at ee.washington.edu>
files: examples/tap/tap-csma-virtual-machine.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/882e4dfec192


---- comments are helpful
user: Craig Dowell <craigdo at ee.washington.edu>
files: examples/tap/tap-csma-virtual-machine.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/a94435044c46


---- [Bug 814] Check if m_low is not zero
user: Mirko Banchi <mk.banchi at gmail.com>
files: src/devices/wifi/dca-txop.cc src/devices/wifi/edca-txop-n.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/ee04189aec1b


---- update bridge names and IP addresses
user: Craig Dowell <craigdo at ee.washington.edu>
files: examples/tap/lxc-left.conf examples/tap/lxc-right.conf
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/c7d241904b08


---- remove remaining mentions of RUN_SELF_TESTS
user: Mathieu Lacage <mathieu.lacage at sophia.inria.fr>
files: doc/doxygen.conf wscript
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/d563aaa88bc0


---- allow build to proceed when gtk is not present
user: Mathieu Lacage <mathieu.lacage at sophia.inria.fr>
files: src/contrib/wscript
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/93a684517ead


---- upgrade waf
user: Mathieu Lacage <mathieu.lacage at sophia.inria.fr>
files: waf
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/d6c026abfb3f


---- GetNode is bad in multithreaded devices
user: Craig Dowell <craigdo at ee.washington.edu>
files: src/devices/emu/emu-net-device.cc src/devices/emu/emu-net-device.h src/devices/tap-bridge/tap-bridge.cc src/devices/tap-bridge/tap-bridge.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/2ab92cdbaafa


---- infinite recursion isn't a good idea
user: Craig Dowell <craigdo at ee.washington.edu>
files: examples/tap/tap-csma-virtual-machine.cc examples/tap/tap-wifi-virtual-machine.cc examples/tap/wscript src/simulator/simulator.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/ea5ac3f29800


---- make adhoc
user: Craig Dowell <craigdo at ee.washington.edu>
files: examples/tap/tap-wifi-virtual-machine.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/8c16f9fbcc45


---- Bug 821 - AODV asserts with function logging enabled
user: Pavel Boyko <boyko at iitp.ru>
files: src/routing/aodv/aodv-packet.cc src/routing/aodv/aodv-packet.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/f3afc3eb9a58


---- Fix non-undocumented warnings in doxygen, also update doxygen.conf
user: Josh Pelkey <jpelkey at gatech.edu>
files: doc/doxygen.conf src/applications/udp-client-server/udp-trace-client.h src/common/pcap-file.h src/common/propagation-loss-model.h src/devices/wifi/block-ack-manager.h src/devices/wifi/msdu-standard-aggregator.h src/helper/point-to-point-dumbbell-helper.h src/internet-stack/tcp-l4-protocol.h src/mobility/waypoint.h src/node/application.h src/node/socket.h src/routing/nix-vector-routing/ipv4-nix-vector-routing.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/aa1c297a0de2


---- redo pcap tracing
user: Craig Dowell <craigdo at ee.washington.edu>
files: bindings/python/apidefs/gcc-ILP32/ns3_module_common.py bindings/python/apidefs/gcc-ILP32/ns3_module_core.py bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py bindings/python/apidefs/gcc-LP64/ns3_module_common.py bindings/python/apidefs/gcc-LP64/ns3_module_core.py bindings/python/apidefs/gcc-LP64/ns3_module_helper.py examples/csma/csma-bridge-one-hop.cc examples/csma/csma-bridge.cc examples/csma/csma-bridge.py examples/csma/csma-broadcast.cc examples/csma/csma-multicast.cc examples/csma/csma-one-subnet.cc examples/csma/csma-star.cc examples/emulation/emu-ping.cc examples/emulation/emu-udp-echo.cc examples/error-model/simple-error-model.cc examples/ipv6/fragmentation-ipv6.cc examples/ipv6/icmpv6-redirect.cc examples/ipv6/loose-routing-ipv6.cc examples/ipv6/ping6.cc examples/ipv6/radvd-two-prefix.cc examples/ipv6/radvd.cc examples/naming/object-names.cc examples/realtime/realtime-udp-echo.cc examples/routing/dynamic-global-routing.cc examples/routing/global-injection-slash32.cc examples/routing/global-routing-slash32.cc examples/routing/mixed-global-routing.cc examples/routing/simple-alternate-routing.cc examples/routing/simple-global-routing.cc examples/routing/simple-point-to-point-olsr.cc examples/routing/simple-routing-ping6.cc examples/routing/static-routing-slash32.cc examples/socket/socket-bound-static-routing.cc examples/socket/socket-bound-tcp-static-routing.cc examples/tap/tap-csma.cc examples/tap/tap-wifi-dumbbell.cc examples/tcp/star.cc examples/tcp/tcp-large-transfer.cc examples/tcp/tcp-nsc-lfn.cc examples/tcp/tcp-nsc-zoo.cc examples/tcp/tcp-star-server.cc examples/tunneling/virtual-net-device.cc examples/tutorial/second.cc examples/tutorial/third.cc examples/udp/udp-echo.cc examples/wireless/mixed-wireless.cc examples/wireless/wifi-simple-adhoc-grid.cc examples/wireless/wifi-simple-adhoc.cc examples/wireless/wifi-simple-infra.cc examples/wireless/wifi-simple-interference.cc examples/wireless/wifi-wired-bridging.cc src/common/pcap-file-object.cc src/common/pcap-file-object.h src/common/wscript src/helper/csma-helper.cc src/helper/csma-helper.h src/helper/emu-helper.cc src/helper/emu-helper.h src/helper/pcap-helper.cc src/helper/pcap-helper.h src/helper/pcap-user-helper.cc src/helper/pcap-user-helper.h src/helper/point-to-point-helper.cc src/helper/point-to-point-helper.h src/helper/wscript src/helper/yans-wifi-helper.cc src/helper/yans-wifi-helper.h src/node/radiotap-header.cc src/node/radiotap-header.h src/node/wscript src/test/ns3tcp/ns3tcp-cwnd-test-suite.cc src/test/ns3tcp/ns3tcp-interop-test-suite.cc src/test/ns3wifi/wifi-interference-test-suite.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/e1b696a1ed28


---- branch merge
user: Craig Dowell <craigdo at ee.washington.edu>
files: 
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/2f8808d4bb93


---- ascii trace additions
user: Craig Dowell <craigdo at ee.washington.edu>
files: examples/csma/csma-one-subnet.cc src/common/output-stream-object.cc src/common/output-stream-object.h src/common/wscript src/devices/csma/csma-net-device.h src/helper/ascii-trace-helper.cc src/helper/ascii-trace-helper.h src/helper/ascii-trace-user-helper.cc src/helper/ascii-trace-user-helper.h src/helper/csma-helper.cc src/helper/csma-helper.h src/helper/wscript
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/3fd7841b9c20


---- branch merge
user: Craig Dowell <craigdo at ee.washington.edu>
files: examples/tcp/tcp-nsc-lfn.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/4756711e6676


---- checkpoint
user: Craig Dowell <craigdo at ee.washington.edu>
files: examples/routing/dynamic-global-routing.cc examples/routing/mixed-global-routing.cc src/devices/emu/emu-net-device.h src/devices/point-to-point/point-to-point-net-device.h src/helper/ascii-trace-helper.cc src/helper/ascii-trace-helper.h src/helper/ascii-trace-user-helper-for-device.cc src/helper/ascii-trace-user-helper-for-device.h src/helper/ascii-trace-user-helper-for-ipv4.cc src/helper/ascii-trace-user-helper-for-ipv4.h src/helper/ascii-trace-user-helper.cc src/helper/ascii-trace-user-helper.h src/helper/csma-helper.cc src/helper/csma-helper.h src/helper/emu-helper.cc src/helper/emu-helper.h src/helper/internet-stack-helper.cc src/helper/internet-stack-helper.h src/helper/ipv4-interface-container.cc src/helper/ipv4-interface-container.h src/helper/node-container.h src/helper/pcap-helper.cc src/helper/pcap-helper.h src/helper/pcap-user-helper-for-device.cc src/helper/pcap-user-helper-for-device.h src/helper/pcap-user-helper-for-ipv4.cc src/helper/pcap-user-helper-for-ipv4.h src/helper/pcap-user-helper.cc src/helper/pcap-user-helper.h src/helper/point-to-point-helper.cc src/helper/point-to-point-helper.h src/helper/wscript src/helper/yans-wifi-helper.cc src/helper/yans-wifi-helper.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/fa3ab7f34eb2


---- checkpoint
user: Craig Dowell <craigdo at ee.washington.edu>
files: bindings/python/apidefs/gcc-ILP32/ns3_module_common.py bindings/python/apidefs/gcc-ILP32/ns3_module_core.py bindings/python/apidefs/gcc-ILP32/ns3_module_csma.py bindings/python/apidefs/gcc-ILP32/ns3_module_emu.py bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py bindings/python/apidefs/gcc-ILP32/ns3_module_node.py bindings/python/apidefs/gcc-ILP32/ns3_module_point_to_point.py bindings/python/apidefs/gcc-ILP32/ns3_module_wifi.py bindings/python/apidefs/gcc-LP64/ns3_module_common.py bindings/python/apidefs/gcc-LP64/ns3_module_core.py bindings/python/apidefs/gcc-LP64/ns3_module_csma.py bindings/python/apidefs/gcc-LP64/ns3_module_emu.py bindings/python/apidefs/gcc-LP64/ns3_module_helper.py bindings/python/apidefs/gcc-LP64/ns3_module_node.py bindings/python/apidefs/gcc-LP64/ns3_module_point_to_point.py bindings/python/apidefs/gcc-LP64/ns3_module_wifi.py examples/csma/csma-bridge-one-hop.cc examples/csma/csma-bridge.cc examples/csma/csma-broadcast.cc examples/csma/csma-multicast.cc examples/csma/csma-one-subnet.cc examples/csma/csma-packet-socket.cc examples/error-model/simple-error-model.cc examples/ipv6/fragmentation-ipv6.cc examples/ipv6/icmpv6-redirect.cc examples/ipv6/loose-routing-ipv6.cc examples/ipv6/ping6.cc examples/ipv6/radvd-two-prefix.cc examples/ipv6/radvd.cc examples/realtime/realtime-udp-echo.cc examples/routing/dynamic-global-routing.cc examples/routing/global-injection-slash32.cc examples/routing/global-routing-slash32.cc examples/routing/mixed-global-routing.cc examples/routing/simple-alternate-routing.cc examples/routing/simple-global-routing.cc examples/routing/simple-point-to-point-olsr.cc examples/routing/simple-routing-ping6.cc examples/routing/static-routing-slash32.cc examples/socket/socket-bound-static-routing.cc examples/socket/socket-bound-tcp-static-routing.cc examples/tcp/tcp-large-transfer.cc examples/tcp/tcp-star-server.cc examples/tunneling/virtual-net-device.cc examples/udp/udp-echo.cc examples/wireless/mixed-wireless.cc examples/wireless/multirate.cc examples/wireless/wifi-simple-adhoc-grid.cc src/helper/ascii-trace-helper.cc src/helper/ascii-trace-helper.h src/helper/ascii-trace-user-helper-for-device.cc src/helper/ascii-trace-user-helper-for-ipv4.cc src/helper/pcap-helper.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/d251d4a44fde


---- clean up internet stack helper tracing
user: Craig Dowell <craigdo at ee.washington.edu>
files: src/helper/internet-stack-helper.cc src/internet-stack/ipv4-l3-protocol.cc src/internet-stack/ipv4-l3-protocol.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/e9e4575cb6f3


---- branch merge
user: Craig Dowell <craigdo at ee.washington.edu>
files: 
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/b15a423f9446


---- merge trace helper files
user: Craig Dowell <craigdo at ee.washington.edu>
files: src/helper/ascii-trace-helper.cc src/helper/ascii-trace-helper.h src/helper/ascii-trace-user-helper-for-device.cc src/helper/ascii-trace-user-helper-for-device.h src/helper/ascii-trace-user-helper-for-ipv4.cc src/helper/ascii-trace-user-helper-for-ipv4.h src/helper/csma-helper.h src/helper/emu-helper.h src/helper/internet-stack-helper.h src/helper/pcap-helper.cc src/helper/pcap-helper.h src/helper/pcap-user-helper-for-device.cc src/helper/pcap-user-helper-for-device.h src/helper/pcap-user-helper-for-ipv4.cc src/helper/pcap-user-helper-for-ipv4.h src/helper/point-to-point-helper.h src/helper/wscript src/helper/yans-wifi-helper.h src/test/ns3tcp/ns3tcp-interop-test-suite.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/050fa2b861df


---- update CHANGES ns-3.7 to ns-3.8
user: Craig Dowell <craigdo at ee.washington.edu>
files: CHANGES.html
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/92c388406dbe


---- update tutorial for tracing rework
user: Craig Dowell <craigdo at ee.washington.edu>
files: doc/tutorial/building-topologies.texi doc/tutorial/tweaking.texi
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/adc48a1def77


---- add sixth tutorial example for mid-level tracing helpers
user: Craig Dowell <craigdo at ee.washington.edu>
files: doc/tutorial/tracing.texi examples/tutorial/sixth.cc examples/tutorial/wscript
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/f8212529e82a


---- DLT_PPP for sixth dropped packets
user: Craig Dowell <craigdo at ee.washington.edu>
files: examples/tutorial/sixth.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/fddc1ed290f8


---- add words to tutorial about new trace helpers
user: Craig Dowell <craigdo at ee.washington.edu>
files: doc/tutorial/tracing.texi
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/8f95b1a64534


---- rearrange trace code in sixth.cc for clarity
user: Craig Dowell <craigdo at ee.washington.edu>
files: examples/tutorial/sixth.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/c7fbbfc5a7e8


---- branch merge
user: Craig Dowell <craigdo at ee.washington.edu>
files: 
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/bc1f51a7dae5


---- lots of words on user-level trace helpers
user: Craig Dowell <craigdo at ee.washington.edu>
files: doc/tutorial/tracing.texi
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/97abaecc0e96


---- some words about mixins in helpers
user: Craig Dowell <craigdo at ee.washington.edu>
files: src/helper/csma-helper.h src/helper/emu-helper.h src/helper/internet-stack-helper.h src/helper/point-to-point-helper.h src/helper/yans-wifi-helper.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/38a97b815052


---- add ipv6
user: Craig Dowell <craigdo at ee.washington.edu>
files: bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py bindings/python/apidefs/gcc-LP64/ns3_module_helper.py examples/routing/dynamic-global-routing.cc examples/wireless/mixed-wireless.cc src/helper/ascii-trace-helper.cc src/helper/ascii-trace-helper.h src/helper/internet-stack-helper.cc src/helper/internet-stack-helper.h src/helper/ipv6-interface-container.cc src/helper/ipv6-interface-container.h src/helper/pcap-helper.cc src/helper/pcap-helper.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/8ed838dd0be5


---- merge trace helpers, rescan
user: Craig Dowell <craigdo at ee.washington.edu>
files: bindings/python/apidefs/gcc-ILP32/ns3_module_aodv.py bindings/python/apidefs/gcc-ILP32/ns3_module_bridge.py bindings/python/apidefs/gcc-ILP32/ns3_module_common.py bindings/python/apidefs/gcc-ILP32/ns3_module_contrib.py bindings/python/apidefs/gcc-ILP32/ns3_module_core.py bindings/python/apidefs/gcc-ILP32/ns3_module_csma.py bindings/python/apidefs/gcc-ILP32/ns3_module_dot11s.py bindings/python/apidefs/gcc-ILP32/ns3_module_emu.py bindings/python/apidefs/gcc-ILP32/ns3_module_flame.py bindings/python/apidefs/gcc-ILP32/ns3_module_flow_monitor.py bindings/python/apidefs/gcc-ILP32/ns3_module_global_routing.py bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py bindings/python/apidefs/gcc-ILP32/ns3_module_internet_stack.py bindings/python/apidefs/gcc-ILP32/ns3_module_list_routing.py bindings/python/apidefs/gcc-ILP32/ns3_module_mesh.py bindings/python/apidefs/gcc-ILP32/ns3_module_mobility.py bindings/python/apidefs/gcc-ILP32/ns3_module_nix_vector_routing.py bindings/python/apidefs/gcc-ILP32/ns3_module_node.py bindings/python/apidefs/gcc-ILP32/ns3_module_olsr.py bindings/python/apidefs/gcc-ILP32/ns3_module_onoff.py bindings/python/apidefs/gcc-ILP32/ns3_module_packet_sink.py bindings/python/apidefs/gcc-ILP32/ns3_module_ping6.py bindings/python/apidefs/gcc-ILP32/ns3_module_point_to_point.py bindings/python/apidefs/gcc-ILP32/ns3_module_radvd.py bindings/python/apidefs/gcc-ILP32/ns3_module_simulator.py bindings/python/apidefs/gcc-ILP32/ns3_module_static_routing.py bindings/python/apidefs/gcc-ILP32/ns3_module_stats.py bindings/python/apidefs/gcc-ILP32/ns3_module_tap_bridge.py bindings/python/apidefs/gcc-ILP32/ns3_module_test.py bindings/python/apidefs/gcc-ILP32/ns3_module_udp_client_server.py bindings/python/apidefs/gcc-ILP32/ns3_module_udp_echo.py bindings/python/apidefs/gcc-ILP32/ns3_module_v4ping.py bindings/python/apidefs/gcc-ILP32/ns3_module_virtual_net_device.py bindings/python/apidefs/gcc-ILP32/ns3_module_wifi.py bindings/python/apidefs/gcc-ILP32/ns3modulegen_generated.py bindings/python/apidefs/gcc-LP64/ns3_module_aodv.py bindings/python/apidefs/gcc-LP64/ns3_module_bridge.py bindings/python/apidefs/gcc-LP64/ns3_module_common.py bindings/python/apidefs/gcc-LP64/ns3_module_contrib.py bindings/python/apidefs/gcc-LP64/ns3_module_core.py bindings/python/apidefs/gcc-LP64/ns3_module_csma.py bindings/python/apidefs/gcc-LP64/ns3_module_dot11s.py bindings/python/apidefs/gcc-LP64/ns3_module_emu.py bindings/python/apidefs/gcc-LP64/ns3_module_flame.py bindings/python/apidefs/gcc-LP64/ns3_module_flow_monitor.py bindings/python/apidefs/gcc-LP64/ns3_module_global_routing.py bindings/python/apidefs/gcc-LP64/ns3_module_helper.py bindings/python/apidefs/gcc-LP64/ns3_module_internet_stack.py bindings/python/apidefs/gcc-LP64/ns3_module_list_routing.py bindings/python/apidefs/gcc-LP64/ns3_module_mesh.py bindings/python/apidefs/gcc-LP64/ns3_module_mobility.py bindings/python/apidefs/gcc-LP64/ns3_module_nix_vector_routing.py bindings/python/apidefs/gcc-LP64/ns3_module_node.py bindings/python/apidefs/gcc-LP64/ns3_module_olsr.py bindings/python/apidefs/gcc-LP64/ns3_module_onoff.py bindings/python/apidefs/gcc-LP64/ns3_module_packet_sink.py bindings/python/apidefs/gcc-LP64/ns3_module_ping6.py bindings/python/apidefs/gcc-LP64/ns3_module_point_to_point.py bindings/python/apidefs/gcc-LP64/ns3_module_radvd.py bindings/python/apidefs/gcc-LP64/ns3_module_simulator.py bindings/python/apidefs/gcc-LP64/ns3_module_static_routing.py bindings/python/apidefs/gcc-LP64/ns3_module_stats.py bindings/python/apidefs/gcc-LP64/ns3_module_tap_bridge.py bindings/python/apidefs/gcc-LP64/ns3_module_test.py bindings/python/apidefs/gcc-LP64/ns3_module_udp_client_server.py bindings/python/apidefs/gcc-LP64/ns3_module_udp_echo.py bindings/python/apidefs/gcc-LP64/ns3_module_v4ping.py bindings/python/apidefs/gcc-LP64/ns3_module_virtual_net_device.py bindings/python/apidefs/gcc-LP64/ns3_module_wifi.py bindings/python/apidefs/gcc-LP64/ns3modulegen_generated.py src/helper/ascii-trace-helper.h src/helper/csma-helper.cc src/helper/csma-helper.h src/helper/emu-helper.cc src/helper/emu-helper.h src/helper/internet-stack-helper.cc src/helper/internet-stack-helper.h src/helper/point-to-point-helper.cc src/helper/point-to-point-helper.h src/helper/trace-helper.cc src/helper/trace-helper.h src/helper/wifi-helper.h src/helper/wscript src/helper/yans-wifi-helper.cc src/helper/yans-wifi-helper.h src/wscript
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/96fb92f73f3d


---- tell pybindgen not to disable inheritance on classes that end with Helper, and rescan
user: Craig Dowell <craigdo at ee.washington.edu>
files: bindings/python/apidefs/gcc-ILP32/ns3_module_aodv.py bindings/python/apidefs/gcc-ILP32/ns3_module_bridge.py bindings/python/apidefs/gcc-ILP32/ns3_module_common.py bindings/python/apidefs/gcc-ILP32/ns3_module_contrib.py bindings/python/apidefs/gcc-ILP32/ns3_module_core.py bindings/python/apidefs/gcc-ILP32/ns3_module_csma.py bindings/python/apidefs/gcc-ILP32/ns3_module_dot11s.py bindings/python/apidefs/gcc-ILP32/ns3_module_emu.py bindings/python/apidefs/gcc-ILP32/ns3_module_flame.py bindings/python/apidefs/gcc-ILP32/ns3_module_flow_monitor.py bindings/python/apidefs/gcc-ILP32/ns3_module_global_routing.py bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py bindings/python/apidefs/gcc-ILP32/ns3_module_internet_stack.py bindings/python/apidefs/gcc-ILP32/ns3_module_list_routing.py bindings/python/apidefs/gcc-ILP32/ns3_module_mesh.py bindings/python/apidefs/gcc-ILP32/ns3_module_mobility.py bindings/python/apidefs/gcc-ILP32/ns3_module_nix_vector_routing.py bindings/python/apidefs/gcc-ILP32/ns3_module_node.py bindings/python/apidefs/gcc-ILP32/ns3_module_olsr.py bindings/python/apidefs/gcc-ILP32/ns3_module_onoff.py bindings/python/apidefs/gcc-ILP32/ns3_module_packet_sink.py bindings/python/apidefs/gcc-ILP32/ns3_module_ping6.py bindings/python/apidefs/gcc-ILP32/ns3_module_point_to_point.py bindings/python/apidefs/gcc-ILP32/ns3_module_radvd.py bindings/python/apidefs/gcc-ILP32/ns3_module_simulator.py bindings/python/apidefs/gcc-ILP32/ns3_module_static_routing.py bindings/python/apidefs/gcc-ILP32/ns3_module_stats.py bindings/python/apidefs/gcc-ILP32/ns3_module_tap_bridge.py bindings/python/apidefs/gcc-ILP32/ns3_module_test.py bindings/python/apidefs/gcc-ILP32/ns3_module_udp_client_server.py bindings/python/apidefs/gcc-ILP32/ns3_module_udp_echo.py bindings/python/apidefs/gcc-ILP32/ns3_module_v4ping.py bindings/python/apidefs/gcc-ILP32/ns3_module_virtual_net_device.py bindings/python/apidefs/gcc-ILP32/ns3_module_wifi.py bindings/python/apidefs/gcc-ILP32/ns3modulegen_generated.py bindings/python/apidefs/gcc-LP64/ns3_module_aodv.py bindings/python/apidefs/gcc-LP64/ns3_module_bridge.py bindings/python/apidefs/gcc-LP64/ns3_module_common.py bindings/python/apidefs/gcc-LP64/ns3_module_contrib.py bindings/python/apidefs/gcc-LP64/ns3_module_core.py bindings/python/apidefs/gcc-LP64/ns3_module_csma.py bindings/python/apidefs/gcc-LP64/ns3_module_dot11s.py bindings/python/apidefs/gcc-LP64/ns3_module_emu.py bindings/python/apidefs/gcc-LP64/ns3_module_flame.py bindings/python/apidefs/gcc-LP64/ns3_module_flow_monitor.py bindings/python/apidefs/gcc-LP64/ns3_module_global_routing.py bindings/python/apidefs/gcc-LP64/ns3_module_helper.py bindings/python/apidefs/gcc-LP64/ns3_module_internet_stack.py bindings/python/apidefs/gcc-LP64/ns3_module_list_routing.py bindings/python/apidefs/gcc-LP64/ns3_module_mesh.py bindings/python/apidefs/gcc-LP64/ns3_module_mobility.py bindings/python/apidefs/gcc-LP64/ns3_module_nix_vector_routing.py bindings/python/apidefs/gcc-LP64/ns3_module_node.py bindings/python/apidefs/gcc-LP64/ns3_module_olsr.py bindings/python/apidefs/gcc-LP64/ns3_module_onoff.py bindings/python/apidefs/gcc-LP64/ns3_module_packet_sink.py bindings/python/apidefs/gcc-LP64/ns3_module_ping6.py bindings/python/apidefs/gcc-LP64/ns3_module_point_to_point.py bindings/python/apidefs/gcc-LP64/ns3_module_radvd.py bindings/python/apidefs/gcc-LP64/ns3_module_simulator.py bindings/python/apidefs/gcc-LP64/ns3_module_static_routing.py bindings/python/apidefs/gcc-LP64/ns3_module_stats.py bindings/python/apidefs/gcc-LP64/ns3_module_tap_bridge.py bindings/python/apidefs/gcc-LP64/ns3_module_test.py bindings/python/apidefs/gcc-LP64/ns3_module_udp_client_server.py bindings/python/apidefs/gcc-LP64/ns3_module_udp_echo.py bindings/python/apidefs/gcc-LP64/ns3_module_v4ping.py bindings/python/apidefs/gcc-LP64/ns3_module_virtual_net_device.py bindings/python/apidefs/gcc-LP64/ns3_module_wifi.py bindings/python/apidefs/gcc-LP64/ns3modulegen_generated.py bindings/python/ns3modulescan.py examples/tutorial/sixth.cc src/wscript
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/096af1414c37


---- linearize mixins and make internet stack helper work correctly
user: Craig Dowell <craigdo at ee.washington.edu>
files: doc/tutorial/tracing.texi examples/tutorial/sixth.cc src/helper/internet-stack-helper.cc src/helper/internet-stack-helper.h src/helper/trace-helper.cc src/internet-stack/ipv4-l3-protocol.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/7b67e0413b57


---- manual update
user: Craig Dowell <craigdo at ee.washington.edu>
files: doc/manual/tracing.texi
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/18776ed87c60


---- update CHANGES.html
user: Craig Dowell <craigdo at ee.washington.edu>
files: CHANGES.html
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/a31949e0f1ed


---- remove old files
user: Craig Dowell <craigdo at ee.washington.edu>
files: src/helper/ascii-trace-helper.cc src/helper/ascii-trace-helper.h src/helper/pcap-helper.cc src/helper/pcap-helper.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/f6265f56a326


---- add a place for perf tests
user: Craig Dowell <craigdo at ee.washington.edu>
files: src/test/perf/perf-pcap.cc src/test/perf/waf src/test/perf/wscript src/test/wscript src/wscript
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/de2824cc388d


---- add ability to pass a header to pcap file object
user: Craig Dowell <craigdo at ee.washington.edu>
files: src/common/pcap-file-object.cc src/common/pcap-file-object.h src/test/perf/perf-pcap.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/ecd8840c3573


---- unused variables
user: Craig Dowell <craigdo at ee.washington.edu>
files: src/helper/internet-stack-helper.cc src/helper/trace-helper.cc src/helper/trace-helper.h src/node/radiotap-header.cc src/test/perf/perf-pcap.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/5d89e247af46


---- branch merge
user: Craig Dowell <craigdo at ee.washington.edu>
files: 
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/fedfb1cedb9b


---- branch merge
user: Craig Dowell <craigdo at ee.washington.edu>
files: CHANGES.html bindings/python/apidefs/gcc-ILP32/ns3_module_common.py bindings/python/apidefs/gcc-ILP32/ns3_module_internet_stack.py bindings/python/apidefs/gcc-ILP32/ns3_module_node.py bindings/python/apidefs/gcc-ILP32/ns3_module_stats.py bindings/python/apidefs/gcc-LP64/ns3_module_common.py bindings/python/apidefs/gcc-LP64/ns3_module_internet_stack.py bindings/python/apidefs/gcc-LP64/ns3_module_node.py bindings/python/apidefs/gcc-LP64/ns3_module_stats.py src/test/perf/perf-pcap.cc src/wscript
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/f1926441567b


---- some rewording of rewording suggested by Tom
user: Craig Dowell <craigdo at ee.washington.edu>
files: doc/tutorial/tracing.texi
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/c4006544d0b8


---- Add Doxygen
user: Craig Dowell <craigdo at ee.washington.edu>
files: src/common/pcap-file-object.h src/common/pcap-file.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/a30eb0e5758a


---- Review feedback
user: Craig Dowell <craigdo at ee.washington.edu>
files: examples/wireless/wifi-simple-adhoc-grid.cc examples/wireless/wifi-simple-adhoc.cc examples/wireless/wifi-simple-infra.cc examples/wireless/wifi-simple-interference.cc examples/wireless/wifi-wired-bridging.cc src/common/pcap-file-object.cc src/common/pcap-file-object.h src/helper/trace-helper.h src/helper/yans-wifi-helper.cc src/helper/yans-wifi-helper.h src/node/radiotap-header.h src/test/ns3wifi/wifi-interference-test-suite.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/b65c6d6794f8


---- branch merge
user: Craig Dowell <craigdo at ee.washington.edu>
files: src/common/wscript src/devices/wifi/jakes-propagation-loss-model.cc src/devices/wifi/jakes-propagation-loss-model.h src/devices/wifi/propagation-delay-model.cc src/devices/wifi/propagation-delay-model.h src/devices/wifi/propagation-loss-model-test-suite.cc src/devices/wifi/propagation-loss-model.cc src/devices/wifi/propagation-loss-model.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/b6f6c23303e8


---- Don't allocate buffers
user: Craig Dowell <craigdo at ee.washington.edu>
files: src/common/pcap-file-object.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/fe4ec1033fec


---- add io performance benchmark
user: Craig Dowell <craigdo at ee.washington.edu>
files: src/test/perf/perf-io.cc src/test/perf/perf-pcap.cc src/test/perf/wscript
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/3c63454cc32c


---- branch merge
user: Craig Dowell <craigdo at ee.washington.edu>
files: src/devices/emu/emu-net-device.h src/internet-stack/ipv4-l3-protocol.cc src/test/ns3tcp/ns3tcp-socket-test-suite.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/648d35d8fed6


---- output stream object inherits from simple ref count
user: Craig Dowell <craigdo at ee.washington.edu>
files: src/common/output-stream-object.cc src/common/output-stream-object.h src/helper/trace-helper.cc test.py
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/46665d75667d


---- remove ascii-writer, pcap-writer, branch merge
user: Craig Dowell <craigdo at ee.washington.edu>
files: bindings/python/apidefs/gcc-ILP32/ns3_module_common.py bindings/python/apidefs/gcc-ILP32/ns3_module_core.py bindings/python/apidefs/gcc-ILP32/ns3_module_global_routing.py bindings/python/apidefs/gcc-ILP32/ns3_module_olsr.py bindings/python/apidefs/gcc-ILP32/ns3_module_wifi.py bindings/python/apidefs/gcc-LP64/ns3_module_common.py bindings/python/apidefs/gcc-LP64/ns3_module_core.py bindings/python/apidefs/gcc-LP64/ns3_module_global_routing.py bindings/python/apidefs/gcc-LP64/ns3_module_olsr.py bindings/python/apidefs/gcc-LP64/ns3_module_wifi.py bindings/python/ns3modulescan.py examples/csma/csma-packet-socket.cc examples/error-model/simple-error-model.cc examples/routing/simple-global-routing.cc examples/routing/simple-point-to-point-olsr.cc examples/tunneling/virtual-net-device.cc src/common/ascii-writer.cc src/common/ascii-writer.h src/common/pcap-writer.cc src/common/pcap-writer.h src/common/wscript src/internet-stack/ipv4-l3-protocol.cc src/test/perf/perf-pcap.cc src/test/perf/wscript
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/09841960107d


---- move back to mixins for helpers
user: Craig Dowell <craigdo at ee.washington.edu>
files: src/helper/csma-helper.h src/helper/emu-helper.h src/helper/internet-stack-helper.h src/helper/point-to-point-helper.h src/helper/trace-helper.cc src/helper/trace-helper.h src/helper/wifi-helper.h src/helper/yans-wifi-helper.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/2f91f77ba14e


---- The name OutputStreamObject is no longer appropriate
user: Craig Dowell <craigdo at ee.washington.edu>
files: doc/tutorial/tracing.texi examples/routing/dynamic-global-routing.cc examples/routing/mixed-global-routing.cc examples/tutorial/sixth.cc examples/wireless/mixed-wireless.cc src/common/output-stream-keeper.cc src/common/output-stream-keeper.h src/common/output-stream-object.cc src/common/output-stream-object.h src/common/wscript src/helper/csma-helper.cc src/helper/csma-helper.h src/helper/emu-helper.cc src/helper/emu-helper.h src/helper/internet-stack-helper.cc src/helper/internet-stack-helper.h src/helper/point-to-point-helper.cc src/helper/point-to-point-helper.h src/helper/trace-helper.cc src/helper/trace-helper.h src/helper/wifi-helper.cc src/helper/yans-wifi-helper.cc src/helper/yans-wifi-helper.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/3dbc035a9ee4


---- python-scan
user: Craig Dowell <craigdo at ee.washington.edu>
files: bindings/python/apidefs/gcc-ILP32/ns3_module_common.py bindings/python/apidefs/gcc-ILP32/ns3_module_core.py bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py bindings/python/apidefs/gcc-ILP32/ns3_module_mobility.py bindings/python/apidefs/gcc-ILP32/ns3_module_node.py bindings/python/apidefs/gcc-LP64/ns3_module_common.py bindings/python/apidefs/gcc-LP64/ns3_module_core.py bindings/python/apidefs/gcc-LP64/ns3_module_helper.py bindings/python/apidefs/gcc-LP64/ns3_module_mobility.py bindings/python/apidefs/gcc-LP64/ns3_module_node.py
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/704ff76c4aa3


---- OutputStreamObject to OutputStreamKeeper
user: Craig Dowell <craigdo at ee.washington.edu>
files: doc/manual/tracing.texi
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/b988174aa30b


---- PcapFileObject to PcapFileWrapper
user: Craig Dowell <craigdo at ee.washington.edu>
files: bindings/python/apidefs/gcc-ILP32/ns3_module_common.py bindings/python/apidefs/gcc-ILP32/ns3_module_core.py bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py bindings/python/apidefs/gcc-LP64/ns3_module_common.py bindings/python/apidefs/gcc-LP64/ns3_module_core.py bindings/python/apidefs/gcc-LP64/ns3_module_helper.py doc/tutorial/tracing.texi examples/tutorial/sixth.cc src/common/pcap-file-object.cc src/common/pcap-file-object.h src/common/pcap-file-test-suite.cc src/common/pcap-file-wrapper.cc src/common/pcap-file-wrapper.h src/common/wscript src/helper/csma-helper.cc src/helper/emu-helper.cc src/helper/internet-stack-helper.cc src/helper/point-to-point-helper.cc src/helper/trace-helper.cc src/helper/trace-helper.h src/helper/yans-wifi-helper.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/e146b9c9c7e7


---- OutputStreamKeeper to OutputStreamWrapper
user: Craig Dowell <craigdo at ee.washington.edu>
files: bindings/python/apidefs/gcc-ILP32/ns3_module_common.py bindings/python/apidefs/gcc-ILP32/ns3_module_core.py bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py bindings/python/apidefs/gcc-LP64/ns3_module_common.py bindings/python/apidefs/gcc-LP64/ns3_module_core.py bindings/python/apidefs/gcc-LP64/ns3_module_helper.py doc/manual/tracing.texi doc/tutorial/tracing.texi examples/routing/dynamic-global-routing.cc examples/routing/mixed-global-routing.cc examples/tutorial/sixth.cc examples/wireless/mixed-wireless.cc src/common/output-stream-keeper.cc src/common/output-stream-keeper.h src/common/output-stream-wrapper.cc src/common/output-stream-wrapper.h src/common/wscript src/helper/csma-helper.cc src/helper/csma-helper.h src/helper/emu-helper.cc src/helper/emu-helper.h src/helper/internet-stack-helper.cc src/helper/internet-stack-helper.h src/helper/point-to-point-helper.cc src/helper/point-to-point-helper.h src/helper/trace-helper.cc src/helper/trace-helper.h src/helper/yans-wifi-helper.cc src/helper/yans-wifi-helper.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/b17ea72acee9


---- branch merge
user: Craig Dowell <craigdo at ee.washington.edu>
files: CHANGES.html src/common/pcap-file.h src/devices/emu/emu-net-device.h src/wscript
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/8b1b404f4335


---- Remove GetTypeId and rescan
user: Craig Dowell <craigdo at ee.washington.edu>
files: bindings/python/apidefs/gcc-ILP32/ns3_module_aodv.py bindings/python/apidefs/gcc-ILP32/ns3_module_common.py bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py bindings/python/apidefs/gcc-ILP32/ns3_module_nix_vector_routing.py bindings/python/apidefs/gcc-LP64/ns3_module_aodv.py bindings/python/apidefs/gcc-LP64/ns3_module_common.py bindings/python/apidefs/gcc-LP64/ns3_module_helper.py bindings/python/apidefs/gcc-LP64/ns3_module_nix_vector_routing.py src/common/output-stream-wrapper.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/18ed08fb4c4a


---- add missing include
user: Craig Dowell <craigdo at ee.washington.edu>
files: src/common/pcap-file-wrapper.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/27b8cb0963bf


---- fix cygwin build break
user: Craig Dowell <craigdo at ee.washington.edu>
files: src/helper/csma-helper.h src/helper/point-to-point-helper.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/1f5b78df0ec6


---- plug possible leak
user: Craig Dowell <craigdo at ee.washington.edu>
files: src/common/output-stream-wrapper.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/c6c169bd257d


---- virtual destructors and missing @end in tutorial
user: Craig Dowell <craigdo at ee.washington.edu>
files: doc/tutorial/tracing.texi
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/6f5ebcd52ced


---- picky, picky compilers
user: Craig Dowell <craigdo at ee.washington.edu>
files: src/helper/trace-helper.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/ccd90fd06731


---- double-check bindings
user: Craig Dowell <craigdo at ee.washington.edu>
files: bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py bindings/python/apidefs/gcc-LP64/ns3_module_helper.py
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/ee5c91bd781a


---- Forgot to force little-endian pcap headers on big-endian machines
user: Craig Dowell <craigdo at ee.washington.edu>
files: src/common/pcap-file.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/f62b76f5c92a


---- merge with HEAD
user: Mathieu Lacage <mathieu.lacage at sophia.inria.fr>
files: src/common/ascii-writer.cc src/common/ascii-writer.h src/common/pcap-writer.cc src/common/pcap-writer.h src/common/propagation-loss-model-test-suite.cc src/devices/mesh/mesh-wifi-interface-mac.cc src/devices/wifi/adhoc-wifi-mac.cc src/devices/wifi/dca-txop.cc src/devices/wifi/dca-txop.h src/devices/wifi/edca-txop-n.cc src/devices/wifi/edca-txop-n.h src/devices/wifi/jakes-propagation-loss-model.cc src/devices/wifi/jakes-propagation-loss-model.h src/devices/wifi/mac-low.cc src/devices/wifi/mac-low.h src/devices/wifi/nqap-wifi-mac.cc src/devices/wifi/nqsta-wifi-mac.cc src/devices/wifi/propagation-delay-model.cc src/devices/wifi/propagation-delay-model.h src/devices/wifi/propagation-loss-model-test-suite.cc src/devices/wifi/propagation-loss-model.cc src/devices/wifi/propagation-loss-model.h src/devices/wifi/qadhoc-wifi-mac.cc src/devices/wifi/qap-wifi-mac.cc src/devices/wifi/qsta-wifi-mac.cc src/devices/wifi/wscript src/test/ns3wifi/wifi-interference-test-suite.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/a2127017ecb4


---- change airtime metric to work with new wifi remote station manager
user: Kirill Andreev <andreev at iitp.ru>
files: src/devices/mesh/dot11s/airtime-metric.cc src/devices/mesh/dot11s/airtime-metric.h src/devices/mesh/dot11s/hwmp-protocol.cc src/devices/mesh/mesh-wifi-interface-mac.cc src/devices/mesh/mesh-wifi-interface-mac.h src/devices/wifi/wifi-remote-station-manager.cc src/devices/wifi/wifi-remote-station-manager.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/c21754b56036


---- fix typo
user: Mathieu Lacage <mathieu.lacage at sophia.inria.fr>
files: src/devices/wifi/wifi-remote-station-manager.cc src/devices/wifi/wifi-remote-station-manager.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/a971811bb21a


---- tweak slightly
user: Mathieu Lacage <mathieu.lacage at sophia.inria.fr>
files: src/devices/mesh/dot11s/airtime-metric.cc src/devices/wifi/wifi-net-device.h src/devices/wifi/wifi-remote-station-manager.cc src/devices/wifi/wifi-remote-station-manager.h
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/6a25c600c450


---- Wifi:Fixes in coding style
user: Kirill Andreev <andreev at iitp.ru>
files: src/devices/wifi/adhoc-wifi-mac.cc src/devices/wifi/dcf-manager.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/d9163d8a18c5


---- merge with HEAD
user: Mathieu Lacage <mathieu.lacage at sophia.inria.fr>
files: src/devices/wifi/adhoc-wifi-mac.cc
url: http://code.nsnam.org/mathieu/ns-3-bug602/rev/75b3002b9b4d