Changeset 556

Timestamp:

04/02/06 03:15:57 (3 years ago)

Author:

edmanm

Message:

Do all the policy parsing and formatting in the Policy class.

Location:

trunk/src

Files:

• config/policy.cpp (modified) (3 diffs)
• config/policy.h (modified) (2 diffs)
• gui/config/serverpage.cpp (modified) (3 diffs)
• gui/config/serverpage.h (modified) (1 diff)

trunk/src/config/policy.cpp

@@ -52 +52 @@
 }
 
+/** Constructor. Creates a new Policy object from the string parts. */
+Policy::Policy(QString action, QString address, QString ports)
+{
+  /* Set the defaults */
+  _action   = Accept;
+  _address  = QHostAddress::Any;
+  _fromPort = _toPort = 0;
+  _mask = 0;
+  
+  fromString(action + " " + address + ":" + ports);
+}
+
 /** Constructor. Creates a new Policy object depending on the specified
  * special policy type. */
@@ -59 +71 @@
   _address  = QHostAddress::Any;
   _fromPort = _toPort = 0;
-  _mask = 0;
-}
-
-/** Constructor. Creates a new policy object based on the given rules. */
-Policy::Policy(Action action, QHostAddress addr, 
-               quint16 fromPort, quint16 toPort)
-{
-  _action   = action;
-  _address  = addr;
-  _fromPort = fromPort;
-  _toPort   = toPort;
   _mask = 0;
 }
@@ -134 +135 @@
 Policy::toString()
 {
-  QString policy;
-  
-  /* Add the action to take for this policy */
-  policy = (_action == Accept ? "accept " : "reject ");
-  
-  /* Add the address (and mask, if specified) */
-  if (_mask && !_address.isNull()) {
-    policy += _address.toString() + "/" + QString::number(_mask);
-  } else {
-    policy += (_address.isNull() ? "*" : _address.toString());
-  }
-  
-  /* Add the port or port range (if specified) */
-  policy += ":" + (_fromPort ? QString::number(_fromPort) : "*");
-  if (_fromPort && _toPort) {
-    policy += "-" + QString::number(_toPort);
-  }
-  return policy;
+  return action() + " " + address() + ":" + ports();
 }
 
+/** Converts the given action to a string. */
+Policy::Action
+Policy::toAction(QString action)
+{
+  if (action.toLower() == "accept") {
+    return Accept;
+  }
+  return Reject;
+}
+
+/** Returns the action associated with this policy. */
+QString
+Policy::action()
+{
+  return (_action == Accept ? "accept" : "reject");
+}
+
+/** Returns the address (and mask, if specified) for this policy. */
+QString
+Policy::address()
+{
+  if (_mask && !_address.isNull()) {
+    return _address.toString() + "/" + QString::number(_mask);
+  } 
+  return (_address.isNull() ? "*" : _address.toString());
+}
+
+/** Returns the port (or port range, if specified) for this policy. */
+QString
+Policy::ports()
+{
+  QString ports = (_fromPort ? QString::number(_fromPort) : "*");
+  if (_fromPort && _toPort) {
+    ports += "-" + QString::number(_toPort);
+  }
+  return ports;
+}
+

trunk/src/config/policy.h

@@ -50 +50 @@
   /** Parses the given policy, represented as a string. */
   Policy(QString policy);
+  /** Parses the given portions of a policy string. */
+  Policy(QString action, QString address, QString ports);
   /** Creates a policy of the given special type. */
   Policy(SpecialPolicy policy);
