Tweaked nbd_client.py to properly handle handshake and transport flag…

…s in new handshake protocol

Signed-off-by: Waldemar Kozaczuk <[email protected]>

scripts/nbd_client.py

@@ -66,15 +66,17 @@ def _old_style_handshake(self, magic):
     def _new_style_handshake(self, magic):
         assert(magic == 0x49484156454F5054) # Should have received IHAVEOPT
         buf = self._s.recv(2)
-        (self._flags) = struct.unpack(">H", buf)
+        (handshake_flags,) = struct.unpack(">H", buf)
+
         client_flags = struct.pack('>L', 0)
         self._s.send(client_flags)
 
         options = struct.pack('>QLL', 0x49484156454F5054, 1, 0)
         self._s.send(options)
 
         buf = self._s.recv(8 + 2)
-        (self._size, self._flags) = struct.unpack(">QH", buf)
+        (self._size, transport_flags) = struct.unpack(">QH", buf)
+        self._flags = (handshake_flags << 16) + transport_flags
 
         # ignore trailing zeroes
         self._s.recv(124)