Version: 1
-Previous: 2c404e84a4179a146763db48dc78ccb0ff18db47
-Head: a25924a9e1410116a1c082e3f3ed0079d33ca93a
+Previous: 06003de271d94020edfc9ec787a36ab42e75b99c
+Head: bf6a0d9b1b6912cbd75cdd4ca4ac59da9712dfc9
Applied:
sa_family: 79ecff9afd483c22821eca679e7ed668035ab4c1
af_ib: ed14c624d882d21df3e2d0c022cffab0b7f664b9
ren-copy-rai: a7ae817991416863772d28d97839ee8daeefb07e
- addrinfo-af-ib: f98ce7c3d4d19bb1a3fab5d0adbe97fd6a84e805
- refresh-temp: a25924a9e1410116a1c082e3f3ed0079d33ca93a
+ addrinfo-af-ib: bf6a0d9b1b6912cbd75cdd4ca4ac59da9712dfc9
Unapplied:
addrtype: dd53d1f64d9b219a872c151d3ecfaa3f2eeb252c
dbg-fork: 5679a32af8305db3c0406f9abb961259304a384a
Bottom: 4e01eb8a1c0681cd7bcca9c1bf3502036b929d4b
-Top: 4ce62c6180a5ad6e3d7080ab386b955959166fc1
+Top: 53f00af95df12c3aa07ab0835c666a9645b86b7f
Author: Sean Hefty <sean.hefty@intel.com>
Date: 2012-08-28 12:33:04 -0700
Address family for the source and destination address. Supported families
are: AF_INET, AF_INET6, and AF_IB.
diff --git a/src/addrinfo.c b/src/addrinfo.c
-index 2da35f0..c729720 100755
+index 2da35f0..01c04d1 100755
--- a/src/addrinfo.c
+++ b/src/addrinfo.c
-@@ -99,11 +99,44 @@ static void ucma_convert_to_ai(struct addrinfo *ai, struct rdma_addrinfo *rai)
+@@ -56,9 +56,12 @@
+ static void ucma_convert_to_ai(struct addrinfo *ai, struct rdma_addrinfo *rai)
+ {
+ memset(ai, 0, sizeof *ai);
+- ai->ai_flags = (rai->ai_flags & RAI_PASSIVE) ? AI_PASSIVE : 0;
+- ai->ai_flags |= (rai->ai_flags & RAI_NUMERICHOST) ? AI_NUMERICHOST : 0;
+- ai->ai_family = rai->ai_family;
++ if (rai->ai_flags & RAI_PASSIVE)
++ ai->ai_flags = AI_PASSIVE;
++ if (rai->ai_flags & RAI_NUMERICHOST)
++ ai->ai_flags |= AI_NUMERICHOST;
++ if (rai->ai_family != AF_IB)
++ ai->ai_family = rai->ai_family;
+
+ switch (rai->ai_qp_type) {
+ case IBV_QPT_RC:
+@@ -99,11 +102,44 @@ static void ucma_convert_to_ai(struct addrinfo *ai, struct rdma_addrinfo *rai)
ai->ai_next = NULL;
}
rai->ai_family = ai->ai_family;
-@@ -133,24 +166,36 @@ static int ucma_convert_to_rai(struct rdma_addrinfo *rai,
+@@ -133,24 +169,36 @@ static int ucma_convert_to_rai(struct rdma_addrinfo *rai,
}
}
}
static int ucma_convert_gai(char *node, char *service,
-@@ -178,18 +223,6 @@ static int ucma_convert_gai(char *node, char *service,
+@@ -178,18 +226,6 @@ static int ucma_convert_gai(char *node, char *service,
return ret;
}
int rdma_getaddrinfo(char *node, char *service,
struct rdma_addrinfo *hints,
struct rdma_addrinfo **res)
-@@ -216,16 +249,16 @@ int rdma_getaddrinfo(char *node, char *service,
+@@ -216,16 +252,16 @@ int rdma_getaddrinfo(char *node, char *service,
rai->ai_qp_type = hints->ai_qp_type;
rai->ai_port_space = hints->ai_port_space;
if (hints->ai_dst_len) {
+++ /dev/null
-Bottom: 4ce62c6180a5ad6e3d7080ab386b955959166fc1
-Top: 53f00af95df12c3aa07ab0835c666a9645b86b7f
-Author: Sean Hefty <sean.hefty@intel.com>
-Date: 2012-08-29 16:14:48 -0700
-
-Refresh of addrinfo-af-ib
-
----
-
-diff --git a/src/addrinfo.c b/src/addrinfo.c
-index c729720..01c04d1 100755
---- a/src/addrinfo.c
-+++ b/src/addrinfo.c
-@@ -56,9 +56,12 @@
- static void ucma_convert_to_ai(struct addrinfo *ai, struct rdma_addrinfo *rai)
- {
- memset(ai, 0, sizeof *ai);
-- ai->ai_flags = (rai->ai_flags & RAI_PASSIVE) ? AI_PASSIVE : 0;
-- ai->ai_flags |= (rai->ai_flags & RAI_NUMERICHOST) ? AI_NUMERICHOST : 0;
-- ai->ai_family = rai->ai_family;
-+ if (rai->ai_flags & RAI_PASSIVE)
-+ ai->ai_flags = AI_PASSIVE;
-+ if (rai->ai_flags & RAI_NUMERICHOST)
-+ ai->ai_flags |= AI_NUMERICHOST;
-+ if (rai->ai_family != AF_IB)
-+ ai->ai_family = rai->ai_family;
-
- switch (rai->ai_qp_type) {
- case IBV_QPT_RC: