-
Notifications
You must be signed in to change notification settings - Fork 119
IP address check for Unity IP address and ROS IP address #80
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
c5b7597
Add Ip address check
vidurvij-Unity f70d901
Adding condition for alphaumeric IP address
vidurvij-Unity e34f774
Corrections for PR review
vidurvij-Unity e1c1dcb
Adding a comment about checks on hostname
vidurvij-Unity c5c90c1
Update ROSConnection.cs
vidurvij-Unity File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,6 +8,7 @@ | |
| using System.Text; | ||
| using System.Threading.Tasks; | ||
| using Unity.Robotics.ROSTCPConnector.MessageGeneration; | ||
| using System.Globalization; | ||
| using UnityEngine; | ||
| using UnityEngine.Serialization; | ||
|
|
||
|
|
@@ -224,11 +225,15 @@ void OnEnable() | |
|
|
||
| private void Start() | ||
| { | ||
| if(!IPFormatIsCorrect(rosIPAddress)) | ||
| Debug.LogError("ROS IP address is not correct"); | ||
| InitializeHUD(); | ||
| Subscribe<MRosUnityError>(ERROR_TOPIC_NAME, RosUnityErrorCallback); | ||
|
|
||
| if (overrideUnityIP != "") | ||
| { | ||
| if(!IPFormatIsCorrect(overrideUnityIP)) | ||
| Debug.LogError("Override Unity IP address is not correct"); | ||
| StartMessageServer(overrideUnityIP, unityPort); // no reason to wait, if we already know the IP | ||
| } | ||
|
|
||
|
|
@@ -588,5 +593,33 @@ private void WriteDataStaggered(NetworkStream networkStream, string rosTopicName | |
| networkStream.Write(segmentData, 0, segmentData.Length); | ||
| } | ||
| } | ||
|
|
||
| public static bool IPFormatIsCorrect(string ipAddress) | ||
| { | ||
| if(ipAddress == null || ipAddress == "") | ||
| return false; | ||
|
|
||
| // If IP address is set using static lookup tables https://man7.org/linux/man-pages/man5/hosts.5.html | ||
| if(Char.IsLetter(ipAddress[0])) | ||
| { | ||
| foreach(Char subChar in ipAddress) | ||
| { | ||
| if(!(Char.IsLetterOrDigit(subChar) || subChar == '-'|| subChar == '.')) | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Would you mind adding a comment describing why these characters are invalid? |
||
| return false; | ||
| } | ||
|
|
||
| if(!Char.IsLetterOrDigit(ipAddress[ipAddress.Length - 1])) | ||
| return false; | ||
| return true; | ||
| } | ||
|
|
||
| string[] subAdds = ipAddress.Split('.'); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ok, now let's remove this and the if statement, and I think we're done |
||
| if(subAdds.Length != 4) | ||
| { | ||
| return false; | ||
| } | ||
| IPAddress parsedipAddress; | ||
| return IPAddress.TryParse(ipAddress, out parsedipAddress); | ||
| } | ||
| } | ||
| } | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this looking for a hostname instead of an IP? Can you please add a comment.