refresh

diff --git a/meta b/meta
index 4f62dcf9a5d25da44a89162c1e9d5f7d625d1d3b..58a840d5d4dd4ea1fff0f166bbb23a026212f71a 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: a4c66e638a12cb43bf180895247846c3173ea422
-Head: 833bd4190a48092e4433ea2a389c8d4910b61404
+Previous: b2a86d8013239bb730630c6becbbb44bbe907664
+Head: dad535804c7de5fe130ed9c744513a02ce145dbb
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -17,8 +17,7 @@ Applied:
   acme_dest: b7ec8fce4adac1b6e970529e41ff1c936f4be27b
   show_err: 47d8e33e2f36df1e3b163fcf7e8b0b56604fb944
   mult_dest: 1c8469be405d19304d47fcaf95e7d4aec574a6fc
-  addrinfo: 7744a2280e5e691d93c2f61c0f24e5d8270666cc
-  refresh-temp: 833bd4190a48092e4433ea2a389c8d4910b61404
+  addrinfo: dad535804c7de5fe130ed9c744513a02ce145dbb
 Unapplied:
   1.0.4: dc3f68d964641c9ffea14558d6a236c4216a89ae
 Hidden:

diff --git a/patches/addrinfo b/patches/addrinfo
index fa3235f481867ecb7bc48b07656f955fa5c40500..ed53c1c147cadef5bc016b9007a9a2fda4974759 100644 (file)
--- a/patches/addrinfo
+++ b/patches/addrinfo
@@ -1,5 +1,5 @@
 Bottom: ad882cbf5ccb5b39d50b3d141607e262852a2abd
-Top:    0edd0ef0f737d3e2c9d2efa715be0562fe412a07
+Top:    f7dc2be4209894e2f33282c013570cad8f85550b
 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..d982b0d 100644
+index 6aa256a..7632ffa 100644
 --- a/src/acme.c
 +++ b/src/acme.c
 @@ -67,10 +67,10 @@ extern char **parse(char *args, int *count);
@@ -69,7 +69,7 @@ index 6aa256a..d982b0d 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)
+@@ -513,6 +513,39 @@ static int verify_resolve(struct ibv_path_record *path)
        return ret;
  }
  
@@ -77,21 +77,20 @@ index 6aa256a..d982b0d 100644
 +{
 +      static char addr[64];
 +      struct addrinfo hint, *res;
-+      char *ai;
++      const 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) {
++      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);
++      ret = getaddrinfo(arg, NULL, &hint, &res);
 +      if (ret) {
 +              return arg;
 +      }
@@ -110,3 +109,13 @@ index 6aa256a..d982b0d 100644
  static int resolve(char *program, char *dest_arg)
  {
        char **dest_list;
+@@ -531,7 +564,8 @@ static int resolve(char *program, char *dest_arg)
+               return -1;
+       }
+ 
+-      for (dest_addr = dest_list[i]; dest_addr; dest_addr = dest_list[++i]) {
++      for (dest_addr = get_dest(dest_list[i]); dest_addr;
++           dest_addr = get_dest(dest_list[++i])) {
+               printf("Destination: %s\n", dest_addr);
+               switch (addr_type) {
+               case 'i':

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 881ad63..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,48 +0,0 @@
-Bottom: 0edd0ef0f737d3e2c9d2efa715be0562fe412a07
-Top:    f7dc2be4209894e2f33282c013570cad8f85550b
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-08 09:54:32 -0800
-
-Refresh of addrinfo
-
----
-
-diff --git a/src/acme.c b/src/acme.c
-index d982b0d..7632ffa 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -517,21 +517,20 @@ static char *get_dest(char *arg)
- {
-       static char addr[64];
-       struct addrinfo hint, *res;
--      char *ai;
-+      const 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) {
-+      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);
-+      ret = getaddrinfo(arg, NULL, &hint, &res);
-       if (ret) {
-               return arg;
-       }
-@@ -565,7 +564,8 @@ static int resolve(char *program, char *dest_arg)
-               return -1;
-       }
- 
--      for (dest_addr = dest_list[i]; dest_addr; dest_addr = dest_list[++i]) {
-+      for (dest_addr = get_dest(dest_list[i]); dest_addr;
-+           dest_addr = get_dest(dest_list[++i])) {
-               printf("Destination: %s\n", dest_addr);
-               switch (addr_type) {
-               case 'i':