Author: mzugec
Date: Tue Jul 1 17:53:37 2008
New Revision: 48737
URL: http://svn.opensuse.org/viewcvs/yast?rev=48737&view=rev
Log:
support for "/PREFIXLEN" in aliases
common mask/prefix validator
IPv6 support in aliases
Modified:
trunk/network/VERSION
trunk/network/package/yast2-network.changes
trunk/network/src/lan/address.ycp
trunk/network/src/lan/virtual.ycp
trunk/network/src/routines/routines.ycp
trunk/network/yast2-network.spec.in
Modified: trunk/network/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=48737&r1=48736&r2=48737&view=diff
==============================================================================
--- trunk/network/VERSION (original)
+++ trunk/network/VERSION Tue Jul 1 17:53:37 2008
@@ -1 +1 @@
-2.17.5
+2.17.6
Modified: trunk/network/package/yast2-network.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=48737&r1=48736&r2=48737&view=diff
==============================================================================
--- trunk/network/package/yast2-network.changes (original)
+++ trunk/network/package/yast2-network.changes Tue Jul 1 17:53:37 2008
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Tue Jul 1 17:51:19 CEST 2008 - mzugec@suse.de
+
+- support for "/PREFIXLEN" in aliases
+- common mask/prefix validator
+- IPv6 support in aliases
+- 2.17.6
+
+-------------------------------------------------------------------
Tue Jun 24 16:38:56 CEST 2008 - mzugec@suse.cz
- correctly show bonding slaves (bnc#401719)
Modified: trunk/network/src/lan/address.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/address.ycp?rev=48737&r1=48736&r2=48737&view=diff
==============================================================================
--- trunk/network/src/lan/address.ycp (original)
+++ trunk/network/src/lan/address.ycp Tue Jul 1 17:53:37 2008
@@ -399,13 +399,7 @@
}
string mask=(string) UI::QueryWidget (`netmask, `Value);
- boolean valid_mask=false;
- if (Netmask::Check4(mask)) valid_mask=true;
- else if (regexpmatch(mask, "^/[[:digit:]]{1,2}$")) valid_mask=true;
- else if (Netmask::Check6(mask)) valid_mask=true;
- else if (regexpmatch(mask, "^/[[:digit:]]{1,3}$")) valid_mask=true;
-
- if(!valid_mask){
+ if(!validPrefixOrNetmask(mask)){
Popup::Error(_("No valid netmask or prefix lenght."));
UI::SetFocus(`netmask);
return false;
Modified: trunk/network/src/lan/virtual.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/virtual.ycp?rev=48737&r1=48736&r2=48737&view=diff
==============================================================================
--- trunk/network/src/lan/virtual.ycp (original)
+++ trunk/network/src/lan/virtual.ycp Tue Jul 1 17:53:37 2008
@@ -67,7 +67,10 @@
list<term> table_items = [];
/* make ui items from the aliases list */
maplist(string alias, map data, (map) LanItems::aliases, {
- table_items = add(table_items, `item(`id(size(table_items)), alias, data["IPADDR"]:"", data["NETMASK"]:""));
+ string ip = data["IPADDR"]:"";
+ string mask = data["NETMASK"]:"";
+ if (size(data["PREFIXLEN"]:"")>0) mask=sformat("/%1", data["PREFIXLEN"]:"");
+ table_items = add(table_items, `item(`id(size(table_items)), alias, ip, mask));
});
UI::ChangeWidget(`id(`table), `Items, table_items);
@@ -134,7 +137,8 @@
maplist(term e, table_items, {
map alias = $[];
alias["IPADDR"] = e[2]:"";
- alias["NETMASK"] = e[3]:"";
+ if(substring(e[3]:"", 0,1)=="/") alias["PREFIXLEN"]=substring(e[3]:"", 1);
+ else alias["NETMASK"]=e[3]:"";
LanItems::aliases[e[1]:""] = alias;
aliases_to_delete[e[1]:""] = nil;
});
@@ -178,7 +182,7 @@
UI::ChangeWidget(`id(`name), `ValidChars, "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ");
UI::ChangeWidget(`id(`ipaddr), `ValidChars, IP::ValidChars);
- UI::ChangeWidget(`id(`netmask), `ValidChars, Netmask::ValidChars);
+// UI::ChangeWidget(`id(`netmask), `ValidChars, Netmask::ValidChars);
if(entry == `empty())
UI::SetFocus(`id(`name));
@@ -219,7 +223,7 @@
host = add(host, val);
val = (string) UI::QueryWidget(`id(`netmask), `Value);
- if(!Netmask::Check(val)) {
+ if(!validPrefixOrNetmask(val)) {
/* Popup::Error text */
Popup::Error(_("The subnet mask is invalid."));
UI::SetFocus(`id(`netmask));
Modified: trunk/network/src/routines/routines.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/routines.ycp?rev=48737&r1=48736&r2=48737&view=diff
==============================================================================
--- trunk/network/src/routines/routines.ycp (original)
+++ trunk/network/src/routines/routines.ycp Tue Jul 1 17:53:37 2008
@@ -22,6 +22,7 @@
import "Confirm";
import "Map";
import "DefaultDesktop";
+import "Netmask";
/**
* Abort function
@@ -784,5 +785,19 @@
y2debug("Hardware=%1", Hardware);
return Hardware;
}
+
+boolean validPrefixOrNetmask(string val){
+
+ boolean valid_mask=false;
+ if (Netmask::Check4(val)) valid_mask=true;
+ else
+ if (regexpmatch(val, "^/[[:digit:]]{1,2}$") && tointeger(substring(val, 1))<=32) valid_mask=true;
+ else
+ if (Netmask::Check6(val)) valid_mask=true;
+ else
+ if (regexpmatch(val, "^/[[:digit:]]{1,3}$") && tointeger(substring(val, 1))<=128) valid_mask=true;
+ return valid_mask;
+}
+
/* EOF */
}
Modified: trunk/network/yast2-network.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/yast2-network.spec.in?rev=48737&r1=48736&r2=48737&view=diff
==============================================================================
--- trunk/network/yast2-network.spec.in (original)
+++ trunk/network/yast2-network.spec.in Tue Jul 1 17:53:37 2008
@@ -10,8 +10,8 @@
BuildRequires: yast2 >= 2.16.6
BuildRequires: yast2-packager >= 2.16.37
-# needed for prefixlen support
-Requires: yast2 >= 2.17.1
+# needed for prefixlen support in aliases
+Requires: yast2 >= 2.17.5
Requires: sysconfig
Requires: yast2-packager >= 2.16.37
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
