arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-24 17:28:08 +00:00
Code Issues Releases Wiki Activity

Fixes packet capture when spaces are in the capture file path.

Browse Source
This commit is contained in:
grossmj 2014-07-18 22:43:01 -06:00
parent 7ff218a5fc
commit ae0feb8c9c
3 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gns3server/modules/dynamips/nodes/router.py
View File

@ -1579,7 +1579,7 @@ class Router(object):
raise DynamipsError("Could not create captures directory {}".format(e)) raise DynamipsError("Could not create captures directory {}".format(e))
nio.bind_filter("both", "capture") nio.bind_filter("both", "capture")
nio.setup_filter("both", "{} {}".format(data_link_type, output_file)) nio.setup_filter("both", '{} "{}"'.format(data_link_type, output_file))
log.info("router {name} [id={id}]: starting packet capture on port {slot_id}/{port_id}".format(name=self._name, log.info("router {name} [id={id}]: starting packet capture on port {slot_id}/{port_id}".format(name=self._name,
id=self._id, id=self._id,

1
gns3server/modules/virtualbox/__init__.py
View File

@ -277,7 +277,6 @@ class VirtualBox(IModule):
try: try:
if not self._vboxwrapper and not self._vboxmanager: if not self._vboxwrapper and not self._vboxmanager:
print("START SERVICE")
self._start_vbox_service() self._start_vbox_service()
vbox_instance = VirtualBoxVM(self._vboxwrapper, vbox_instance = VirtualBoxVM(self._vboxwrapper,

2
gns3server/modules/virtualbox/virtualbox_vm.py
View File

@ -517,6 +517,8 @@ class VirtualBoxVM(object):
self._serial_pipe.close() self._serial_pipe.close()
self._serial_pipe = None self._serial_pipe = None
if self._machine.state >= self._vboxmanager.constants.MachineState_FirstOnline and \
self._machine.state <= self._vboxmanager.constants.MachineState_LastOnline:
try: try:
if sys.platform.startswith('win') and "VBOX_INSTALL_PATH" in os.environ: if sys.platform.startswith('win') and "VBOX_INSTALL_PATH" in os.environ:
# work around VirtualBox bug #9239 # work around VirtualBox bug #9239