refresh (create temporary patch)

diff --git a/meta b/meta
index 1261f408cd0bdb50854e9025720c7f5e97523c07..7c58c5b6bbc9ed4633360d20352eb4a3b8cc9b9e 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: d990e39af084f86cebc17c921806b41100ad347a
-Head: 2c59a1fd9610800ffe71503f52ee6f143aac7163
+Previous: fe74b6103b2688bc3184fc6a14fe886d6e4554e7
+Head: 477188bcf3fb7f97f524f543048bf180cfe85583
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -13,6 +13,7 @@ Applied:
   dbg_1: 0b650c149079cd8e1593504492a9940521fb9c6d
   no_addr: 4d7174e927130db17a5ff83f9279ea4c54fde2fa
   log_port: 2c59a1fd9610800ffe71503f52ee6f143aac7163
+  refresh-temp: 477188bcf3fb7f97f524f543048bf180cfe85583
 Unapplied:
   acme_verbose: 45cba0846874c93ef7af156bf0afe59f43d82ea6
   1.0.4: 9f452b8e59adb21b90fbdda980d25a54d4360d37

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..edc0798
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,53 @@
+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;