Fix SERVER_SRS_HOST_AUTO (Attempt 2) #715
Merged
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.
Original PR: #676 This fixes the SERVER_SRS_HOST_AUTO by making use of net.get_server_host() on the client-side.
@ciribob MESSAGE_PATTERN_OLD & MESSAGE_PATTERN_OLDER should now match to obtain the host where no
:PORT
has been specified.I've updated the auto-connect message to only send the port if SERVER_SRS_HOST_AUTO is enabled, otherwise it uses the original message with SERVER_SRS_HOST and SERVER_SRS_PORT.
I've removed the isAutoConnectMessage function in favour of regex matching. We try to get the port from the message, if this fails, fallback to matching on IP and Port.