[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdeadmin/knetworkconf/knetworkconf
From:       Juan Luis Baptiste <juan.baptiste () kdemail ! net>
Date:       2005-12-27 20:34:54
Message-ID: 1135715694.526285.22828.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 491859 by jbaptiste:

- Forgot to validate the gateway address in the advanced options.
- Made optionals the gateway and broadcast addresses, if the broadcast address is \
left blank we calculate it.

 M  +11 -3     kadddevicecontainer.cpp  
 M  +2 -4      knetworkconf.cpp  


--- branches/KDE/3.5/kdeadmin/knetworkconf/knetworkconf/kadddevicecontainer.cpp \
#491858:491859 @@ -119,15 +119,23 @@
   
   if (addDlg->rbBootProtoManual->isChecked())
   {	
-    if (!KAddressValidator::isValidIPAddress(addDlg->kleIPAddress->text()))
+    QString ipAddress = addDlg->kleIPAddress->text();
+    QString netmask = addDlg->kcbNetmask->currentText();
+    QString broadcast = advancedOptions->kleBroadcast->text();
+    QString gateway = advancedOptions->kleGateway->text();
+    
+    if (!KAddressValidator::isValidIPAddress(ipAddress))
     {
       KMessageBox::error(this,i18n("The format of the specified IP address is not \
valid."),i18n("Invalid IP Address"));  }    
-    else if (_advanced && \
!KAddressValidator::isNetmaskValid(addDlg->kcbNetmask->currentText())) +    else if \
                (_advanced && !KAddressValidator::isNetmaskValid(netmask))
         KMessageBox::error(this,i18n("The format of the specified netmask is not \
valid."),i18n("Invalid IP Address"));  
-    else if (_advanced && \
!KAddressValidator::isBroadcastValid(advancedOptions->kleBroadcast->text())) +    \
else if (!broadcast.isEmpty() && _advanced && \
                !KAddressValidator::isBroadcastValid(broadcast))
         KMessageBox::error(this,i18n("The format of the specified broadcast is not \
valid."),i18n("Invalid IP Address")); +    
+    else if (!gateway.isEmpty() && _advanced && \
!KAddressValidator::isValidIPAddress(gateway)) +        \
KMessageBox::error(this,i18n("The format of the specified Gateway is not \
valid."),i18n("Invalid IP Address"));  
     else
     {
--- branches/KDE/3.5/kdeadmin/knetworkconf/knetworkconf/knetworkconf.cpp \
#491858:491859 @@ -338,10 +338,8 @@
           dev->setNetmask(configDlg.addDlg->kcbNetmask->currentText().stripWhiteSpace());
                
           QString network = \
KAddressValidator::calculateNetwork(dev->getIpAddress().stripWhiteSpace(),dev->getNetmask().stripWhiteSpace());
  dev->setNetwork(network);
-          QString broadcast;
-          if (configDlg.advanced())
-	          broadcast = advancedOptions->kleBroadcast->text().stripWhiteSpace();
-        else
+          QString broadcast = \
advancedOptions->kleBroadcast->text().stripWhiteSpace(); +          if \
                (broadcast.isEmpty())
             broadcast = \
KAddressValidator::calculateBroadcast(dev->getIpAddress().stripWhiteSpace(),dev->getNetmask().stripWhiteSpace());
  dev->setBroadcast(broadcast);
           dev->setDescription(advancedOptions->kleDescription->text());


[prev in list] [next in list] [prev in thread] [next in thread]