1.1 --- a/examples/csma-broadcast.cc	Mon May 04 20:21:37 2009 +0200
     1.2 +++ b/examples/csma-broadcast.cc	Mon May 04 20:22:08 2009 +0200
     1.3 @@ -111,7 +111,7 @@
     1.4    // and can be read by the "tcpdump -tt -r" command 
     1.5    CsmaHelper::EnablePcapAll ("csma-broadcast", false);
     1.6    std::ofstream ascii;
     1.7 -  ascii.open ("csma-broadcast.tr");
     1.8 +  ascii.open ("csma-broadcast.tr", std::ios_base::binary | std::ios_base::out);
     1.9    CsmaHelper::EnableAsciiAll (ascii);
    1.10  
    1.11    NS_LOG_INFO ("Run Simulation.");

     2.1 --- a/examples/csma-multicast.cc	Mon May 04 20:21:37 2009 +0200
     2.2 +++ b/examples/csma-multicast.cc	Mon May 04 20:22:08 2009 +0200
     2.3 @@ -166,7 +166,7 @@
     2.4    // Ascii trace output will be sent to the file "csma-multicast.tr"
     2.5    //
     2.6    std::ofstream ascii;
     2.7 -  ascii.open ("csma-multicast.tr");
     2.8 +  ascii.open ("csma-multicast.tr",std::ios_base::binary | std::ios_base::out);
     2.9    CsmaHelper::EnableAsciiAll (ascii);
    2.10  
    2.11    // Also configure some tcpdump traces; each interface will be traced.

     3.1 --- a/examples/csma-one-subnet.cc	Mon May 04 20:21:37 2009 +0200
     3.2 +++ b/examples/csma-one-subnet.cc	Mon May 04 20:22:08 2009 +0200
     3.3 @@ -120,7 +120,7 @@
     3.4  //
     3.5    NS_LOG_INFO ("Configure Tracing.");
     3.6    std::ofstream ascii;
     3.7 -  ascii.open ("csma-one-subnet.tr");
     3.8 +  ascii.open ("csma-one-subnet.tr", std::ios_base::binary | std::ios_base::out);
     3.9    CsmaHelper::EnableAsciiAll (ascii);
    3.10  //
    3.11  // Also configure some tcpdump traces; each interface will be traced.

     4.1 --- a/examples/csma-packet-socket.cc	Mon May 04 20:21:37 2009 +0200
     4.2 +++ b/examples/csma-packet-socket.cc	Mon May 04 20:22:08 2009 +0200
     4.3 @@ -60,7 +60,7 @@
     4.4    CommandLine cmd;
     4.5    cmd.Parse (argc, argv);
     4.6  
     4.7 -  g_os.open ("csma-packet-socket-sink.tr");
     4.8 +  g_os.open ("csma-packet-socket-sink.tr",std::ios_base::binary | std::ios_base::out);
     4.9  
    4.10    // Here, we will explicitly create four nodes.
    4.11    NS_LOG_INFO ("Create nodes.");
    4.12 @@ -117,7 +117,7 @@
    4.13    // Trace output will be sent to the csma-packet-socket.tr file
    4.14    NS_LOG_INFO ("Configure Tracing.");
    4.15    std::ofstream os;
    4.16 -  os.open ("csma-packet-socket.tr");
    4.17 +  os.open ("csma-packet-socket.tr", std::ios_base::binary | std::ios_base::out);
    4.18    csma.EnableAsciiAll (os);
    4.19  
    4.20    NS_LOG_INFO ("Run Simulation.");

     5.1 --- a/examples/dynamic-global-routing.cc	Mon May 04 20:21:37 2009 +0200
     5.2 +++ b/examples/dynamic-global-routing.cc	Mon May 04 20:22:08 2009 +0200
     5.3 @@ -190,7 +190,7 @@
     5.4  
     5.5  
     5.6    std::ofstream ascii;
     5.7 -  ascii.open ("dynamic-global-routing.tr");
     5.8 +  ascii.open ("dynamic-global-routing.tr", std::ios_base::binary | std::ios_base::out);
     5.9    PointToPointHelper::EnablePcapAll ("dynamic-global-routing");
    5.10    PointToPointHelper::EnableAsciiAll (ascii);
    5.11    CsmaHelper::EnablePcapAll ("dynamic-global-routing", false);

     6.1 --- a/examples/global-routing-slash32.cc	Mon May 04 20:21:37 2009 +0200
     6.2 +++ b/examples/global-routing-slash32.cc	Mon May 04 20:22:08 2009 +0200
     6.3 @@ -121,7 +121,7 @@
     6.4    apps.Stop (Seconds (10.0));
     6.5  
     6.6    std::ofstream ascii;
     6.7 -  ascii.open ("global-routing-slash32.tr");
     6.8 +  ascii.open ("global-routing-slash32.tr", std::ios_base::binary | std::ios_base::out);
     6.9    PointToPointHelper::EnablePcapAll ("global-routing-slash32");
    6.10    PointToPointHelper::EnableAsciiAll (ascii);
    6.11  

     7.1 --- a/src/devices/wifi/edca-txop-n.cc	Mon May 04 20:21:37 2009 +0200
     7.2 +++ b/src/devices/wifi/edca-txop-n.cc	Mon May 04 20:22:08 2009 +0200
     7.3 @@ -659,27 +659,31 @@
     7.4  Mac48Address
     7.5  EdcaTxopN::MapSrcAddressForAggregation (WifiMacHeader const &hdr)
     7.6  {
     7.7 +  Mac48Address retval;
     7.8    if (m_typeOfStation == STA || m_typeOfStation == ADHOC_STA)
     7.9      {
    7.10 -      return hdr.GetAddr2 ();
    7.11 +      retval = hdr.GetAddr2 ();
    7.12      }
    7.13    else
    7.14      {
    7.15 -      return hdr.GetAddr3 ();
    7.16 +      retval = hdr.GetAddr3 ();
    7.17      }
    7.18 +  return retval;
    7.19  }
    7.20  
    7.21  Mac48Address
    7.22  EdcaTxopN::MapDestAddressForAggregation (WifiMacHeader const &hdr)
    7.23  {
    7.24 +  Mac48Address retval;
    7.25    if (m_typeOfStation == AP || m_typeOfStation == ADHOC_STA)
    7.26      {
    7.27 -      return hdr.GetAddr1 ();
    7.28 +      retval = hdr.GetAddr1 ();
    7.29      }
    7.30    else
    7.31      {
    7.32 -      return hdr.GetAddr3 ();
    7.33 +      retval = hdr.GetAddr3 ();
    7.34      }
    7.35 +  return retval;
    7.36  }
    7.37  
    7.38  void