NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-04 14:31:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,347 Commits 6 Branches 229 Tags
c63aad8eca00bca2ec48fcb667bbdfd80a22a7ab
Commit Graph
3465 Commits
Author SHA1 Message Date
Julien Duponchelle 07395c9cf2 Kill ghosts process at startup (Dynamips, VPCS, Ubridge) 
This is done only if you lock by pid to avoid killing process
of another server.

Fix #581
 2016-06-20 09:55:59 +02:00
Julien Duponchelle 3132d51694 Do not reload a project if project is already opened 
Ref https://github.com/GNS3/gns3-gui/issues/1251
 2016-06-17 17:50:06 +02:00
Julien Duponchelle 4783691c87 Drop /upload 
Fix #552
 2016-06-17 17:25:59 +02:00
Julien Duponchelle 49eb7d8ce7 Atomic save of the .gns3 
Fix #579
 2016-06-17 17:13:36 +02:00
Julien Duponchelle 627ebdb322 Fix issue with reloading a topologie with dynamips 2016-06-17 15:56:35 +02:00
grossmj ba05ca029e Fixes conflicting argument vs config file option. 2016-06-16 12:03:48 -06:00
grossmj a289c9c685 Change option from udp_discovery to server_discovery. 2016-06-16 11:27:10 -06:00
grossmj da58a65075 Merge remote-tracking branch 'origin/2.0' into 2.0 
Conflicts:
	gns3server/web/web_server.py
 2016-06-16 11:19:03 -06:00
grossmj 32907ccac3 Use a classic thread for UDP server discovery. Closes #545. 2016-06-16 11:17:12 -06:00
Julien Duponchelle c66ef9d218 Support filename for project in the controller 2016-06-16 16:57:54 +02:00
Julien Duponchelle 411ca56b94 Fix Exception when closing local server (started by GUI) 
Fix #578
 2016-06-16 15:00:32 +02:00
Julien Duponchelle 45d7e09cbd Add a settings in command line and config file to enable discovery 2016-06-16 09:53:32 +02:00
Julien Duponchelle f45901e861 Merge branch '2.0' of github.com:GNS3/gns3-server into 2.0 2016-06-16 09:19:48 +02:00
grossmj 56051b1142 UDP server discovery. Ref #545. 2016-06-15 17:37:43 -06:00
Julien Duponchelle 2a1c5cfd9c Merge branch '1.5' into 2.0 2016-06-15 19:14:03 +02:00
Julien Duponchelle 38a41a1cfd 1.5.0dev6 2016-06-15 18:53:04 +02:00
Julien Duponchelle 8fbfae6a98 1.5.0rc2 2016-06-15 18:51:31 +02:00
Julien Duponchelle aa5988788d Strip user from compute in topology and return project filename 2016-06-15 18:22:11 +02:00
Julien Duponchelle c4d619ce3c API for loading a project from a .gns3 2016-06-15 16:43:03 +02:00
Julien Duponchelle 6d36429870 Reload a topology work 2016-06-15 16:26:16 +02:00
Julien Duponchelle 524f8991bc Project status (opened / closed) 2016-06-15 16:26:16 +02:00
Julien Duponchelle 0569480953 Create link when loading topology on controller 2016-06-15 16:26:16 +02:00
Julien Duponchelle 742243e9df Method for reloading a topology (not bind to an api handler) 
Ref https://github.com/GNS3/gns3-gui/issues/1243
 2016-06-15 16:26:16 +02:00
Julien Duponchelle 5ca9becdf9 Do not crash if we can not cleanup a temporay project 
Fix #576
 2016-06-15 11:08:31 +02:00
Julien Duponchelle bb0db7846f Fix black screen with Qt app in Docker container 
Fix #556
 2016-06-15 11:01:03 +02:00
Julien Duponchelle e82862c69f Detect when command in the container exit 
Fix #571
 2016-06-15 10:32:38 +02:00
Julien Duponchelle d98a7aac19 Docker when exit aux console restart it 
Ref #571
 2016-06-15 10:21:30 +02:00
Julien Duponchelle 43a3584a5c Pass by default the environment variable container=docker 
Fix #573
 2016-06-15 10:12:32 +02:00
Julien Duponchelle 049c348709 Fix busybox binary location 
Fix #570
 2016-06-14 23:09:28 +02:00
Jeremy Grossmann 3aea16c527 Merge pull request #568 from GNS3/watch_dynamips_change 
Watch for dynamips rom & nvram change
 2016-06-14 11:58:42 -06:00
Julien Duponchelle d815d25bdf Write .gns3 on server 
Ref https://github.com/GNS3/gns3-gui/issues/1243
 2016-06-14 12:04:23 +02:00
Julien Duponchelle 3255be0ae2 Drop the commit system 
Ref https://github.com/GNS3/gns3-gui/issues/1243
 2016-06-14 10:16:33 +02:00
Julien Duponchelle 52f852bc6d Merge branch '1.5' into 2.0 2016-06-14 09:50:07 +02:00
grossmj 7beadd03a6 Merge remote-tracking branch 'origin/2.0' into 2.0 2016-06-13 15:07:40 -06:00
grossmj 31f4b52631 Add zeroconf. Ref #545. 2016-06-13 15:07:20 -06:00
Julien Duponchelle 343f2b574d Avoid loosing console port for Docker 
Fix #569
 2016-06-13 21:20:29 +02:00
Julien Duponchelle 016c3e515b Workaround a crash in x11vnc 
Fix? #569
 2016-06-13 20:12:42 +02:00
Julien Duponchelle 70431a5fa6 Send update of properties from controller only for controller stuffs 
Fix #566
 2016-06-13 18:46:30 +02:00
Julien Duponchelle 4f03c3011e Delete volume when dropping the container 
Fix #567
 2016-06-13 17:39:04 +02:00
Julien Duponchelle e183e7da27 Catch connection reset in ioucon 2016-06-13 16:28:26 +02:00
Julien Duponchelle 67c04a7855 Watch for dynamips rom & nvram change 
This monitor for change the file from dynamips by computing a
hash of the watched file.

The way dynamips work prevent the update of the modification time.

We can improve that by using native system for watching file but:
* it's require dependencies specific for each OS
* dependencies use C extensions
* this is only a backup if your router is cleanly shutdown we export
stuff
 2016-06-13 15:57:36 +02:00
grossmj 2bde02d459 Controller side unique node name allocation. Ref #541. 2016-06-11 17:31:30 -06:00
Jeremy Grossmann 6cd136b423 Merge pull request #565 from GNS3/watch_iou 
Monitor IOU NVRAM changes.
 2016-06-10 22:33:56 -06:00
grossmj b079cf9546 Fixes typo. 2016-06-10 22:33:07 -06:00
grossmj c3c5eb533f Detect Wifi adapters on OSX. Fixes #549. 2016-06-10 12:36:41 -06:00
Julien Duponchelle 69334665d2 Monitor IOU nvram for change 
With the save as you go we need to save the startup config
when a change appear instead of the old commit system.
 2016-06-10 18:26:01 +02:00
Julien Duponchelle 182a979e71 Generic class for watch file change 2016-06-10 17:51:19 +02:00
Julien Duponchelle 1c6de3ff39 Fix an error when updating IOU node 2016-06-10 16:39:54 +02:00
Julien Duponchelle 2a5cf18d20 When using pool raise again exception received 2016-06-10 14:42:46 +02:00
grossmj e46171b826 Merge branch '1.5' into 2.0 
Conflicts:
	gns3server/handlers/api/compute/iou_handler.py
 2016-06-09 19:35:59 -06:00