TransportAddressPair-based peer address provisioning functionality

removed as it is not really needed given the availability of
transportDomain information

2 files changed, 0 insertions, 14 deletions

diff --git a/pysnmp/carrier/asynsock/dgram/base.py b/pysnmp/carrier/asynsock/dgram/base.py
index 2fc60d3..fb63a68 100644
--- a/pysnmp/carrier/asynsock/dgram/base.py
+++ b/pysnmp/carrier/asynsock/dgram/base.py
@@ -1,7 +1,6 @@
 # Implements asyncore-based generic DGRAM transport
 import socket, errno, sys
 from pysnmp.carrier.asynsock.base import AbstractSocketTransport
-from pysnmp.carrier.address import TransportAddressPair
 from pysnmp.carrier import error
 from pysnmp import debug
 
@@ -52,8 +51,6 @@ class DgramSocketTransport(AbstractSocketTransport):
     def writable(self): return self.__outQueue
     def handle_write(self):
         outgoingMessage, transportAddress = self.__outQueue.pop()
-        if isinstance(transportAddress, TransportAddressPair):
-            transportAddress = transportAddress.getRemoteAddr()
         debug.logger & debug.flagIO and debug.logger('handle_write: transportAddress %r -> %r outgoingMessage %s' % (self.socket.getsockname(), transportAddress, debug.hexdump(outgoingMessage)))
         if not transportAddress:
             debug.logger & debug.flagIO and debug.logger('handle_write: missing dst address, loosing outgoing msg')
@@ -71,10 +68,6 @@ class DgramSocketTransport(AbstractSocketTransport):
         try:
             incomingMessage, transportAddress = self.socket.recvfrom(65535)
             debug.logger & debug.flagIO and debug.logger('handle_read: transportAddress %r -> %r incomingMessage %s' % (transportAddress, self.socket.getsockname(), debug.hexdump(incomingMessage)))
-            transportAddress = TransportAddressPair(
-                                   self.socket.getsockname(),
-                                   transportAddress
-                               )
             if not incomingMessage:
                 self.handle_close()
                 return
diff --git a/pysnmp/carrier/twisted/dgram/base.py b/pysnmp/carrier/twisted/dgram/base.py
index 5fff873..10bc6e9 100644
--- a/pysnmp/carrier/twisted/dgram/base.py
+++ b/pysnmp/carrier/twisted/dgram/base.py
@@ -3,7 +3,6 @@ import sys
 from twisted.internet.protocol import DatagramProtocol
 from twisted.internet import reactor
 from pysnmp.carrier.twisted.base import AbstractTwistedTransport
-from pysnmp.carrier.address import TransportAddressPair
 from pysnmp.carrier import error
 from pysnmp import debug
 
@@ -16,8 +15,6 @@ class DgramTwistedTransport(DatagramProtocol, AbstractTwistedTransport):
         if self._cbFun is None:
             raise error.CarrierError('Unable to call cbFun')
         else:
-            # XXX fetch local endpoint from Twisted
-            transportAddress = TransportAddressPair(None, transportAddress)
             # Callback fun is called through callLater() in attempt
             # to make Twisted timed calls work under high load.
             reactor.callLater(0, self._cbFun, self, transportAddress, datagram)
@@ -26,8 +23,6 @@ class DgramTwistedTransport(DatagramProtocol, AbstractTwistedTransport):
         debug.logger & debug.flagIO and debug.logger('startProtocol: invoked')
         while self._writeQ:
             outgoingMessage, transportAddress = self._writeQ.pop(0)
-            if isinstance(transportAddress, TransportAddressPair):
-                transportAddress = transportAddress.getRemoteAddr()
             debug.logger & debug.flagIO and debug.logger('startProtocol: transportAddress %r outgoingMessage %s' % (transportAddress, debug.hexdump(outgoingMessage)))
             try:
                 self.transport.write(outgoingMessage, transportAddress)
@@ -43,8 +38,6 @@ class DgramTwistedTransport(DatagramProtocol, AbstractTwistedTransport):
         if self.transport is None:
             self._writeQ.append((outgoingMessage, transportAddress))
         else:
-            if isinstance(transportAddress, TransportAddressPair):
-                transportAddress = transportAddress.getRemoteAddr()
             try:
                 self.transport.write(outgoingMessage, transportAddress)
             except Exception: