refresh (create temporary patch)

diff --git a/meta b/meta
index 58a840d5d4dd4ea1fff0f166bbb23a026212f71a..a1a7e3909f369242d44ae25e3f2d2b34a6c18d81 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: b2a86d8013239bb730630c6becbbb44bbe907664
-Head: dad535804c7de5fe130ed9c744513a02ce145dbb
+Previous: 67a0613c49a780d9d2321153eea0a381a019573c
+Head: 73fe0178a02e3a2b0363f1d0ae92678b5dfafe00
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -18,6 +18,7 @@ Applied:
   show_err: 47d8e33e2f36df1e3b163fcf7e8b0b56604fb944
   mult_dest: 1c8469be405d19304d47fcaf95e7d4aec574a6fc
   addrinfo: dad535804c7de5fe130ed9c744513a02ce145dbb
+  refresh-temp: 73fe0178a02e3a2b0363f1d0ae92678b5dfafe00
 Unapplied:
   1.0.4: dc3f68d964641c9ffea14558d6a236c4216a89ae
 Hidden:

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..23c1250
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,90 @@
+Bottom: f7dc2be4209894e2f33282c013570cad8f85550b
+Top:    d567db5e39236562dd4e933b9516b73603856409
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2010-12-08 10:09:31 -0800
+
+Refresh of addrinfo
+
+---
+
+diff --git a/src/acme.c b/src/acme.c
+index 7632ffa..a7b7413 100644
+--- a/src/acme.c
++++ b/src/acme.c
+@@ -49,7 +49,7 @@ static char *opts_file = ACM_OPTS_FILE;
+ 
+ static char *dest_addr;
+ static char *src_addr;
+-static char addr_type = 'i';
++static char addr_type = 'u';
+ static int verify;
+ static int nodelay;
+ static int make_addr;
+@@ -513,7 +513,7 @@ static int verify_resolve(struct ibv_path_record *path)
+       return ret;
+ }
+ 
+-static char *get_dest(char *arg)
++static char *get_dest(char *arg, char *format)
+ {
+       static char addr[64];
+       struct addrinfo hint, *res;
+@@ -521,10 +521,12 @@ static char *get_dest(char *arg)
+       int ret;
+ 
+       if (!arg || addr_type != 'u') {
++              *format = addr_type;
+               return arg;
+       }
+ 
+       if ((inet_pton(AF_INET, arg, addr) > 0) || (inet_pton(AF_INET6, arg, addr) > 0)) {
++              *format = 'i';
+               return arg;
+       }
+ 
+@@ -532,6 +534,7 @@ static char *get_dest(char *arg)
+       hint.ai_protocol = IPPROTO_TCP;
+       ret = getaddrinfo(arg, NULL, &hint, &res);
+       if (ret) {
++              *format = 'l';
+               return arg;
+       }
+ 
+@@ -543,7 +546,14 @@ static char *get_dest(char *arg)
+                               addr, sizeof addr);
+       }
+       freeaddrinfo(res);
+-      return ai ? addr : arg;
++
++      if (ai) {
++              *format = 'i';
++              return addr;
++      } else {
++              *format = 'u';
++              return arg;
++      }
+ }
+ 
+ static int resolve(char *program, char *dest_arg)
+@@ -551,6 +561,7 @@ static int resolve(char *program, char *dest_arg)
+       char **dest_list;
+       struct ibv_path_record path;
+       int ret, i = 0;
++      char dest_type;
+ 
+       ret = libacm_init();
+       if (ret) {
+@@ -564,10 +575,10 @@ static int resolve(char *program, char *dest_arg)
+               return -1;
+       }
+ 
+-      for (dest_addr = get_dest(dest_list[i]); dest_addr;
+-           dest_addr = get_dest(dest_list[++i])) {
++      for (dest_addr = get_dest(dest_list[i], &dest_type); dest_addr;
++           dest_addr = get_dest(dest_list[++i], &dest_type)) {
+               printf("Destination: %s\n", dest_addr);
+-              switch (addr_type) {
++              switch (dest_type) {
+               case 'i':
+                       ret = resolve_ip(&path);
+                       break;