Version: 1
-Previous: 845d461eebb4128be0d9fd69347b992322686d3c
-Head: 233e8072544ecab441a303a75b6148a8137ec974
+Previous: 832bdc3e9caf565cd995d4b441cb214963875456
+Head: 9e17b4389e12e0de0158ec497f2d056ca3e3ade7
Applied:
deam: 15fcbd5198ba0c15ab4e8fddcdba32c8ef45faf8
braces: 5fb48c1b8d722b60332f83ca4c8b92b2a7e456a6
- counters: 22e92ee9a89be01fe6140b3eb5a90650808fbc05
- refresh-temp: 233e8072544ecab441a303a75b6148a8137ec974
+ counters: 9e17b4389e12e0de0158ec497f2d056ca3e3ade7
Unapplied:
acm1.0.5: 1b225173756cfcec4d81d26b1160ebae7644261b
name2ip: 8e00708e882239292492e13aa51c82042255933c
Bottom: fad6610d1d2786b12bafb5cd923f53cfb674ebdb
-Top: 53f19f53102c76709faccdc0cba71ef7b3a96c5e
+Top: 703fd4acf706e8f6085cb3aa7bd0d562339dabd7
Author: Sean Hefty <sean.hefty@intel.com>
Date: 2011-06-27 10:29:36 -0700
if (verbose || !(make_addr || make_opts) || ret)
printf("return status 0x%x\n", ret);
diff --git a/src/libacm.c b/src/libacm.c
-index 31014d1..eb52a3c 100644
+index 31014d1..f6dd452 100644
--- a/src/libacm.c
+++ b/src/libacm.c
@@ -36,6 +36,8 @@
- addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
- addr.sin_port = htons(server_port);
- ret = connect(sock, (struct sockaddr *) &addr, sizeof(addr));
-+ ((struct sockaddr_in *) res)->sin_port = htons(server_port);
++ ((struct sockaddr_in *) res->ai_addr)->sin_port = htons(server_port);
+ ret = connect(sock, res->ai_addr, res->ai_addrlen);
if (ret)
goto err2;
+++ /dev/null
-Bottom: 53f19f53102c76709faccdc0cba71ef7b3a96c5e
-Top: 703fd4acf706e8f6085cb3aa7bd0d562339dabd7
-Author: Sean Hefty <sean.hefty@intel.com>
-Date: 2011-06-28 23:41:37 -0700
-
-Refresh of counters
-
----
-
-diff --git a/src/libacm.c b/src/libacm.c
-index eb52a3c..f6dd452 100644
---- a/src/libacm.c
-+++ b/src/libacm.c
-@@ -86,7 +86,7 @@ int ib_acm_connect(char *dest)
- goto err1;
- }
-
-- ((struct sockaddr_in *) res)->sin_port = htons(server_port);
-+ ((struct sockaddr_in *) res->ai_addr)->sin_port = htons(server_port);
- ret = connect(sock, res->ai_addr, res->ai_addrlen);
- if (ret)
- goto err2;