1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-10-18 13:59:06 +00:00
Commit Graph

44 Commits

Author SHA1 Message Date
grossmj
42eaf97e9f Fix uBrigde error popups when Docker image has stopped. Fixes https://github.com/GNS3/gns3-gui/issues/2957 2020-04-06 13:52:04 +09:30
grossmj
aa83fcc7d1 Monitor ubrige processes. 2020-03-20 21:30:05 +10:30
grossmj
9e54ab77d0 Merge 2.1 into 2.2 branch. 2019-06-15 15:26:20 +02:00
grossmj
2476581dca Change uBridge debug level to '1' when debugging is enabled. Fixes #1598 2019-06-12 14:35:13 +02:00
grossmj
5754747a90 Merging 2.1 into 2.2 2019-02-22 18:04:49 +07:00
grossmj
62c51edbae Less aggressive connections to uBridge. Ref #1289 2019-02-22 16:05:31 +07:00
grossmj
456ef1348b Fix DeprecationWarning: invalid escape sequence. Fixes https://github.com/GNS3/gns3-gui/issues/2670 2019-01-17 18:01:58 +07:00
grossmj
76af98404a Drop Python 3.4 and switch to async / await syntax for asyncio. Fixes #1425 2018-10-15 17:05:49 +07:00
grossmj
9de13c570c Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/compute/builtin/nodes/cloud.py
#	gns3server/compute/docker/docker_vm.py
#	gns3server/compute/dynamips/nodes/ethernet_switch.py
#	gns3server/compute/iou/iou_vm.py
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/compute/virtualbox/virtualbox_vm.py
#	gns3server/compute/vmware/vmware_vm.py
#	gns3server/controller/__init__.py
#	gns3server/version.py
#	gns3server/web/web_server.py
2018-10-04 15:44:13 +02:00
grossmj
17d657c919 Fix small errors like unhandled exceptions etc. 2018-09-11 15:06:01 +02:00
grossmj
33e8710495 Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/compute/docker/docker_vm.py
#	gns3server/controller/compute.py
#	gns3server/controller/gns3vm/__init__.py
#	gns3server/controller/link.py
#	gns3server/controller/project.py
#	gns3server/handlers/api/controller/project_handler.py
#	gns3server/handlers/api/controller/server_handler.py
#	gns3server/utils/asyncio/__init__.py
#	gns3server/utils/asyncio/telnet_server.py
#	gns3server/version.py
#	gns3server/web/web_server.py
#	tests/compute/qemu/test_qemu_vm.py
2018-08-29 15:57:54 +07:00
grossmj
902de3dd47 Refactor asyncio locking system for Python 3.7 support. Ref https://github.com/GNS3/gns3-gui/issues/2566 Ref https://github.com/GNS3/gns3-gui/issues/2568 2018-08-25 14:10:47 +07:00
grossmj
21a1800edc Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/controller/__init__.py
#	gns3server/controller/export_project.py
#	gns3server/controller/import_project.py
#	gns3server/controller/project.py
#	gns3server/version.py
2018-04-28 19:41:12 +07:00
grossmj
202e7362a5 Add command information when uBridge has an error. Ref #1289 2018-04-28 18:48:52 +07:00
grossmj
2ea0aa5ded Merge branch '2.1' into 2.2
# Conflicts:
#	gns3server/compute/iou/iou_vm.py
#	gns3server/compute/virtualbox/virtualbox_vm.py
#	gns3server/compute/vmware/vmware_vm.py
2018-04-18 17:08:42 +08:00
grossmj
dd9c18b9f8 Use SO_REUSEADDR before calling bind() where missing. Fixes #1289. 2018-04-16 16:36:36 +08:00
grossmj
b8353bc0d5 Support for none console type (Qemu & Docker only) 2018-03-23 15:44:16 +07:00
grossmj
90ce6093d8 Some spring cleaning. 2018-03-15 14:17:39 +07:00
grossmj
658aa4bae9 Merge 2.1 into 2.2 branch 2018-03-12 13:38:50 +07:00
grossmj
00e781826b Different approach to handle no data returned by uBridge hypervisors. Fixes #1289. 2018-03-07 19:42:19 +07:00
grossmj
a3a0657502 Do not raise exception if Dynamips or uBridge hypervisor don't return data and are still running. Fixes #1289 2018-03-07 19:11:34 +07:00
Jeremy Grossmann
a0f2dd374e
Require uBridge version 0.9.14 on Linux 2018-02-26 23:18:44 +07:00
grossmj
ee486b32bd Use Npcap DLL on Windows when checking for uBridge version. 2017-09-01 16:22:43 +07:00
Julien Duponchelle
08423eff96
Support packet filtering for VPCS
https://github.com/GNS3/gns3-gui/issues/765
2017-07-04 15:12:26 +02:00
Julien Duponchelle
57cdef6b02
Fix AttributeError: 'NoneType' object has no attribute 'returncode'
Fix #976
2017-04-14 10:33:19 +02:00
Julien Duponchelle
233a5fbed4
Fix a race condition when killing ubridge
Fix #931
2017-03-13 18:21:43 +01:00
Julien Duponchelle
0dc38a3970
Fix an error when handling ubridge errors
Fix #933
2017-03-13 16:57:24 +01:00
Julien Duponchelle
8ff7670031
Fix a crash when you broke permission on your file system
Fix #879
2017-01-27 10:49:57 +01:00
Julien Duponchelle
e4fdfbd091
Code cleanup around ubridge 2016-11-17 18:11:56 +01:00
Julien Duponchelle
63a92c4a16
Require ubridge 0.9.7 this fix error with IOL bridge creation
Fix https://github.com/GNS3/gns3-gui/issues/1651
2016-11-11 17:07:20 +01:00
grossmj
183f602fc0 Replace iouyap by ubridge to handle IOU connections. Fixes #614. 2016-11-06 21:27:49 +11:00
Julien Duponchelle
79b4926cad
Fix the nat node
Ref #686
2016-09-26 15:08:55 +02:00
Julien Duponchelle
cb7dbfb256
Merge branch '1.5' into 2.0 2016-06-02 13:47:40 +02:00
grossmj
cd07a99118 Some cleaning + move "/version" endpoint to "/server/version". 2016-06-01 17:50:31 -06:00
Julien Duponchelle
009ffcb4ef
Ubridge 0.9.4 is require
Ref #551
2016-05-31 15:46:07 +02:00
grossmj
a2ebbaa322 Force Npcap DLL to be used first for Dynamips and uBridge (instead of the one from Winpcap if installed). 2016-05-21 14:43:10 -06:00
Julien Duponchelle
d952718f30
Fix RuntimeWarning: You have iterated over the result of
pkg_resources.parse_version. This is a legacy behavior

Fix #504
2016-05-02 17:14:15 +02:00
Julien Duponchelle
9b0088728f
Catch docker namespace error
Fix #424
2016-02-11 15:49:28 +01:00
Julien Duponchelle
98537a242a
Drop duplicate code when ubridge is too old
Fix #405
2016-02-01 16:05:37 +01:00
Julien Duponchelle
33edbefa3b Docker cleanup and improvements 2015-12-18 18:20:56 +01:00
Julien Duponchelle
1248584841 Cleanup unused and duplicates 2015-11-09 12:14:25 +01:00
Jeremy
1b499571b1 Deactivate uBridge process monitoring (process returns 1 on Windows when stopping). 2015-07-22 12:03:40 -06:00
Jeremy
fc0409286b Check for uBridge version and catch uBridge errors. 2015-07-21 17:58:53 -06:00
grossmj
1f890b4cad Implements uBridge hypervisor. 2015-07-19 22:55:10 -06:00