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

(-)a/src/internet-stack/internet-stack.cc (-2 / +10 lines)
 Lines 30-37    Link Here 
30 
#include "udp-socket-factory-impl.h"
 30 
#include "udp-socket-factory-impl.h"
31 
#include "tcp-socket-factory-impl.h"
 31 
#include "tcp-socket-factory-impl.h"
32 
#include "ipv4-impl.h"
 32 
#include "ipv4-impl.h"
33 
#ifdef NETWORK_SIMULATION_CRADLE
33 
#include "nsc-tcp-socket-factory-impl.h"
 34 
#include "nsc-tcp-socket-factory-impl.h"
34 
#include "nsc-tcp-l4-protocol.h"
 35 
#include "nsc-tcp-l4-protocol.h"
36 
#endif
35 

          37
          

        

        

          36
          
namespace ns3 {

          38
          
namespace ns3 {

        

        

          37
          

          39
          

        

  

    

    

       Lines 87-93
      AddInternetStack (Ptr<Node> node) 
    
  Link Here 
    

  

        

          87
          
  AddTcpStack (node);

          89
          
  AddTcpStack (node);

        

        

          88
          
}

          90
          
}

        

        

          89
          

          91
          

        

          
            

              90
              


              92
              
#ifdef NETWORK_SIMULATION_CRADLE

            

        

          91
          
static void

          93
          
static void

        

        

          92
          
AddNscStack(Ptr<Node> node, const std::string &soname)

          94
          
AddNscStack(Ptr<Node> node, const std::string &soname)

        

        

          93
          
{

          95
          
{

        

  

    

    

       Lines 111-115
      AddNscInternetStack (Ptr<Node> node, con 
    
  Link Here 
    

  

        

          111
          
  AddUdpStack (node);

          113
          
  AddUdpStack (node);

        

        

          112
          
  AddNscStack (node, soname);

          114
          
  AddNscStack (node, soname);

        

        

          113
          
}

          115
          
}

        

          
            

              114
              


              116
              
#else

            

            

              
              

              117
              
void

            

            


              118
              
AddNscInternetStack (Ptr<Node> node, const std::string &soname)

            

            


              119
              
{

            

            


              120
              
  NS_FATAL_ERROR ("NSC Not enabled on this platform.");

            

            


              121
              
}

            

            


              122
              
#endif

            

        

          115
          
}//namespace ns3

          123
          
}//namespace ns3

        



(-)a/src/internet-stack/wscript
      (-5 / +5 lines)




  

    

    

       Lines 135-146
      def build(bld): 
    
  Link Here 
    

  

        

          135
          
        'pending-data.cc',

          135
          
        'pending-data.cc',

        

        

          136
          
        'sequence-number.cc',

          136
          
        'sequence-number.cc',

        

        

          137
          
        'rtt-estimator.cc',

          137
          
        'rtt-estimator.cc',

        

            

              138
              
        'nsc-tcp-socket-impl.cc',

              
              
            

            

              139
              
        'nsc-tcp-l4-protocol.cc',

            

            

              140
              
        'nsc-tcp-socket-factory-impl.cc',

            

            

              141
              
        'nsc-sysctl.cc',

            

        

          142
          
        ]

          138
          
        ]

        

            

              143
              
    obj.uselib = 'DL'

              
              
            

        

          144
          

          139
          

        

        

          145
          
    headers = bld.create_obj('ns3header')

          140
          
    headers = bld.create_obj('ns3header')

        

        

          146
          
    headers.module = 'internet-stack'

          141
          
    headers.module = 'internet-stack'

        

  

    

    

       Lines 155-159
      def build(bld): 
    
  Link Here 
    

  

        

          155
          
        ]

          150
          
        ]

        

        

          156
          

          151
          

        

        

          157
          
    if bld.env()['NSC_ENABLED']:        

          152
          
    if bld.env()['NSC_ENABLED']:        

        

            

              
              
              153
              
        obj.source.append ('nsc-tcp-socket-impl.cc')

            

            

              154
              
        obj.source.append ('nsc-tcp-l4-protocol.cc')

            

            

              155
              
        obj.source.append ('nsc-tcp-socket-factory-impl.cc')

            

            

              156
              
        obj.source.append ('nsc-sysctl.cc')

            

            

              157
              
        obj.uselib = 'DL'

            

        

          158
          
        builddir = os.path.abspath(os.path.join(bld.env()['NS3_BUILDDIR'], bld.env ().variant()))

          158
          
        builddir = os.path.abspath(os.path.join(bld.env()['NS3_BUILDDIR'], bld.env ().variant()))

        

        

          159
          
        NscBuildTask(builddir)

          159
          
        NscBuildTask(builddir)

        






  

  Return to bug 316