refresh

diff --git a/meta b/meta
index 812b206298415caa919d14c978fa3e7cc72e62d3..3956ff27446b32782da6f7ff7ad49afc64a0d000 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 8cc6991e819aed3e8c2e0c48d1f13d9fc11bfef3
-Head: 5b7f8520f560e9de2e1f40ea38d6c084b5a9de4b
+Previous: 6df1fe4e8cb2f0606a76d81d3fae5ac9e5d55373
+Head: b1248861b1347df035978c3a7fa05bd9852eeec0
 Applied:
-  loopback: 40e40f53777a233408457e07062c8ea9c013d519
-  refresh-temp: 5b7f8520f560e9de2e1f40ea38d6c084b5a9de4b
+  loopback: b1248861b1347df035978c3a7fa05bd9852eeec0
 Unapplied:
 Hidden:

diff --git a/patches/loopback b/patches/loopback
index 2303f03f510f34baadcd7091b38ee15907c24d0b..2e9e23eb8b2e168a8921c8179f01ef622b4c49d9 100644 (file)
--- a/patches/loopback
+++ b/patches/loopback
@@ -1,5 +1,5 @@
 Bottom: 30326a5093b7b177c8d7612eba401d4999793f71
-Top:    1eb335b444d6a59de8b26ecc43e9a756580e9a86
+Top:    d2e644c42312b47d5484b378d8e9c5a522d537bd
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-09 15:37:58 -0800
 
@@ -34,7 +34,7 @@ index 3dbb0c6..61872ef 100644
  # TCP port number that the server listens on.\r
  # If this value is changed, then a corresponding change is required for\r
 diff --git a/src/acm.c b/src/acm.c
-index 820365c..ffd1315 100644
+index 820365c..faa915e 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -200,6 +200,7 @@ static char log_file[128] = "stdout";
@@ -59,7 +59,7 @@ index 820365c..ffd1315 100644
        if (!ep) {
 -              acm_log(0, "could not find local end point\n");
 +              acm_log_addr(0, "acm_svr_query: could not find ",
-+                           data->type, data->info.addr);
++                           msg->data[0].type, msg->data[0].info.addr);
                status = ACM_STATUS_ESRCADDR;
                goto resp;
        }
@@ -74,7 +74,7 @@ index 820365c..ffd1315 100644
 +              if (ep) {
 +                      acm_log(2, "dest is local, and loopback is disabled");
 +                      return acm_client_resolve_resp(client, msg, NULL,
-+                                                     ACM_STATUS_EDSTADDR);
++                                                     ACM_STATUS_EDESTADDR);
 +              }
 +      }
 +

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index d499ae2..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,30 +0,0 @@
-Bottom: 1eb335b444d6a59de8b26ecc43e9a756580e9a86
-Top:    d2e644c42312b47d5484b378d8e9c5a522d537bd
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-11-10 09:24:13 -0800
-
-Refresh of loopback
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index ffd1315..faa915e 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -1727,7 +1727,7 @@ acm_svr_query(struct acm_client *client, struct acm_resolve_msg *msg)
-       ep = acm_get_ep(&msg->data[0]);
-       if (!ep) {
-               acm_log_addr(0, "acm_svr_query: could not find ",
--                           data->type, data->info.addr);
-+                           msg->data[0].type, msg->data[0].info.addr);
-               status = ACM_STATUS_ESRCADDR;
-               goto resp;
-       }
-@@ -1955,7 +1955,7 @@ acm_svr_resolve(struct acm_client *client, struct acm_resolve_msg *msg)
-               if (ep) {
-                       acm_log(2, "dest is local, and loopback is disabled");
-                       return acm_client_resolve_resp(client, msg, NULL,
--                                                     ACM_STATUS_EDSTADDR);
-+                                                     ACM_STATUS_EDESTADDR);
-               }
-       }