Changeset 187

Timestamp:

07/30/12 19:12:37 (12 years ago)

Author:

atzm

Message:

• refactoring

File:

• etherws/trunk/etherws.py (modified) (4 diffs)

etherws/trunk/etherws.py

@@ -179 +179 @@
     def register_port(self, interface):
         try:
-            interface._switch_portnum = self._next  # XXX
+            self._set_privattr('portnum', interface, self._next)  # XXX
             self._table[self._next] = SwitchPort(self._next, interface)
             return self._next
@@ -186 +186 @@
 
     def unregister_port(self, interface):
-        self._fdb.delete(self._table[interface._switch_portnum])
-        del self._table[interface._switch_portnum]
-        del interface._switch_portnum
+        portnum = self._get_privattr('portnum', interface)
+        self._del_privattr('portnum', interface)
+        self._fdb.delete(self._table[portnum])
+        del self._table[portnum]
 
     def send(self, dst_interfaces, frame):
-        ports = sorted((self._table[i._switch_portnum] for i in dst_interfaces
-                        if not self._table[i._switch_portnum].shut),
-                       cmp=SwitchPort.cmp_by_number)
+        portnums = (self._get_privattr('portnum', i) for i in dst_interfaces)
+        ports = (self._table[n] for n in portnums)
+        ports = (p for p in ports if not p.shut)
+        ports = sorted(ports, cmp=SwitchPort.cmp_by_number)
 
         for p in ports:
@@ -207 +209 @@
 
     def receive(self, src_interface, frame):
-        port = self._table[src_interface._switch_portnum]
+        port = self._table[self._get_privattr('portnum', src_interface)]
 
         if not port.shut:
@@ -225 +227 @@
                     return
 
-            ports = set(self._table.itervalues()) - set([src_port])
+            ports = set(self.portlist) - set([src_port])
             self.send((p.interface for p in ports), frame)
 
         except:  # ex. received invalid frame
             traceback.print_exc()
+
+    def _privattr(self, name):
+        return '_%s_%s_%s' % (self.__class__.__name__, id(self), name)
+
+    def _set_privattr(self, name, obj, value):
+        return setattr(obj, self._privattr(name), value)
+
+    def _get_privattr(self, name, obj, defaults=None):
+        return getattr(obj, self._privattr(name), defaults)
+
+    def _del_privattr(self, name, obj):
+        return delattr(obj, self._privattr(name))