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

(-)a/src/point-to-point-layout/model/point-to-point-grid.cc (-1 / +3 lines)
 Lines 16-21    Link Here 
16 
 * Author: Josh Pelkey <jpelkey@gatech.edu>
 16 
 * Author: Josh Pelkey <jpelkey@gatech.edu>
17 
 */
 17 
 */
18 

          18
          

        

            

              
              
              19
              
// Implement an object to create a grid topology.

            

            

              20
              

            

        

          19
          
#include "ns3/point-to-point-grid.h"

          21
          
#include "ns3/point-to-point-grid.h"

        

        

          20
          
#include "ns3/internet-stack-helper.h"

          22
          
#include "ns3/internet-stack-helper.h"

        

        

          21
          
#include "ns3/point-to-point-helper.h"

          23
          
#include "ns3/point-to-point-helper.h"

        

  

    

    

       Lines 270-276
       
    
  Link Here 
    

  

        

          270
          
  if (row > m_nodes.size () - 1 ||

          272
          
  if (row > m_nodes.size () - 1 ||

        

        

          271
          
      col > m_nodes.at (row).GetN () - 1)

          273
          
      col > m_nodes.at (row).GetN () - 1)

        

        

          272
          
    {

          274
          
    {

        

          
            

              273
              
      NS_FATAL_ERROR ("Index out of bounds in PointToPointGridHelper::GetIpv4Address.");


              275
              
      NS_FATAL_ERROR ("Index out of bounds in PointToPointGridHelper::GetIpv6Address.");

            

        

          274
          
    }

          276
          
    }

        

        

          275
          

          277
          

        

        

          276
          
  // Right now this just gets one of the addresses of the

          278
          
  // Right now this just gets one of the addresses of the

        



(-)a/src/point-to-point-layout/model/point-to-point-grid.h
      (-1 / +3 lines)




  

    

    

       Lines 16-21
       
    
  Link Here 
    

  

        

          16
          
 * Author: Josh Pelkey <jpelkey@gatech.edu>

          16
          
 * Author: Josh Pelkey <jpelkey@gatech.edu>

        

        

          17
          
 */

          17
          
 */

        

        

          18
          

          18
          

        

            

              
              
              19
              
// Define an object to create a grid topology.

            

            

              20
              

            

        

          19
          
#ifndef POINT_TO_POINT_GRID_HELPER_H

          21
          
#ifndef POINT_TO_POINT_GRID_HELPER_H

        

        

          20
          
#define POINT_TO_POINT_GRID_HELPER_H

          22
          
#define POINT_TO_POINT_GRID_HELPER_H

        

        

          21
          

          23
          

        

  

    

    

       Lines 117-123
       
    
  Link Here 
    

  

        

          117
          
   *              to all of the row interfaces in the grid

          119
          
   *              to all of the row interfaces in the grid

        

        

          118
          
   *

          120
          
   *

        

        

          119
          
   * \param colIp the Ipv4AddressHelper used to assign Ipv4 addresses 

          121
          
   * \param colIp the Ipv4AddressHelper used to assign Ipv4 addresses 

        

          
            

              120
              
   *              to all of the row interfaces in the grid


              122
              
   *              to all of the column interfaces in the grid

            

        

          121
          
   */

          123
          
   */

        

        

          122
          
  void AssignIpv4Addresses (Ipv4AddressHelper rowIp, Ipv4AddressHelper colIp);

          124
          
  void AssignIpv4Addresses (Ipv4AddressHelper rowIp, Ipv4AddressHelper colIp);

        

        

          123
          

          125
          

        






  

  Return to bug 2811