1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-25 01:38:08 +00:00
Commit Graph

109 Commits

Author SHA1 Message Date
Julien Duponchelle
72fe5d3489
Merge branch 'master' into 2.0 2016-08-29 14:08:23 +02:00
Julien Duponchelle
0eafb6f06c
Fix a lock issue with some virtualbox vm
Fix  https://github.com/GNS3/gns3-gui/issues/1444
2016-08-29 10:51:50 +02:00
Julien Duponchelle
c01bb2436e
Return netmask with list of interfaces 2016-08-25 17:22:22 +02:00
Julien Duponchelle
0226bb663f
Fix start all node is broken
Fix #633
2016-08-19 11:32:11 +02:00
Julien Duponchelle
fa76b89731
Fix websocket error when closing the server
Fix #634
2016-08-19 11:20:56 +02:00
Julien Duponchelle
f0fad5289c
Correclty cleanup packet capture objects when closing server
Fix #592
2016-08-19 11:05:54 +02:00
Julien Duponchelle
3e3e7b93ae
Merge branch 'master' into 2.0 2016-08-18 21:34:52 +02:00
Julien Duponchelle
1c2a56ee8e
Filter images starting by . 2016-08-18 19:29:09 +02:00
Julien Duponchelle
7777407c4b
Filter md5sum files from the list of images 2016-08-18 19:26:17 +02:00
Julien Duponchelle
5de27a95f9
Center label when hostname change
Fix #1404
2016-08-17 17:12:23 +02:00
Julien Duponchelle
938696032c
Fix tests 2016-08-17 11:05:16 +02:00
Julien Duponchelle
4d8cf8460e
Function for computing size of symbols 2016-08-17 10:49:31 +02:00
Athmane Madjoudj
db95cb5c46 Move utils.vmnet to gns3 namespace 2016-07-29 17:53:48 +00:00
Julien Duponchelle
0c3a2c660a
Merge branch 'master' into 2.0 2016-07-28 15:05:21 +02:00
Julien Duponchelle
7d90a73ed2
Catch error when md5sum file is corrupted
Fix #622
2016-07-28 12:35:23 +02:00
Julien Duponchelle
c0abe0edfd
Merge branch 'master' into 2.0 2016-07-13 17:48:18 +02:00
Julien Duponchelle
8be1e77a2e
Optimize storage of drawing
If the drawing contain an image we extract it

Fix #591
2016-07-13 16:18:22 +02:00
Julien Duponchelle
febf0f7839
Fix crash when winpcap is not installed
Ref https://github.com/GNS3/gns3-gui/issues/1380
2016-07-12 13:43:08 +02:00
grossmj
50aa198ba7 Mark interface type upstream. 2016-07-10 14:54:31 -06:00
grossmj
56051b1142 UDP server discovery. Ref #545. 2016-06-15 17:37:43 -06: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
grossmj
31f4b52631 Add zeroconf. Ref #545. 2016-06-13 15:07:20 -06: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
Jeremy Grossmann
6cd136b423 Merge pull request #565 from GNS3/watch_iou
Monitor IOU NVRAM changes.
2016-06-10 22:33:56 -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
2a5cf18d20
When using pool raise again exception received 2016-06-10 14:42:46 +02:00
Julien Duponchelle
add546158f
List images return images on compute and controller
Fix #506
2016-06-08 14:14:03 +02:00
Julien Duponchelle
08e482004f
Auto upload missing images 2016-06-07 19:38:01 +02:00
Julien Duponchelle
cb7dbfb256
Merge branch '1.5' into 2.0 2016-06-02 13:47:40 +02:00
Julien Duponchelle
d3436756b2
Fix permissions and ownership when stopping container
Fix #550
2016-05-31 21:08:41 +02:00
grossmj
c1aad550fa Merge branch '1.5' into 2.0
Conflicts:
	gns3server/version.py
2016-05-29 19:52:15 -06:00
grossmj
39a3f2fae2 Cloud schema and remove use_ubridge for VMware VM. 2016-05-28 21:46:48 -06:00
grossmj
914fe7e750 Randomize the 4th and 5th bytes when provided with a base mac address. Fixes #522. 2016-05-27 23:00:05 -06:00
Julien Duponchelle
b126c396c9
Start all, with a controlled concurrency
Fix #536
2016-05-24 11:21:49 +02:00
Julien Duponchelle
da6cb13338
Merge branch '1.5' into 2.0 2016-05-24 10:13:53 +02:00
grossmj
acdc1e5ebb Fixes check for NPF service and add check for NPCAP service on Windows. 2016-05-20 20:19:28 -06:00
Julien Duponchelle
d5895c3a47
Merge branch '1.5' into 2.0 2016-05-18 11:25:41 +02:00
Julien Duponchelle
871fea33e0
Cleanup unbreakable space 2016-05-18 11:23:45 +02:00
grossmj
483431438a Merge remote-tracking branch 'origin/2.0' into 2.0
Conflicts:
	gns3server/controller/project.py
	tests/compute/test_project.py
	tests/controller/test_project.py
2016-05-11 11:41:45 -06:00
grossmj
5a76f81271 Refactoring to use a common node class for all VMs and other (future) objects. 2016-05-11 11:35:36 -06:00
Julien Duponchelle
9ccb55206d
Cleanup code for getting the default project directory 2016-05-11 18:42:55 +02:00
Julien Duponchelle
c2da568543
Protect controller and compute about path outside project directory
Fix #503
2016-05-11 15:59:32 +02:00
Julien Duponchelle
9dca7dfe4a
Merge branch '1.5' into 2.0 2016-05-10 17:51:40 +02:00
Julien Duponchelle
57cf57b408
Improve parse_version
Ref #515
2016-05-06 17:09:03 +02:00
Julien Duponchelle
56c153af79
Make HTTP support more reliable with home made HTTP server 2016-05-04 16:32:45 +02:00
Julien Duponchelle
f3095d94c1
Replace port in HTTP flow for docker 2016-05-03 18:01:23 +02:00
Julien Duponchelle
5fd385159c
HTTP support for docker
Fix #509
2016-05-03 16:49:33 +02:00
Julien Duponchelle
dcbaa62df8
Better aux console for docker
Fix #472
2016-05-03 11:33:43 +02:00