librdmacm: add rdma_getaddrinfo

diff --git a/trunk/ulp/librdmacm/include/rdma/rdma_cma.h b/trunk/ulp/librdmacm/include/rdma/rdma_cma.h
index 294a75b0c0be0282bf44b293a43eda2b04da49cc..2ef286895d923ff3ebef3c67289cbf01214454aa 100644 (file)
--- a/trunk/ulp/librdmacm/include/rdma/rdma_cma.h
+++ b/trunk/ulp/librdmacm/include/rdma/rdma_cma.h
@@ -188,6 +188,26 @@ struct rdma_cm_event
        }       param;\r
 };\r
 \r
+#define RAI_PASSIVE            0x00000001\r
+\r
+struct rdma_addrinfo {\r
+       int                                             ai_flags;\r
+       int                                             ai_family;\r
+       int                                             ai_qp_type;\r
+       int                                             ai_port_space;\r
+       socklen_t                               ai_src_len;\r
+       socklen_t                               ai_dst_len;\r
+       struct sockaddr                 *ai_src_addr;\r
+       struct sockaddr                 *ai_dst_addr;\r
+       char                                    *ai_src_canonname;\r
+       char                                    *ai_dst_canonname;\r
+       size_t                                  ai_route_len;\r
+       void                                    *ai_route;\r
+       size_t                                  ai_connect_len;\r
+       void                                    *ai_connect;\r
+       struct rdma_addrinfo    *ai_next;\r
+};\r
+\r
 /**\r
  * rdma_create_event_channel - Open a channel used to report communication events.\r
  * Description:\r
@@ -639,6 +659,15 @@ int rdma_set_option(struct rdma_cm_id *id, int level, int optname,
 __declspec(dllexport)\r
 int rdma_migrate_id(struct rdma_cm_id *id, struct rdma_event_channel *channel);\r
 \r
+/**\r
+ * rdma_getaddrinfo - RDMA address and route resolution service.\r
+ */\r
+int rdma_getaddrinfo(char *node, char *service,\r
+                                        struct rdma_addrinfo *hints,\r
+                                        struct rdma_addrinfo **res);\r
+\r
+void rdma_freeaddrinfo(struct rdma_addrinfo *res);\r
+\r
 __declspec(dllexport)\r
 int rdmaw_wsa_errno(int wsa_err);\r
 \r

diff --git a/trunk/ulp/librdmacm/src/Sources b/trunk/ulp/librdmacm/src/Sources
index 6a8418a0b1293ecf00264bdb8abafbf046ca12bc..4a98afa346c35f87abce2a95ee4f3b66e4d55ba7 100644 (file)
--- a/trunk/ulp/librdmacm/src/Sources
+++ b/trunk/ulp/librdmacm/src/Sources
@@ -19,7 +19,8 @@ USE_MSVCRT = 1
 SOURCES =                      \\r
        cma.rc                  \\r
        cma_main.cpp    \\r
-       cma.cpp\r
+       cma.cpp                 \\r
+       addrinfo.c\r
 \r
 INCLUDES = ..\include;..\..\..\inc;..\..\..\inc\user;..\..\libibverbs\include;\\r
                   ..\..\..\inc\user\linux;\r

