Handle more disconnect reasons #155
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
To make them easier to search for - let's match the names with the corresponding names on the server side: https://msdn.microsoft.com/en-us/library/cc240544.aspx
There seems to have been confusion with regards to which exit code and message was returned by rdesktop for the following cases: * disconnected by admin * logged out by admin * disconnect by user * logoff by user Looking at Microsoft's official documentation as well as testing using Windows Server 2008 R2, 2012 R2 and 2016 reveals that this commit fixes this issue. They do now match the reasons sent by the server.
They are now a bit more specific and better match the description of the disconnection reasons sent by the server.
Most of the RPD protocol errors (reason > 0x1000) would only be triggered by coding errors in the client. A few of them can occur due to server errors however. We should attempt to handle these cases.
|
It would be nice if these new rdesktop return codes would be documented in the manual page, doc/rdesktop.1 |
|
Ah, missed that. Absolutely! |
hean01-cendio
approved these changes
Oct 5, 2017
|
Added a commit which updates the manual page |
hean01-cendio
approved these changes
Oct 5, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds handling for 15 additional disconnect reasons that we can receive from the server:
This is the reference I used for what the server sends: https://msdn.microsoft.com/en-us/library/cc240544.aspx
The PR also fixes a few messages that was incorrect for existing disconnect codes:
And tweaks the wording on some other messages as well to better fit with what the server sends.