Change in vdsm[master]: jsonrpc: make TCPReactor IPv6 capable
mhuntxu at gmail.com
mhuntxu at gmail.com
Tue Feb 5 12:07:43 UTC 2013
Hunt Xu has uploaded a new change for review.
Change subject: jsonrpc: make TCPReactor IPv6 capable
......................................................................
jsonrpc: make TCPReactor IPv6 capable
Change-Id: I108c3f804476ace8b9b1f0c5cca3f9b196d1163b
Signed-off-by: huntxu <mhuntxu at gmail.com>
---
M vdsm_api/jsonrpc/client.py
M vdsm_api/jsonrpc/tcpReactor.py
2 files changed, 10 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/40/11740/1
diff --git a/vdsm_api/jsonrpc/client.py b/vdsm_api/jsonrpc/client.py
index 0975f64..e641f0f 100644
--- a/vdsm_api/jsonrpc/client.py
+++ b/vdsm_api/jsonrpc/client.py
@@ -6,6 +6,8 @@
JsonRpcError, \
tcpReactor
+from vdsm import utils
+
proton = None
try:
@@ -49,7 +51,10 @@
class TCPReactorClient(object):
def __init__(self, address):
- self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ family = socket.AF_INET
+ if utils.isIPv6Address(address):
+ family = socket.AF_INET6
+ self.sock = socket.socket(family, socket.SOCK_STREAM)
self.address = address
def connect(self):
diff --git a/vdsm_api/jsonrpc/tcpReactor.py b/vdsm_api/jsonrpc/tcpReactor.py
index a9cf40c..9789627 100644
--- a/vdsm_api/jsonrpc/tcpReactor.py
+++ b/vdsm_api/jsonrpc/tcpReactor.py
@@ -100,7 +100,10 @@
log = logging.getLogger("jsonrpc.TCPReactor")
def __init__(self, address, messageHandler):
- self._sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ family = socket.AF_INET
+ if utils.isIPv6Address(address):
+ family = socket.AF_INET6
+ self._sock = socket.socket(family, socket.SOCK_STREAM)
self._addr = address
self._messageHandler = messageHandler
self._inputEvent = utils.PollEvent()
--
To view, visit http://gerrit.ovirt.org/11740
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I108c3f804476ace8b9b1f0c5cca3f9b196d1163b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Hunt Xu <mhuntxu at gmail.com>
More information about the vdsm-patches
mailing list