[vidalia-svn] r2448: * new service attribute added for some additional service op (vidalia/branches/hidden-services/src/vidalia/config)

[borkdomenik@xxxxxxxxxxxxxxxxxxx]

Author: borkdomenik
Date: 2008-03-23 13:42:51 -0400 (Sun, 23 Mar 2008)
New Revision: 2448

Modified:
   vidalia/branches/hidden-services/src/vidalia/config/service.cpp
   vidalia/branches/hidden-services/src/vidalia/config/service.h
Log:
* new service attribute added for some additional service options like excludenodes etc..

Modified: vidalia/branches/hidden-services/src/vidalia/config/service.cpp
===================================================================
--- vidalia/branches/hidden-services/src/vidalia/config/service.cpp	2008-03-23 17:34:00 UTC (rev 2447)
+++ vidalia/branches/hidden-services/src/vidalia/config/service.cpp	2008-03-23 17:42:51 UTC (rev 2448)
@@ -55,7 +55,12 @@
   _serviceDirectory = serviceDirectory;
 }
 
+/** Sets the additional options of a service e.g. excludeNodes */
+void Service::setAdditionalServiceOptions(QString options) {
+  _additionalServiceOptions = options;
+}
 
+
 /** Writes service class data from <b>myObj</b> to the QDataStream
  * <b>out</b>. */
 QDataStream&operator<<(QDataStream &out, const Service &myObj) {	
@@ -64,6 +69,7 @@
   out << myObj.physicalAddressPort();
   out << myObj.serviceDirectory();
   out << myObj.enabled();
+  out << myObj.additionalServiceOptions();
   
   return out;
 }
@@ -76,9 +82,10 @@
   QString physicalAddressPort;
   QString serviceDirectory;
   bool enabled;
+  QString additionalServiceOptions;
 
   /* Read in from the data stream */
-  in >> serviceAddress >> virtualPort  >> physicalAddressPort >> serviceDirectory >> enabled;
+  in >> serviceAddress >> virtualPort  >> physicalAddressPort >> serviceDirectory >> enabled >> additionalServiceOptions;
 
   /* Set the appropriate class member variables */
   myObj.setServiceAddress(serviceAddress);
@@ -86,6 +93,7 @@
   myObj.setPhysicalAddressPort(physicalAddressPort);
   myObj.setServiceDirectory(serviceDirectory);
   myObj.setEnabled(enabled);
+  myObj.setAdditionalServiceOptions(additionalServiceOptions);
 
   /* Return the updated data stream */
   return in;

Modified: vidalia/branches/hidden-services/src/vidalia/config/service.h
===================================================================
--- vidalia/branches/hidden-services/src/vidalia/config/service.h	2008-03-23 17:34:00 UTC (rev 2447)
+++ vidalia/branches/hidden-services/src/vidalia/config/service.h	2008-03-23 17:42:51 UTC (rev 2448)
@@ -44,6 +44,9 @@
   /** Returns the deployed status of a service */	  
   bool enabled() const { return _enabled; }
   
+  /** Returns the additional options of a service e.g. excludeNodes */
+  QString additionalServiceOptions() const { return _additionalServiceOptions; }
+  
   /** Sets the adress of a service */	  
   void setServiceAddress(QString serviceAddress);
 
@@ -58,6 +61,9 @@
 
   /** Sets the deployed status a service */    
   void setEnabled(bool enabled);
+  
+  /** Sets the additional options of a service e.g. excludeNodes */
+  void setAdditionalServiceOptions(QString options);
 
   /** Writes service class data from <b>myObj</b> to the QDataStream
   * <b>out</b>. */
@@ -79,6 +85,8 @@
   QString _serviceDirectory;
   /** The Enabled status of the service */
   bool _enabled;
+  /** Some additional service options, not configured/displayed by Vidalia */
+  QString _additionalServiceOptions;
 
 };
 Q_DECLARE_METATYPE(Service);