-  /** Create a policy using the specified information. */
-  Policy(Action action, QHostAddress addr, 
-         quint16 fromPort, quint16 toPort = 0);
   /** Creates a policy using the specified information. */
   Policy(Action action, QHostAddress addr, uchar mask,
@@ -66 +65 @@
   /** Converts this policy to a format Tor understands. */
   QString toString();
-
+  /** Converts a string action to an Action enum value. */
+  static Action toAction(QString action);
+  
   /** Returns the action taken when this policy matches an address. */
-  Action action() { return _action; }
-  /** Returns the host address for this policy. */
-  QHostAddress address() { return _address; }
-  /** Returns the host address mask for this policy. */
-  uchar mask() { return _mask; }
-  /** Returns the first port in a range. */
-  quint16 fromPort() { return _fromPort; }
-  /** Returns the last port in a port range. */
-  quint16 toPort() { return _toPort; }
+  QString action();
+  /** Returns the host address (including mask, if set) for this policy. */
+  QString address();
+  /** Returns the port or port range for this policy. */
+  QString ports();
 
 private:

trunk/src/gui/config/serverpage.cpp

@@ -142 +142 @@
 ServerPage::savePolicy(QTreeWidgetItem *item, ExitPolicy &exitPolicy)
 {
-  /* Build policy string */
-  QString policyString = item->text(COL_ACTION) + " ";
-  policyString += item->text(COL_ADDRESS) + ":" + item->text(COL_PORT);
-  
   /* Add policy to ServerSettings */
-  exitPolicy.addPolicy(Policy(policyString));
+  exitPolicy.addPolicy(Policy(item->text(COL_ACTION),
+                              item->text(COL_ADDRESS),
+                              item->text(COL_PORT)));
 }
 
@@ -163 +161 @@
   
   /* Add the policy to the list */
-  addPolicyItem(ui.cmboExitAction->currentText(), ui.lineExitAddress->text(),
-                ui.lineExitMask->text(), ui.lineExitFromPort->text(),
-                ui.lineExitToPort->text());
+  addPolicyItem(Policy(Policy::toAction(ui.cmboExitAction->currentText()), 
+                       QHostAddress(ui.lineExitAddress->text()),
+                       ui.lineExitMask->text().toUShort(), 
+                       ui.lineExitFromPort->text().toUShort(),
+                       ui.lineExitToPort->text().toUShort()));
 
   /* Clear input text boxes */
@@ -178 +178 @@
 ServerPage::addPolicyItem(Policy policy)
 {
-  /* Convert to strings */
-  QString action = (policy.action() == Policy::Accept ? "accept" : "reject");
-  QHostAddress address = policy.address();
-  QString addr = (address.isNull() ? "*" : address.toString());
-  QString mask = (policy.mask() ? QString::number(policy.mask()) : "");
-  int port = policy.fromPort();
-  QString fromPort = (port ? QString::number(port) : "");
-  port = policy.toPort();
-  QString toPort = (port ? QString::number(port) : "");
-
-  /* Add to list */
-  addPolicyItem(action, addr, mask, fromPort, toPort);
-}
-
-/** Adds a new QTreeWidget item to the exit policy list */
-void
-ServerPage::addPolicyItem(QString action, QString address, QString mask,
-                          QString fromPort, QString toPort)
-{
   QTreeWidgetItem *newPolicy = new QTreeWidgetItem();
-  
-  newPolicy->setText(COL_ACTION, action);
-  newPolicy->setTextAlignment(COL_ACTION, Qt::AlignCenter);
-  
-  if (!mask.isEmpty()) {
-    address += "/" + mask;
-  }
-  newPolicy->setText(COL_ADDRESS, address);
-  newPolicy->setTextAlignment(COL_ADDRESS, Qt::AlignCenter);
-
-  if (!fromPort.isEmpty()) {
-    if (!toPort.isEmpty() && fromPort != "*") {
-      fromPort += "-" + toPort;
-    }
-  } else {
-    fromPort = "*";
-  }
-
-  newPolicy->setText(COL_PORT, fromPort);
-  newPolicy->setTextAlignment(COL_PORT, Qt::AlignCenter);
-
+
+  newPolicy->setText(COL_ACTION,  policy.action());
+  newPolicy->setText(COL_ADDRESS, policy.address());
+  newPolicy->setText(COL_PORT,    policy.ports());
+  
   ui.lstExitPolicies->addTopLevelItem(newPolicy);
 }

trunk/src/gui/config/serverpage.h

@@ -71 +71 @@
   int selectedIndex();
   /** Adds a new exit policy to the exit policy list */
-  void addPolicyItem(QString action, QString address, QString mask,
-                     QString fromPort, QString toPort);
   void addPolicyItem(Policy policy);
   /** Saves the policy specified in item to the exitPolicy */