ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-06-15 22:08:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make sure we don't try to read when opening a file in binary more. Fixes #1301.

Browse Source
This commit is contained in:
grossmj
2018-03-07 16:39:04 +07:00
parent 419797dd92
commit c93d0d8d12
8 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gns3server/controller/link.py
View File

@ -315,16 +315,19 @@ class Link:
self._project.controller.notification.emit("link.updated", self.__json__())
with stream_content as stream:
with open(self.capture_file_path, "wb+") as f:
while self._capturing:
# We read 1 bytes by 1 otherwise the remaining data is not read if the traffic stops
data = yield from stream.read(1)
if data:
f.write(data)
# Flush to disk otherwise the live is not really live
f.flush()
else:
break
try:
with open(self.capture_file_path, "wb") as f:
while self._capturing:
# We read 1 bytes by 1 otherwise the remaining data is not read if the traffic stops
data = yield from stream.read(1)
if data:
f.write(data)
# Flush to disk otherwise the live is not really live
f.flush()
else:
break
except OSError as e:
raise aiohttp.web.HTTPConflict(text="Could not write capture file '{}': {}".format(self.capture_file_path, e))
@asyncio.coroutine
def stop_capture(self):