summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Etingof <etingof@gmail.com>2019-01-12 00:03:50 +0100
committerIlya Etingof <etingof@gmail.com>2019-01-12 00:03:50 +0100
commit1f52f82d7434e709d4663d8f295a4eac948ac5bd (patch)
tree1dca65162c6c296c403c1956eefb0df83b4cced3
parentb8638ff65bffaef0f1959a4a5b3e7720d643bade (diff)
downloadpysnmp-git-1f52f82d7434e709d4663d8f295a4eac948ac5bd.tar.gz
Do not set IP_PKTINFO socket option on IPv6 socket
Trying to understand why sendmsg() fails on a transparent IPv6 socket
-rw-r--r--pysnmp/carrier/asyncore/dgram/base.py3
-rw-r--r--pysnmp/carrier/sockmsg.py4
2 files changed, 3 insertions, 4 deletions
diff --git a/pysnmp/carrier/asyncore/dgram/base.py b/pysnmp/carrier/asyncore/dgram/base.py
index f72fe57c..3e9ea129 100644
--- a/pysnmp/carrier/asyncore/dgram/base.py
+++ b/pysnmp/carrier/asyncore/dgram/base.py
@@ -73,12 +73,11 @@ class DgramSocketTransport(AbstractSocketTransport):
raise error.CarrierError('sendmsg()/recvmsg() interface is not supported by this OS and/or Python version')
try:
- if self.socket.family in (socket.AF_INET, socket.AF_INET6):
+ 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_V6ONLY, int(not flag))
except socket.error:
raise error.CarrierError('setsockopt() for %s failed: %s' % (self.socket.family == socket.AF_INET6 and "IPV6_RECVPKTINFO" or "IP_PKTINFO", sys.exc_info()[1]))
diff --git a/pysnmp/carrier/sockmsg.py b/pysnmp/carrier/sockmsg.py
index 909407a9..4ff55a91 100644
--- a/pysnmp/carrier/sockmsg.py
+++ b/pysnmp/carrier/sockmsg.py
@@ -121,8 +121,8 @@ else:
ancdata = [(socket.SOL_IPV6, socket.IPV6_PKTINFO, memoryview(_f).tobytes())]
debug.logger & debug.flagIO and debug.logger(
- 'sendto: sending %d octets to %s; '
- 'iov blob %r' % (len(data), _to, ancdata))
+ 'sendto: sending %d octets to %s; address %r; '
+ 'iov blob %r' % (len(_data), _to, addr, ancdata))
return s.sendmsg([_data], ancdata, 0, _to)