[vidalia-svn] r2266: Parse ReachableAddresses values properly when there are mult (in trunk: . src/vidalia/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-12-27 11:35:05 -0500 (Thu, 27 Dec 2007)
New Revision: 2266

Modified:
   trunk/
   trunk/src/vidalia/config/networksettings.cpp
Log:
 r2379@lysithea:  edmanm | 2007-12-26 23:46:26 -0500
 Parse ReachableAddresses values properly when there are multiple ports
 specified on a single line. Fixes armabug #3.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r2379] on 0108964c-5b0b-4c9e-969f-e2288315d100

Modified: trunk/src/vidalia/config/networksettings.cpp
===================================================================
--- trunk/src/vidalia/config/networksettings.cpp	2007-12-27 16:34:50 UTC (rev 2265)
+++ trunk/src/vidalia/config/networksettings.cpp	2007-12-27 16:35:05 UTC (rev 2266)
@@ -130,16 +130,18 @@
 NetworkSettings::getReachablePorts()
 {
   QList<quint16> reachablePorts;
-  QStringList addressList;
+  QStringList lineList;
   bool ok;
 
-  addressList = value(SETTING_REACHABLE_ADDRESSES).toStringList();
-  foreach(QString address, addressList) {
-    QStringList parts = address.split(":");
-    if (parts.size() >= 2) {
-      quint16 port = parts.at(1).toUInt(&ok);
-      if (ok)
-        reachablePorts << port;
+  lineList = value(SETTING_REACHABLE_ADDRESSES).toStringList();
+  foreach (QString line, lineList) {
+    foreach (QString address, line.split(",", QString::SkipEmptyParts)) {
+      QStringList parts = address.split(":");
+      if (parts.size() >= 2) {
+        quint16 port = parts.at(1).toUInt(&ok);
+        if (ok)
+          reachablePorts << port;
+      }
     }
   }
   return reachablePorts;