winverbs: fix API issues

The FwVersion should be UINT64, not a 64-byte array.
The Lookup() method needs the remote address as input.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
git-svn-id: svn://openib.tc.cornell.edu/gen1@1070 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/branches/winverbs/core/winverbs/user/wv_device.cpp b/branches/winverbs/core/winverbs/user/wv_device.cpp
index 7eb7fdeac8505e5520b92fa4c79ede34430e8d9d..6c04b326e26d32ca214e39b0598bf58bd3a7e10a 100644 (file)
--- a/branches/winverbs/core/winverbs/user/wv_device.cpp
+++ b/branches/winverbs/core/winverbs/user/wv_device.cpp
@@ -203,7 +203,7 @@ Query(WV_DEVICE_ATTRIBUTES* pAttributes)
                return HRESULT_FROM_WIN32(GetLastError());\r
        }\r
 \r
-       RtlCopyMemory(pAttributes->FwVersion, attr.FwVersion, 64);\r
+       pAttributes->FwVersion = attr.FwVersion;\r
        pAttributes->NodeGuid = attr.NodeGuid;\r
        pAttributes->SystemImageGuid = attr.SystemImageGuid;\r
        pAttributes->VendorId = attr.VendorId;\r

diff --git a/branches/winverbs/core/winverbs/user/wv_ep.cpp b/branches/winverbs/core/winverbs/user/wv_ep.cpp
index a9a1fa36cab7aa448ca4bad502c27739e58c58ab..08aa587a7ff0b74bef956ed6aa85d93b7b91060a 100644 (file)
--- a/branches/winverbs/core/winverbs/user/wv_ep.cpp
+++ b/branches/winverbs/core/winverbs/user/wv_ep.cpp
@@ -243,8 +243,10 @@ Reject(const VOID* pPrivateData, SIZE_T PrivateDataLength)
 }\r
 \r
 STDMETHODIMP CWVDatagramEndpoint::\r
-Lookup(const VOID* pPrivateData, SIZE_T PrivateDataLength, OVERLAPPED* pOverlapped)\r
+Lookup(const struct sockaddr* pAddress, const VOID* pPrivateData,\r
+          SIZE_T PrivateDataLength, OVERLAPPED* pOverlapped)\r
 {\r
+       UNREFERENCED_PARAMETER(pAddress);\r
        UNREFERENCED_PARAMETER(pPrivateData);\r
        UNREFERENCED_PARAMETER(PrivateDataLength);\r
        UNREFERENCED_PARAMETER(pOverlapped);\r

diff --git a/branches/winverbs/core/winverbs/user/wv_ep.h b/branches/winverbs/core/winverbs/user/wv_ep.h
index 2ffd0e34ba4977fcebea9915308e31922fad1ba7..070fb0342bdfddb164e2223eff1bebc145aec008 100644 (file)
--- a/branches/winverbs/core/winverbs/user/wv_ep.h
+++ b/branches/winverbs/core/winverbs/user/wv_ep.h
@@ -110,8 +110,8 @@ public:
        STDMETHODIMP Reject(const VOID* pPrivateData, SIZE_T PrivateDataLength);\r
 \r
        // IWVDatagramEndpoint methods\r
-       STDMETHODIMP Lookup(const VOID* pPrivateData, SIZE_T PrivateDataLength,\r
-                                               OVERLAPPED* pOverlapped);\r
+       STDMETHODIMP Lookup(const struct sockaddr* pAddress, const VOID* pPrivateData,\r
+                                               SIZE_T PrivateDataLength, OVERLAPPED* pOverlapped);\r
        STDMETHODIMP Accept(WV_DATAGRAM_PARAM* pParam, OVERLAPPED* pOverlapped);\r
        STDMETHODIMP JoinMulticast(const struct sockaddr* pAddress,\r
                                                           OVERLAPPED* pOverlapped);\r

diff --git a/branches/winverbs/inc/user/rdma/winverbs.h b/branches/winverbs/inc/user/rdma/winverbs.h
index 43dde3970e93d82aed36cd60012e03ec99026b1c..87f5b938d676b63db6692af678efb0548818061f 100644 (file)
--- a/branches/winverbs/inc/user/rdma/winverbs.h
+++ b/branches/winverbs/inc/user/rdma/winverbs.h
@@ -71,7 +71,7 @@ typedef enum _WV_ATOMIC_CAPABILITIES
 \r
 typedef struct _WV_DEVICE_ATTRIBUTES\r
 {\r
-       UINT8                                   FwVersion[64];\r
+       UINT64                                  FwVersion;\r
        UINT64                                  NodeGuid;\r
        UINT64                                  SystemImageGuid;\r
        UINT32                                  VendorId;\r
@@ -1173,6 +1173,7 @@ DECLARE_INTERFACE_(IWVDatagramEndpoint, IWVEndpoint)
        // IWVDatagramEndpoint methods\r
        STDMETHOD(Lookup)(\r
                THIS_\r
+               __in const struct sockaddr* pAddress,\r
                __in_bcount_opt(PrivateDataLength) const VOID* pPrivateData,\r
                __in SIZE_T PrivateDataLength,\r
                __in OVERLAPPED* pOverlapped\r