diff --git a/trunk/ulp/librdmacm/src/addrinfo.cpp b/trunk/ulp/librdmacm/src/addrinfo.cpp
new file mode 100644 (file)
index 0000000..f40503b
--- /dev/null
+++ b/trunk/ulp/librdmacm/src/addrinfo.cpp
@@ -0,0 +1,209 @@
+/*\r
+ * Copyright (c) 2010 Intel Corporation.  All rights reserved.\r
+ *\r
+ * This software is available to you under a choice of one of two\r
+ * licenses.  You may choose to be licensed under the terms of the GNU\r
+ * General Public License (GPL) Version 2, available from the file\r
+ * COPYING in the main directory of this source tree, or the\r
+ * OpenIB.org BSD license below:\r
+ *\r
+ *     Redistribution and use in source and binary forms, with or\r
+ *     without modification, are permitted provided that the following\r
+ *     conditions are met:\r
+ *\r
+ *      - Redistributions of source code must retain the above\r
+ *        copyright notice, this list of conditions and the following\r
+ *        disclaimer.\r
+ *\r
+ *      - Redistributions in binary form must reproduce the above\r
+ *        copyright notice, this list of conditions and the following\r
+ *        disclaimer in the documentation and/or other materials\r
+ *        provided with the distribution.\r
+ *\r
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\r
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\r
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\r
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS\r
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN\r
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\r
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\r
+ * SOFTWARE.\r
+ */\r
+\r
+#if HAVE_CONFIG_H\r
+#  include <config.h>\r
+#endif /* HAVE_CONFIG_H */\r
+\r
+#include <windows.h>\r
+#include <winsock2.h>\r
+\r
+#include "cma.h"\r
+#include <rdma/rdma_cma.h>\r
+#include <rdma/rdma_verbs.h>\r
+\r
+static void ucma_convert_to_ai(struct addrinfo *ai, struct rdma_addrinfo *rai)\r
+{\r
+       memset(ai, 0, sizeof *ai);\r
+       ai->ai_flags = rai->ai_flags;\r
+       ai->ai_family = rai->ai_family;\r
+\r
+       switch (rai->ai_qp_type) {\r
+       case IBV_QPT_RC:\r
+               ai->ai_socktype = SOCK_STREAM;\r
+               break;\r
+       case IBV_QPT_UD:\r
+               ai->ai_socktype = SOCK_DGRAM;\r
+               break;\r
+       }\r
+\r
+       switch (rai->ai_port_space) {\r
+       case RDMA_PS_TCP:\r
+               ai->ai_protocol = IPPROTO_TCP;\r
+               break;\r
+       case RDMA_PS_IPOIB:\r
+       case RDMA_PS_UDP:\r
+               ai->ai_protocol = IPPROTO_UDP;\r
+               break;\r
+       }\r
+\r
+       if (rai->ai_flags & RAI_PASSIVE) {\r
+               ai->ai_addrlen = rai->ai_src_len;\r
+               ai->ai_addr = rai->ai_src_addr;\r
+       } else {\r
+               ai->ai_addrlen = rai->ai_dst_len;\r
+               ai->ai_addr = rai->ai_dst_addr;\r
+       }\r
+       ai->ai_canonname = rai->ai_dst_canonname;\r
+       ai->ai_next = NULL;\r
+}\r
+\r
+static int ucma_convert_to_rai(struct rdma_addrinfo *rai, struct addrinfo *ai)\r
+{\r
+       struct sockaddr *addr;\r
+       char *canonname;\r
+\r
+       memset(rai, 0, sizeof *rai);\r
+       rai->ai_flags = ai->ai_flags;\r
+       rai->ai_family = ai->ai_family;\r
+\r
+       switch (ai->ai_socktype) {\r
+       case SOCK_STREAM:\r
+               rai->ai_qp_type = IBV_QPT_RC;\r
+               break;\r
+       case SOCK_DGRAM:\r
+               rai->ai_qp_type = IBV_QPT_UD;\r
+               break;\r
+       }\r
+\r
+       switch (ai->ai_protocol) {\r
+       case IPPROTO_TCP:\r
+               rai->ai_port_space = RDMA_PS_TCP;\r
+               break;\r
+       case IPPROTO_UDP:\r
+               rai->ai_port_space = RDMA_PS_UDP;\r
+               break;\r
+       }\r
+\r
+       addr = (struct sockaddr *) malloc(ai->ai_addrlen);\r
+       if (!addr)\r
+               return rdma_seterrno(ENOMEM);\r
+\r
+       canonname = (char *) (ai->ai_canonname ? malloc(strlen(ai->ai_canonname) + 1) : NULL);\r
+       if (canonname)\r
+               strcpy(canonname, ai->ai_canonname);\r
+\r
+       memcpy(addr, ai->ai_addr, ai->ai_addrlen);\r
+       if (ai->ai_flags & RAI_PASSIVE) {\r
+               rai->ai_src_addr = addr;\r
+               rai->ai_src_len = ai->ai_addrlen;\r
+               rai->ai_src_canonname = canonname;\r
+       } else {\r
+               rai->ai_dst_addr = addr;\r
+               rai->ai_dst_len = ai->ai_addrlen;\r
+               rai->ai_dst_canonname = canonname;\r
+       }\r
+\r
+       return 0;\r
+}\r
+\r
+int rdma_getaddrinfo(char *node, char *service,\r
+                                        struct rdma_addrinfo *hints,\r
+                                        struct rdma_addrinfo **res)\r
+{\r
+       struct rdma_addrinfo *rai;\r
+       struct addrinfo ai_hints;\r
+       struct addrinfo *ai;\r
+       int ret;\r
+\r
+       if (hints)\r
+               ucma_convert_to_ai(&ai_hints, hints);\r
+\r
+       ret = getaddrinfo(node, service, &ai_hints, &ai);\r
+       if (ret)\r
+               return ret;\r
+\r
+       rai = (struct rdma_addrinfo *) malloc(sizeof(*rai));\r
+       if (!rai) {\r
+               ret = rdma_seterrno(ENOMEM);\r
+               goto err1;\r
+       }\r
+\r
+       ret = ucma_convert_to_rai(rai, ai);\r
+       if (ret)\r
+               goto err2;\r
+\r
+       if (!rai->ai_src_len && hints && hints->ai_src_len) {\r
+               rai->ai_src_addr = (struct sockaddr *) calloc(1, hints->ai_src_len);\r
+               if (!rai->ai_src_addr) {\r
+                       ret = rdma_seterrno(ENOMEM);\r
+                       goto err2;\r
+               }\r
+               memcpy(rai->ai_src_addr, hints->ai_src_addr,\r
+                      hints->ai_src_len);\r
+               rai->ai_src_len = hints->ai_src_len;\r
+       }\r
+\r
+       // requires ib acm support --\r
+       //if (!(rai->ai_flags & RAI_PASSIVE))\r
+       //      ucma_ib_resolve(rai);\r
+\r
+       freeaddrinfo(ai);\r
+       *res = rai;\r
+       return 0;\r
+\r
+err2:\r
+       rdma_freeaddrinfo(rai);\r
+err1:\r
+       freeaddrinfo(ai);\r
+       return ret;\r
+}\r
+\r
+void rdma_freeaddrinfo(struct rdma_addrinfo *res)\r
+{\r
+       struct rdma_addrinfo *rai;\r
+\r
+       while (res) {\r
+               rai = res;\r
+               res = res->ai_next;\r
+\r
+               if (rai->ai_connect)\r
+                       free(rai->ai_connect);\r
+\r
+               if (rai->ai_route)\r
+                       free(rai->ai_route);\r
+\r
+               if (rai->ai_src_canonname)\r
+                       free(rai->ai_src_canonname);\r
+\r
+               if (rai->ai_dst_canonname)\r
+                       free(rai->ai_dst_canonname);\r
+\r
+               if (rai->ai_src_addr)\r
+                       free(rai->ai_src_addr);\r
+\r
+               if (rai->ai_dst_addr)\r
+                       free(rai->ai_dst_addr);\r
+\r
+               free(rai);\r
+       }\r
+}\r

diff --git a/trunk/ulp/librdmacm/src/cma_exports.src b/trunk/ulp/librdmacm/src/cma_exports.src
index a8fe8f312ab538f124133d9bbb261d9c0097ae4b..8f370bea1afc32e9e62f3e32cf7d126273feb6e2 100644 (file)
--- a/trunk/ulp/librdmacm/src/cma_exports.src
+++ b/trunk/ulp/librdmacm/src/cma_exports.src
@@ -30,5 +30,7 @@ rdma_free_devices
 rdma_event_str\r
 rdma_set_option\r
 rdma_migrate_id\r
+rdma_getaddrinfo\r
+rdma_freeaddrinfo\r
 rdmaw_wsa_errno\r
 #endif\r