Attachment #659 for bug #720

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




      //
      // Execute the socket creation process image.
      //
      status = ::execlp ("emu-sock-creator", 
                        "emu-sock-creator",                             // argv[0] (filename)
                        oss.str ().c_str (),                            // argv[1] (-p<path?
                        (char *)NULL);

      //
      // If the execlp successfully completes, it never returns.  If it returns it failed or the OS is
      // broken.  In either case, we bail.
      //
      NS_FATAL_ERROR ("EmuNetDevice::CreateSocket(): Back from execlp(), errno = " << ::strerror (errno));
    }
  else
    {

    }
}

std::string
EmuNetDevice::FindCreator (std::string creatorName)
{
  NS_LOG_FUNCTION (creatorName);

  std::list<std::string> locations;

  // The path to the bits if we're sitting there with them
  locations.push_back ("./");
  locations.push_back ("./");

  // The path to the bits if we're sitting in the root of the repo
  locations.push_back ("./build/optimized/src/devices/emu/");
  locations.push_back ("./build/debug/src/devices/emu/");

  // if at the level of src (or build)
  locations.push_back ("../build/optimized/src/devices/emu/");
  locations.push_back ("../build/debug/src/devices/emu/");

  // src/devices (or build/debug)
  locations.push_back ("../../build/optimized/src/devices/emu/");
  locations.push_back ("../../build/debug/src/devices/emu/");

  // src/devices/emu (or build/debug/examples)
  locations.push_back ("../../../build/optimized/src/devices/emu/");
  locations.push_back ("../../../build/debug/src/devices/emu/");

  for (std::list<std::string>::const_iterator i = locations.begin (); i != locations.end (); ++i)
    {
      struct stat st;

      if (::stat ((*i + creatorName).c_str (), &st) == 0)
	{
          NS_LOG_INFO ("Found Creator " << *i + creatorName);                  
	  return *i + creatorName;
	}
    }

  NS_FATAL_ERROR ("EmuNetDevice::FindCreator(): Couldn't find creator");
  return ""; // quiet compiler
}

void
EmuNetDevice::StopDevice (void)
{

(-)a/src/devices/emu/emu-net-device.h (-5 lines)

Lines 188-198	Link Here

188

  void CreateSocket (void);

188

  void CreateSocket (void);

189

190

/**

190

/**

191

   * Figure out where the raw socket creation process lives on the system.

192

*/

193

  std::string FindCreator (std::string creatorName);

194

195

/**

196

   * Get a copy of the attached Queue.

191

   * Get a copy of the attached Queue.

197

192

198

   * This method is provided for any derived class that may need to get

193

   * This method is provided for any derived class that may need to get

(-)a/src/devices/emu/wscript (+4 lines)

Lines 1-5	Link Here

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

import os.path

def configure(conf):

def configure(conf):

    if conf.env['ENABLE_THREADING']:

    if conf.env['ENABLE_THREADING']:

        conf.env['ENABLE_EMU'] = conf.check(header_name='netpacket/packet.h',

        conf.env['ENABLE_EMU'] = conf.check(header_name='netpacket/packet.h',

Lines 38-41	Link Here

            'emu-encode-decode.cc',

            'emu-encode-decode.cc',

        emucreatordir = os.path.abspath(os.path.join(bld.bdir, env.variant(), "src/devices/emu"))

        env.append_value('PATH', emucreatordir)




      //
      // Execute the socket creation process image.
      //
      status = ::execlp ("tap-creator", 
                        "tap-creator",                        // argv[0] (filename)
                        ossDeviceName.str ().c_str (),        // argv[1] (-d<device name>)
                        ossGateway.str ().c_str (),           // argv[2] (-g<gateway>)
                        ossIp.str ().c_str (),                // argv[3] (-i<IP address>)

                        (char *)NULL);

      //
      // If the execlp successfully completes, it never returns.  If it returns it failed or the OS is
      // broken.  In either case, we bail.
      //
      NS_FATAL_ERROR ("TapBridge::CreateTap(): Back from execlp(), errno = " << ::strerror (errno));
    }
  else
    {

    }
}

std::string
TapBridge::FindCreator (std::string creatorName)
{
  NS_LOG_FUNCTION (creatorName);

  std::list<std::string> locations;

  // The path to the bits if we're sitting in the root of the repo
  locations.push_back ("./build/optimized/src/devices/tap-bridge/");
  locations.push_back ("./build/debug/src/devices/tap-bridge/");

  // if in src
  locations.push_back ("../build/optimized/src/devices/tap-bridge/");
  locations.push_back ("../build/debug/src/devices/tap-bridge/");

  // if in src/devices
  locations.push_back ("../../build/optimized/src/devices/tap-bridge/");
  locations.push_back ("../../build/debug/src/devices/tap-bridge/");

  // if in src/devices/tap-bridge
  locations.push_back ("../../../build/optimized/src/devices/tap-bridge/");
  locations.push_back ("../../../build/debug/src/devices/tap-bridge/");

  for (std::list<std::string>::const_iterator i = locations.begin (); i != locations.end (); ++i)
    {
      struct stat st;

      if (::stat ((*i + creatorName).c_str (), &st) == 0)
	{
          NS_LOG_INFO ("Found Creator " << *i + creatorName);                  
	  return *i + creatorName;
	}
    }

  NS_FATAL_ERROR ("TapBridge::FindCreator(): Couldn't find creator");
  return ""; // quiet compiler
}

void
TapBridge::ReadThread (void)
{




  /**
   * \internal
   *
   * Figure out where the tap creation program lives on the system.
   *
   * \param creatorName The name of the program used to create the Tap.
   * \returns A path name to use when you want to create a Tap.
   */
  std::string FindCreator (std::string creatorName);

  /**
   * \internal
   *
   * Spin up the device
   */
  void StartTapDevice (void);

(-)a/src/devices/tap-bridge/wscript (+4 lines)

Lines 1-5	Link Here

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

import os.path

def configure(conf):

def configure(conf):

    if conf.env['ENABLE_THREADING']:

    if conf.env['ENABLE_THREADING']:

        conf.env['ENABLE_TAP'] = conf.check(header_name='linux/if_tun.h',

        conf.env['ENABLE_TAP'] = conf.check(header_name='linux/if_tun.h',

Lines 40-43	Link Here

                'tap-encode-decode.cc',

                'tap-encode-decode.cc',

        tapcreatordir = os.path.abspath(os.path.join(bld.bdir, env.variant(), "src/devices/tap-bridge"))

        env.append_value('PATH', tapcreatordir)

(-)a/wutils.py (+2 lines)

Lines 112-117	Link Here

112

    else:

112

    else:

113

        proc_env['PYTHONPATH'] = pymoddir

113

        proc_env['PYTHONPATH'] = pymoddir

114

115

    proc_env['PATH'] = os.pathsep.join(list(env['PATH']) + [proc_env['PATH']])

116

115

    return proc_env

117

    return proc_env

116

118

117

def run_argv(argv, env, os_env=None, cwd=None, force_no_valgrind=False):

119

def run_argv(argv, env, os_env=None, cwd=None, force_no_valgrind=False):

Return to bug 720