Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
vncproxy
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
1
Merge Requests
0
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
27982485
authored
Oct 21, 2013
by
Bach Dániel
Committed by
Guba Sándor
Oct 21, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix unhandled exceptions
parent
b9fab27a
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
proxy.py
+3
-1
websockets.py
+1
-1
No files found.
proxy.py
View file @
27982485
...
...
@@ -65,7 +65,8 @@ class VNCWebSocketHandler(Protocol):
port
=
value
[
'port'
]
host
=
value
[
'host'
]
except
:
pass
transport
.
loseConnection
()
return
self
.
transport
=
transport
self
.
srv_queue
=
defer
.
DeferredQueue
()
self
.
cli_queue
=
defer
.
DeferredQueue
()
...
...
@@ -87,6 +88,7 @@ class VNCWebSocketHandler(Protocol):
self
.
cli_queue
.
put
(
frame
)
def
connectionLost
(
self
,
why
):
if
hasattr
(
self
,
'cli_queue'
):
self
.
cli_queue
.
put
(
False
)
log
.
msg
(
"HELO"
)
...
...
websockets.py
View file @
27982485
...
...
@@ -399,7 +399,6 @@ class WebSocketsProtocol(Protocol):
Find frames in incoming data and pass them to the underlying protocol.
"""
for
opcode
,
data
,
fin
in
_parseFrames
(
self
.
_buffer
):
self
.
_receiver
.
frameReceived
(
opcode
,
base64
.
b64decode
(
data
),
fin
)
if
opcode
==
CONTROLS
.
CLOSE
:
# The other side wants us to close.
code
,
reason
=
data
...
...
@@ -416,6 +415,7 @@ class WebSocketsProtocol(Protocol):
# 5.5.3 PONGs must contain the data that was sent with the
# provoking PING.
self
.
transport
.
write
(
_makeFrame
(
data
,
CONTROLS
.
PONG
,
True
))
self
.
_receiver
.
frameReceived
(
opcode
,
base64
.
b64decode
(
data
),
fin
)
def
dataReceived
(
self
,
data
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment