Allow session-level connection description in SDP test #877
Conversation
This file contains hidden or 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
Prevents an exception when given an SDP with only session-level connection line.
Comment on lines
+538
to
+541
| connection_global = None | ||
| connection_global_line = re.search(r"c=IN IP[4,6] ([^/\r\n]*)(?:/[0-9]+){0,2}", sdp_global) | ||
| if connection_global_line is not None: | ||
| connection_global = connection_global_line.group(1) |
Contributor
There was a problem hiding this comment.
I would suggest getting rid of the connection_global temp variable in the interest of compactness and understandability.
Suggested change
| connection_global = None | |
| connection_global_line = re.search(r"c=IN IP[4,6] ([^/\r\n]*)(?:/[0-9]+){0,2}", sdp_global) | |
| if connection_global_line is not None: | |
| connection_global = connection_global_line.group(1) | |
| connection_global_line = re.search(r"c=IN IP[4,6] ([^/\r\n]*)(?:/[0-9]+){0,2}", sdp_global) |
Comment on lines
+560
to
+567
| if connection_line is None: | ||
| if connection_global is None: | ||
| return False, "SDP has no session-level connection description, and no connection line in media description {}"\ | ||
| .format(index) | ||
| elif connection_global != transport_params["destination_ip"]: | ||
| return False, "SDP has no connection line for media description {}, and session destination IP {} does not match transport_params: {}" \ | ||
| .format(index, connection_global, transport_params["destination_ip"]) | ||
| elif connection_line.group(1) != transport_params["destination_ip"]: |
Contributor
There was a problem hiding this comment.
Suggested change
| if connection_line is None: | |
| if connection_global is None: | |
| return False, "SDP has no session-level connection description, and no connection line in media description {}"\ | |
| .format(index) | |
| elif connection_global != transport_params["destination_ip"]: | |
| return False, "SDP has no connection line for media description {}, and session destination IP {} does not match transport_params: {}" \ | |
| .format(index, connection_global, transport_params["destination_ip"]) | |
| elif connection_line.group(1) != transport_params["destination_ip"]: | |
| if connection_line is None: | |
| if connection_global_line is None: | |
| return False, "SDP has no session-level connection description, and no connection line in media description {}"\ | |
| .format(index) | |
| elif connection_global_line.group(1) != transport_params["destination_ip"]: | |
| return False, "SDP has no connection line for media description {}, and session destination IP {} does not match transport_params: {}" \ | |
| .format(index, connection_global_line.group(1), transport_params["destination_ip"]) | |
| elif connection_line.group(1) != transport_params["destination_ip"]: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Prevents an exception when given an SDP with only session-level connection line. Checks against session-level connection info if media-level connection info is not present. Adds an error for case when niether is present.
Intended as a fix for #876