Using r661 under Ubuntu Server 9.10, the following two statements work: <ip>192.168.1.100</ip> <ip>192.168.1.[100-250]</ip>
However this does not: <ip>192.168.1.*</ip>
Fixed and lightly tested. x.x.255.x is a valid subnet, correct?
diff -Nur fuppes664/trunk/src/lib/SharedConfig.cpp fuppes664_mod/trunk/src/lib/SharedConfig.cpp --- fuppes664/trunk/src/lib/SharedConfig.cpp 2010-04-04 23:51:50.084583156 -0700 +++ fuppes664_mod/trunk/src/lib/SharedConfig.cpp 2010-04-05 00:01:30.168582498 -0700 @@ -365,8 +365,8 @@ for(unsigned int i = 0; i < AllowedIPCount(); i++) {
string pattern = GetAllowedIP(i); - pattern = StringReplace(pattern, ".*.", "[255]"); - pattern = StringReplace(pattern, "*", "255"); + pattern = StringReplace(pattern, ".*.", ".[0-255]."); + pattern = StringReplace(pattern, "*", "[1-254]");
RegEx rxIp(pattern.c_str()); if(rxIp.Search(p_sIPAddress.c_str()))
Log in to post a comment.
Fixed and lightly tested. x.x.255.x is a valid subnet, correct?
diff -Nur fuppes664/trunk/src/lib/SharedConfig.cpp fuppes664_mod/trunk/src/lib/SharedConfig.cpp
--- fuppes664/trunk/src/lib/SharedConfig.cpp 2010-04-04 23:51:50.084583156 -0700
+++ fuppes664_mod/trunk/src/lib/SharedConfig.cpp 2010-04-05 00:01:30.168582498 -0700
@@ -365,8 +365,8 @@
for(unsigned int i = 0; i < AllowedIPCount(); i++) {
string pattern = GetAllowedIP(i);
- pattern = StringReplace(pattern, ".*.", "[255]");
- pattern = StringReplace(pattern, "*", "255");
+ pattern = StringReplace(pattern, ".*.", ".[0-255].");
+ pattern = StringReplace(pattern, "*", "[1-254]");
RegEx rxIp(pattern.c_str());
if(rxIp.Search(p_sIPAddress.c_str()))