Skip to content
This repository has been archived by the owner on Apr 10, 2020. It is now read-only.

Commit

Permalink
Fixed small bugs with "idlepc get" command and Ethernet switch auto port
Browse files Browse the repository at this point in the history
allocation. Dynamips 0.2.10 by default on OSX.
  • Loading branch information
grossmj committed Oct 23, 2013
1 parent 82dd17d commit 19bd43d
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 3 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,17 @@
# GNS3 - CHANGELOG #
####################

=== v0.8.6 22.10.2013 ===

* Windows version now supports VirtualBox 4.3 and still works with 4.2.x
* Fixed the broken snapshot feature.
* Host devices don't automatically add tap interfaces in the generic Ethernet NIO list anymore.
* Auto open for instructions files when opening the topology via the command line, a file explorer or a drag & drop on the workspace.
* Modified the default Etherswitch configuration (renamed some macros + added vtp file nvram:vlan.dat)
* Fixed small bugs with "idlepc get" command and Ethernet switch auto port allocation.
* Added wpcap.dll to the Windows standalone versions.
* Dynamips 0.2.10 is now the default on OSX.

=== v0.8.5 09.09.2013 ===

* Dynamips 0.2.10 is included in our Windows all-in-one package and OSX DMG, this version allows Crypto keys to be saved and it fixes a bug that prevented startup-configs to be loaded by c3745 IOS. Hooray!
Expand Down
4 changes: 2 additions & 2 deletions src/GNS3/Config/Defaults.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
DYNAMIPS_DEFAULT_PATH = unicode('dynamips.exe')
elif sys.platform.startswith('darwin'):
if hasattr(sys, "frozen"):
DYNAMIPS_DEFAULT_PATH = os.getcwdu() + os.sep + '../Resources/dynamips-0.2.8-RC3-community-OSX.intel64.bin'
DYNAMIPS_DEFAULT_PATH = os.getcwdu() + os.sep + '../Resources/dynamips-0.2.10-OSX.intel64.bin'
else:
DYNAMIPS_DEFAULT_PATH = os.getcwdu() + os.sep + 'dynamips-0.2.8-RC3-community-OSX.intel64.bin'
DYNAMIPS_DEFAULT_PATH = os.getcwdu() + os.sep + 'dynamips-0.2.10-OSX.intel64.bin'
else:
DYNAMIPS_DEFAULT_PATH = unicode('dynamips')

Expand Down
2 changes: 1 addition & 1 deletion src/GNS3/Console.py
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ def do_idlepc(self, args):
device = params[0]
if command == 'get':
current_idlepc = self.dynagen.devices[device].idlepc
if len(params) < 2 or params[1] != 'force' and current_idlepc != None:
if (len(params) < 2 or params[1] != 'force') and current_idlepc:
print translate("Console", "%s already has an idlepc value applied (%s).") % (device, current_idlepc)
return

Expand Down
2 changes: 2 additions & 0 deletions src/GNS3/Node/ETHSW.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@ def autoAllocateFreePort(self):
self.config['vlans'][1] = []
else:
port = max(self.config['ports']) + 1
if not self.config['vlans'].has_key(1):
self.config['vlans'][1] = []
self.config['ports'][port] = 'access'
self.config['vlans'][1].append(port)

Expand Down

0 comments on commit 19bd43d

Please sign in to comment.