refresh

diff --git a/meta b/meta
index c74330ef798d2d1ac79b8cc850014365c337ada8..51e931164cae419e8c045b8091d9ed3500ab327e 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 4edf768880d11e799d5fcc3c6c3900d6117b6671
-Head: baa3e4679659ac8d25758fe5d95e29e2f3700d15
+Previous: 1254274cea250259f846cd2c1f911dd02549fda5
+Head: 7744a2280e5e691d93c2f61c0f24e5d8270666cc
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -17,8 +17,7 @@ Applied:
   acme_dest: b7ec8fce4adac1b6e970529e41ff1c936f4be27b
   show_err: 47d8e33e2f36df1e3b163fcf7e8b0b56604fb944
   mult_dest: 1c8469be405d19304d47fcaf95e7d4aec574a6fc
-  addrinfo: f0a81ba60f26fef446d70629bc0bea25de83e973
-  refresh-temp: baa3e4679659ac8d25758fe5d95e29e2f3700d15
+  addrinfo: 7744a2280e5e691d93c2f61c0f24e5d8270666cc
 Unapplied:
   1.0.4: dc3f68d964641c9ffea14558d6a236c4216a89ae
 Hidden:

diff --git a/patches/addrinfo b/patches/addrinfo
index 2e0b43e89666cc07dfa9866f456dbfc6ba671707..fa3235f481867ecb7bc48b07656f955fa5c40500 100644 (file)
--- a/patches/addrinfo
+++ b/patches/addrinfo
@@ -1,5 +1,5 @@
 Bottom: ad882cbf5ccb5b39d50b3d141607e262852a2abd
-Top:    17081f2d187536d1e27e7772e7b9141334fc2e07
+Top:    0edd0ef0f737d3e2c9d2efa715be0562fe412a07
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-07 13:44:44 -0800
 
@@ -52,7 +52,7 @@ index 91d959d..e5256a0 100644
  address can be an IP address, system network name, or LID, as indicated by\r
  the addr_format option.\r
 diff --git a/src/acme.c b/src/acme.c
-index 6aa256a..727222c 100644
+index 6aa256a..d982b0d 100644
 --- a/src/acme.c
 +++ b/src/acme.c
 @@ -67,10 +67,10 @@ extern char **parse(char *args, int *count);
@@ -69,3 +69,44 @@ index 6aa256a..727222c 100644
        printf("   [-v]             - verify ACM response against SA query response\n");
        printf("   [-c]             - read ACM cached data only\n");
        printf("usage 2: %s\n", program);
+@@ -513,6 +513,40 @@ static int verify_resolve(struct ibv_path_record *path)
+       return ret;
+ }
+ 
++static char *get_dest(char *arg)
++{
++      static char addr[64];
++      struct addrinfo hint, *res;
++      char *ai;
++      int ret;
++
++      if (!arg || addr_type != 'u') {
++              return arg;
++      }
++
++      if ((inet_pton(AF_INET, arg, addr) > 0) ||
++          (inet_pton(AF_INET6, arg, addr) > 0) {
++              return arg;
++      }
++
++      memset(&hint, 0, sizeof hint);
++      hint.ai_protocol = IPPROTO_TCP;
++      ret = getaddrinfo(arg, NULL, &hints, &res);
++      if (ret) {
++              return arg;
++      }
++
++      if (res->ai_family == AF_INET) {
++              ai = inet_ntop(AF_INET, &((struct sockaddr_in *) res->ai_addr)->sin_addr,
++                              addr, sizeof addr);
++      } else {
++              ai = inet_ntop(AF_INET6, &((struct sockaddr_in6 *) res->ai_addr)->sin6_addr,
++                              addr, sizeof addr);
++      }
++      freeaddrinfo(res);
++      return ai ? addr : arg;
++}
++
+ static int resolve(char *program, char *dest_arg)
+ {
+       char **dest_list;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index f9c3e60..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,54 +0,0 @@
-Bottom: 17081f2d187536d1e27e7772e7b9141334fc2e07
-Top:    0edd0ef0f737d3e2c9d2efa715be0562fe412a07
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-08 09:07:58 -0800
-
-Refresh of addrinfo
-
----
-
-diff --git a/src/acme.c b/src/acme.c
-index 727222c..d982b0d 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -513,6 +513,40 @@ static int verify_resolve(struct ibv_path_record *path)
-       return ret;
- }
- 
-+static char *get_dest(char *arg)
-+{
-+      static char addr[64];
-+      struct addrinfo hint, *res;
-+      char *ai;
-+      int ret;
-+
-+      if (!arg || addr_type != 'u') {
-+              return arg;
-+      }
-+
-+      if ((inet_pton(AF_INET, arg, addr) > 0) ||
-+          (inet_pton(AF_INET6, arg, addr) > 0) {
-+              return arg;
-+      }
-+
-+      memset(&hint, 0, sizeof hint);
-+      hint.ai_protocol = IPPROTO_TCP;
-+      ret = getaddrinfo(arg, NULL, &hints, &res);
-+      if (ret) {
-+              return arg;
-+      }
-+
-+      if (res->ai_family == AF_INET) {
-+              ai = inet_ntop(AF_INET, &((struct sockaddr_in *) res->ai_addr)->sin_addr,
-+                              addr, sizeof addr);
-+      } else {
-+              ai = inet_ntop(AF_INET6, &((struct sockaddr_in6 *) res->ai_addr)->sin6_addr,
-+                              addr, sizeof addr);
-+      }
-+      freeaddrinfo(res);
-+      return ai ? addr : arg;
-+}
-+
- static int resolve(char *program, char *dest_arg)
- {
-       char **dest_list;