Skip to content

Get the correct socket infor in case of ipv6. #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Get the correct socket infor in case of ipv6. #130

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
921a1d2
Get the correct socket infor in case of ipv6.
dmanchon Jan 23, 2017
66d3b64
Extract the logic to extract host and port from socket into a method.
dmanchon Jan 23, 2017
e959489
Typo.
dmanchon Jan 23, 2017
7d96d56
Another silly typo.
dmanchon Jan 23, 2017
9aad3fa
Socket family detection compatible with python 2.x and 3.x.
dmanchon Jan 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions neo4j/bolt/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
from os.path import dirname, isfile, join as path_join, expanduser
from select import select
from socket import create_connection, SHUT_RDWR, error as SocketError
from socket import AF_INET6, AF_INET
from struct import pack as struct_pack, unpack as struct_unpack
from threading import RLock

Expand Down Expand Up @@ -90,13 +91,21 @@
Address = namedtuple("Address", ["host", "port"])
ServerInfo = namedtuple("ServerInfo", ["address", "version"])

def get_host_port(socket):
if socket.family == AF_INET6:
host, port, flowinfo, scopeid = socket.getpeername()
elif socket.family == AF_INET:
host, port = socket.getpeername()
else:
raise ProtocolError("Supported socket address families are only IPv6 and IPv4.")
return host, port

class BufferingSocket(object):

def __init__(self, connection):
self.connection = connection
self.socket = connection.socket
self.address = Address(*self.socket.getpeername())
self.address = Address(*get_host_port(self.socket))
self.buffer = bytearray()

def fill(self):
Expand Down Expand Up @@ -142,7 +151,7 @@ class ChunkChannel(object):

def __init__(self, sock):
self.socket = sock
self.address = Address(*sock.getpeername())
self.address = Address(*get_host_port(self.socket))
self.raw = BytesIO()
self.output_buffer = []
self.output_size = 0
Expand Down Expand Up @@ -221,7 +230,7 @@ class InitResponse(Response):
def on_success(self, metadata):
super(InitResponse, self).on_success(metadata)
connection = self.connection
address = Address(*connection.socket.getpeername())
address = Address(*get_host_port(connection.socket))
version = metadata.get("server")
connection.server = ServerInfo(address, version)

Expand Down