diff options
Diffstat (limited to 'pysnmp/carrier/asyncore/dgram')
| -rw-r--r-- | pysnmp/carrier/asyncore/dgram/base.py | 93 | ||||
| -rw-r--r-- | pysnmp/carrier/asyncore/dgram/udp6.py | 13 | ||||
| -rw-r--r-- | pysnmp/carrier/asyncore/dgram/unix.py | 11 |
3 files changed, 88 insertions, 29 deletions
diff --git a/pysnmp/carrier/asyncore/dgram/base.py b/pysnmp/carrier/asyncore/dgram/base.py index e456da20..06453096 100644 --- a/pysnmp/carrier/asyncore/dgram/base.py +++ b/pysnmp/carrier/asyncore/dgram/base.py @@ -47,16 +47,20 @@ class DgramSocketTransport(AbstractSocketTransport): if iface is not None: try: self.socket.bind(iface) + except socket.error as exc: - raise error.CarrierError( - 'bind() for %s failed: %s' % (iface is None and "<all local>" or iface, exc)) + raise error.CarrierError('bind() for %s failed: %s' % ( + iface is None and "<all local>" or iface, exc)) + return self def openServerMode(self, iface): try: self.socket.bind(iface) + except socket.error as exc: raise error.CarrierError('bind() for %s failed: %s' % (iface, exc)) + return self def enableBroadcast(self, flag=1): @@ -64,30 +68,47 @@ class DgramSocketTransport(AbstractSocketTransport): self.socket.setsockopt( socket.SOL_SOCKET, socket.SO_BROADCAST, flag ) + except socket.error as exc: - raise error.CarrierError('setsockopt() for SO_BROADCAST failed: %s' % exc) - debug.logger & debug.FLAG_IO and debug.logger('enableBroadcast: %s option SO_BROADCAST on socket %s' % (flag and "enabled" or "disabled", self.socket.fileno())) + raise error.CarrierError('setsockopt() for SO_BROADCAST ' + 'failed: %s' % exc) + + debug.logger & debug.FLAG_IO and debug.logger( + 'enableBroadcast: %s option SO_BROADCAST on ' + 'socket %s' % (flag and "enabled" or "disabled", self.socket.fileno())) + return self def enablePktInfo(self, flag=1): if (not hasattr(self.socket, 'sendmsg') or not hasattr(self.socket, 'recvmsg')): - raise error.CarrierError('sendmsg()/recvmsg() interface is not supported by this OS and/or Python version') + raise error.CarrierError( + 'sendmsg()/recvmsg() interface is not supported by this OS ' + 'and/or Python version') try: if self.socket.family == socket.AF_INET: self.socket.setsockopt(socket.SOL_IP, socket.IP_PKTINFO, flag) if self.socket.family == socket.AF_INET6: - self.socket.setsockopt(socket.SOL_IPV6, socket.IPV6_RECVPKTINFO, flag) + self.socket.setsockopt( + socket.SOL_IPV6, socket.IPV6_RECVPKTINFO, flag) except socket.error as exc: - raise error.CarrierError('setsockopt() for %s failed: %s' % (self.socket.family == socket.AF_INET6 and "IPV6_RECVPKTINFO" or "IP_PKTINFO", exc)) + raise error.CarrierError( + 'setsockopt() for %s failed: ' + '%s' % (self.socket.family == socket.AF_INET6 and + "IPV6_RECVPKTINFO" or "IP_PKTINFO", exc)) self._sendto = sockmsg.getSendTo(self.ADDRESS_TYPE) self._recvfrom = sockmsg.getRecvFrom(self.ADDRESS_TYPE) - debug.logger & debug.FLAG_IO and debug.logger('enablePktInfo: %s option %s on socket %s' % (self.socket.family == socket.AF_INET6 and "IPV6_RECVPKTINFO" or "IP_PKTINFO", flag and "enabled" or "disabled", self.socket.fileno())) + debug.logger & debug.FLAG_IO and debug.logger( + 'enablePktInfo: %s option %s on socket ' + '%s' % (self.socket.family == socket.AF_INET6 and "IPV6_RECVPKTINFO" + or "IP_PKTINFO", flag and "enabled" or "disabled", + self.socket.fileno())) + return self def enableTransparent(self, flag=1): @@ -96,25 +117,34 @@ class DgramSocketTransport(AbstractSocketTransport): self.socket.setsockopt( socket.SOL_IP, socket.IP_TRANSPARENT, flag ) + if self.socket.family == socket.AF_INET6: self.socket.setsockopt( socket.SOL_IPV6, socket.IPV6_TRANSPARENT, flag ) except socket.error as exc: - raise error.CarrierError('setsockopt() for IP_TRANSPARENT failed: %s' % exc) + raise error.CarrierError('setsockopt() for IP_TRANSPARENT ' + 'failed: %s' % exc) except OSError: - raise error.CarrierError('IP_TRANSPARENT socket option requires superuser priveleges') + raise error.CarrierError('IP_TRANSPARENT socket option requires ' + 'superuser privileges') + + debug.logger & debug.FLAG_IO and debug.logger( + 'enableTransparent: %s option IP_TRANSPARENT on socket ' + '%s' % (flag and "enabled" or "disabled", self.socket.fileno())) - debug.logger & debug.FLAG_IO and debug.logger('enableTransparent: %s option IP_TRANSPARENT on socket %s' % (flag and "enabled" or "disabled", self.socket.fileno())) return self def sendMessage(self, outgoingMessage, transportAddress): self.__outQueue.append( (outgoingMessage, self.normalizeAddress(transportAddress)) ) - debug.logger & debug.FLAG_IO and debug.logger('sendMessage: outgoingMessage queued (%d octets) %s' % (len(outgoingMessage), debug.hexdump(outgoingMessage))) + + debug.logger & debug.FLAG_IO and debug.logger( + 'sendMessage: outgoingMessage queued (%d octets) %s' % ( + len(outgoingMessage), debug.hexdump(outgoingMessage))) def normalizeAddress(self, transportAddress): if not isinstance(transportAddress, self.ADDRESS_TYPE): @@ -134,6 +164,7 @@ class DgramSocketTransport(AbstractSocketTransport): return '0.0.0.0', 0 # asyncore API + def handle_connect(self): pass @@ -142,40 +173,58 @@ class DgramSocketTransport(AbstractSocketTransport): def handle_write(self): outgoingMessage, transportAddress = self.__outQueue.pop(0) - debug.logger & debug.FLAG_IO and debug.logger('handle_write: transportAddress %r -> %r outgoingMessage (%d octets) %s' % (transportAddress.getLocalAddress(), transportAddress, len(outgoingMessage), debug.hexdump(outgoingMessage))) + + debug.logger & debug.FLAG_IO and debug.logger( + 'handle_write: transportAddress %r -> %r outgoingMessage (%d ' + 'octets) %s' % (transportAddress.getLocalAddress(), transportAddress, + len(outgoingMessage), debug.hexdump(outgoingMessage))) + if not transportAddress: - debug.logger & debug.FLAG_IO and debug.logger('handle_write: missing dst address, loosing outgoing msg') + debug.logger & debug.FLAG_IO and debug.logger( + 'handle_write: missing dst address, loosing outgoing msg') return + try: - self._sendto( - self.socket, outgoingMessage, transportAddress - ) + self._sendto(self.socket, outgoingMessage, transportAddress) + except socket.error as exc: if exc.args[0] in SOCK_ERRORS: - debug.logger & debug.FLAG_IO and debug.logger('handle_write: ignoring socket error %s' % exc) + debug.logger & debug.FLAG_IO and debug.logger( + 'handle_write: ignoring socket error %s' % exc) + else: - raise error.CarrierError('sendto() failed for %s: %s' % (transportAddress, exc)) + raise error.CarrierError( + 'sendto() failed for %s: %s' % (transportAddress, exc)) def readable(self): - return 1 + return True def handle_read(self): try: incomingMessage, transportAddress = self._recvfrom(self.socket, 65535) + transportAddress = self.normalizeAddress(transportAddress) + debug.logger & debug.FLAG_IO and debug.logger( - 'handle_read: transportAddress %r -> %r incomingMessage (%d octets) %s' % (transportAddress, transportAddress.getLocalAddress(), len(incomingMessage), debug.hexdump(incomingMessage))) + 'handle_read: transportAddress %r -> %r incomingMessage (%d ' + 'octets) %s' % (transportAddress, transportAddress.getLocalAddress(), + len(incomingMessage), debug.hexdump(incomingMessage))) + if not incomingMessage: self.handle_close() return + else: self._cbFun(self, transportAddress, incomingMessage) return + except socket.error as exc: if exc.args[0] in SOCK_ERRORS: - debug.logger & debug.FLAG_IO and debug.logger('handle_read: known socket error %s' % exc) + debug.logger & debug.FLAG_IO and debug.logger( + 'handle_read: known socket error %s' % exc) SOCK_ERRORS[exc.args[0]] and self.handle_close() return + else: raise error.CarrierError('recvfrom() failed: %s' % exc) diff --git a/pysnmp/carrier/asyncore/dgram/udp6.py b/pysnmp/carrier/asyncore/dgram/udp6.py index 75d348d6..3207c6ff 100644 --- a/pysnmp/carrier/asyncore/dgram/udp6.py +++ b/pysnmp/carrier/asyncore/dgram/udp6.py @@ -22,17 +22,18 @@ class Udp6SocketTransport(DgramSocketTransport): def normalizeAddress(self, transportAddress): if '%' in transportAddress[0]: # strip zone ID - ta = self.ADDRESS_TYPE((transportAddress[0].split('%')[0], - transportAddress[1], - 0, # flowinfo - 0)) # scopeid + ta = self.ADDRESS_TYPE( + (transportAddress[0].split('%')[0], transportAddress[1], 0, 0)) + else: - ta = self.ADDRESS_TYPE((transportAddress[0], - transportAddress[1], 0, 0)) + ta = self.ADDRESS_TYPE( + (transportAddress[0], transportAddress[1], 0, 0)) if (isinstance(transportAddress, self.ADDRESS_TYPE) and transportAddress.getLocalAddress()): + return ta.setLocalAddress(transportAddress.getLocalAddress()) + else: return ta.setLocalAddress(self.getLocalAddress()) diff --git a/pysnmp/carrier/asyncore/dgram/unix.py b/pysnmp/carrier/asyncore/dgram/unix.py index 0f68f962..b5233844 100644 --- a/pysnmp/carrier/asyncore/dgram/unix.py +++ b/pysnmp/carrier/asyncore/dgram/unix.py @@ -9,6 +9,7 @@ import random try: from socket import AF_UNIX + except ImportError: AF_UNIX = None @@ -33,14 +34,20 @@ class UnixSocketTransport(DgramSocketTransport): if iface is None: # UNIX domain sockets must be explicitly bound iface = '' + while len(iface) < 8: iface += chr(random.randrange(65, 91)) iface += chr(random.randrange(97, 123)) - iface = os.path.sep + 'tmp' + os.path.sep + 'pysnmp' + iface + + iface = os.path.join(os.path.sep, 'tmp', 'pysnmp', iface) + if os.path.exists(iface): os.remove(iface) + DgramSocketTransport.openClientMode(self, iface) + self._iface = iface + return self def openServerMode(self, iface): @@ -50,8 +57,10 @@ class UnixSocketTransport(DgramSocketTransport): def closeTransport(self): DgramSocketTransport.closeTransport(self) + try: os.remove(self._iface) + except OSError: pass |