Skip to content

IPAddress constructors and Parsing improvements #13

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.

Sign up for GitHub

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
jsakamoto merged 11 commits into from
Oct 16, 2015
Merged

IPAddress constructors and Parsing improvements #13

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
384edaf
Add constructors that take IPAddress objects, and modify Parse method…
gregmac Jun 17, 2015
d5e33ad
Use a single regex for parsing
gregmac Jun 17, 2015
6ea4a85
Tighten up allowance of spaces: leading/trailing spaces and spaces ar…
gregmac Jun 17, 2015
b3a67d1
Fix mixed up xmldocs on constructors
gregmac Jun 17, 2015
63896a3
Fix for Exception when parsing spaces around single IP address
gregmac Jun 19, 2015
8e4677f
Fix for exception with trailing spaces on CIDR range
gregmac Jun 19, 2015
84944c7
Change parsing tests to use TestCase, and add several variations of i…
gregmac Jun 19, 2015
51f0836
Fix TryParse failing on null or other invalid input (fixes #14)
gregmac Jun 19, 2015
cfd912c
Add GetBitMaskLength method and test
gregmac Jun 25, 2015
b411d38
Constructor changes from https://github.com/jsakamoto/ipaddressrange/…
gregmac Jun 25, 2015
6ed72cd
Merge remote-tracking branch 'upstream/master' into feature/constructors
gregmac Jun 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix for exception with trailing spaces on CIDR range
  • Loading branch information
@gregmac
gregmac committed Jun 19, 2015
commit 8e4677f4df5555ff3ae83aef1378ce5b8d9654e2
2 changes: 1 addition & 1 deletion IPAddressRange/IPAddressRange.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public void GetObjectData(SerializationInfo info, StreamingContext context)

protected static string ParseRegex =
@"^\s*(?:" +
@"(?<cidrBase>[\da-f\.:]+)\s*/\s*(?<cidrMask>\d+)$" + // Pattern 1. CIDR range: "192.168.0.0/24", "fe80::/10"
@"(?<cidrBase>[\da-f\.:]+)\s*/\s*(?<cidrMask>\d+)" + // Pattern 1. CIDR range: "192.168.0.0/24", "fe80::/10"
@"|(?<singleAddr>[\da-f\.:]+)" + // Pattern 2. Uni address: "127.0.0.1", ":;1"
@"|(?<begin>[\da-f\.:]+)\s*[\-–]\s*(?<end>[\da-f\.:]+)" + // Pattern 3. Begin end range: "169.258.0.0-169.258.0.255"
@"|(?<bitmaskAddr>[\da-f\.:]+)\s*/\s*(?<bitmaskMask>[\da-f\.:]+)" + // Pattern 4. Bit mask range: "192.168.0.0/255.255.255.0"
Expand Down