refresh

diff --git a/meta b/meta
index 7c58c5b6bbc9ed4633360d20352eb4a3b8cc9b9e..03abe3f8d3e2d4faf09495bfc5133de7e1c8c094 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: fe74b6103b2688bc3184fc6a14fe886d6e4554e7
-Head: 477188bcf3fb7f97f524f543048bf180cfe85583
+Previous: 84e267aa7db4f3adcc96d9744598941484c4b95f
+Head: b6da9eef0fd7963c826eca9cc0d1a23487511e5c
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -12,8 +12,7 @@ Applied:
   verbose: 15cf7a7a260a694923bcb5c9181b10b0f02108f7
   dbg_1: 0b650c149079cd8e1593504492a9940521fb9c6d
   no_addr: 4d7174e927130db17a5ff83f9279ea4c54fde2fa
-  log_port: 2c59a1fd9610800ffe71503f52ee6f143aac7163
-  refresh-temp: 477188bcf3fb7f97f524f543048bf180cfe85583
+  log_port: b6da9eef0fd7963c826eca9cc0d1a23487511e5c
 Unapplied:
   acme_verbose: 45cba0846874c93ef7af156bf0afe59f43d82ea6
   1.0.4: 9f452b8e59adb21b90fbdda980d25a54d4360d37

diff --git a/patches/log_port b/patches/log_port
index 111c5ef7654293c7c3e3bf258a080eb4fb2b2c3e..db2ec765bafa49f999da04e45863b0dc8f3906b6 100644 (file)
--- a/patches/log_port
+++ b/patches/log_port
@@ -1,5 +1,5 @@
 Bottom: c74c104f2280f5a29202ce1d4dec0a24004cece3
-Top:    e565f94fc75f01ab3364eb32f74417564c154c57
+Top:    1a7c076e90a9883cc440631deac5dd82810649dc
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-06 11:51:38 -0800
 
@@ -15,7 +15,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index aa26fc5..ed9adec 100644
+index aa26fc5..ceb72f6 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -1597,6 +1597,7 @@ static void CDECL_FUNC acm_retry_handler(void *context)
@@ -35,8 +35,39 @@ index aa26fc5..ed9adec 100644
 +              acm_log(0, "notice - cannot publish ibacm port number\n");
 +              return;
 +      }
-+      fprintf(f, "%d\n", server_port);
++      fprintf(f, "%hu\n", server_port);
 +      fclose(f);
  }
  
  static int acm_listen(void)
+diff --git a/src/libacm.c b/src/libacm.c
+index 9d56cd2..e693e48 100644
+--- a/src/libacm.c
++++ b/src/libacm.c
+@@ -57,6 +57,17 @@ extern lock_t lock;
+ static SOCKET sock = INVALID_SOCKET;
+ static short server_port = 6125;
+ 
++static short acm_get_server_port(void)
++{
++      FILE *f;
++
++      if ((f = fopen("/var/run/ibacm.port", "r"))) {
++              fscanf(f, "%hu", (unsigned short *) &server_port);
++              fclose(f);
++      }
++      return server_port;
++}
++
+ int libacm_init(void)
+ {
+       struct sockaddr_in addr;
+@@ -75,7 +86,7 @@ int libacm_init(void)
+       memset(&addr, 0, sizeof addr);
+       addr.sin_family = AF_INET;
+       addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+-      addr.sin_port = htons(server_port);
++      addr.sin_port = htons(acm_get_server_port());
+       ret = connect(sock, (struct sockaddr *) &addr, sizeof(addr));
+       if (ret)
+               goto err2;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index edc0798..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,53 +0,0 @@
-Bottom: e565f94fc75f01ab3364eb32f74417564c154c57
-Top:    1a7c076e90a9883cc440631deac5dd82810649dc
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-06 12:39:09 -0800
-
-Refresh of log_port
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index ed9adec..ceb72f6 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -1611,7 +1611,7 @@ static void acm_init_server(void)
-               acm_log(0, "notice - cannot publish ibacm port number\n");
-               return;
-       }
--      fprintf(f, "%d\n", server_port);
-+      fprintf(f, "%hu\n", server_port);
-       fclose(f);
- }
- 
-diff --git a/src/libacm.c b/src/libacm.c
-index 9d56cd2..e693e48 100644
---- a/src/libacm.c
-+++ b/src/libacm.c
-@@ -57,6 +57,17 @@ extern lock_t lock;
- static SOCKET sock = INVALID_SOCKET;
- static short server_port = 6125;
- 
-+static short acm_get_server_port(void)
-+{
-+      FILE *f;
-+
-+      if ((f = fopen("/var/run/ibacm.port", "r"))) {
-+              fscanf(f, "%hu", (unsigned short *) &server_port);
-+              fclose(f);
-+      }
-+      return server_port;
-+}
-+
- int libacm_init(void)
- {
-       struct sockaddr_in addr;
-@@ -75,7 +86,7 @@ int libacm_init(void)
-       memset(&addr, 0, sizeof addr);
-       addr.sin_family = AF_INET;
-       addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
--      addr.sin_port = htons(server_port);
-+      addr.sin_port = htons(acm_get_server_port());
-       ret = connect(sock, (struct sockaddr *) &addr, sizeof(addr));
-       if (ret)
-               goto err2;