refresh

diff --git a/meta b/meta
index a566fcd6fcbd87928a42f4cb47400ff54174d3fd..5dffc937418c9200319a53435120781bb992c4e4 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: afabd043e7a6b9cda9171a37f417670da8109582
-Head: 0aa7b8edf43bcc877c221227afe1fa9a6634634d
+Previous: 4d00492c1dca8002a6645ace0516ffb5986f1842
+Head: 41078cbc8b08039ac192dfa18dcf5d17b81edf1d
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -12,8 +12,7 @@ Applied:
   verbose: 15cf7a7a260a694923bcb5c9181b10b0f02108f7
   dbg_1: 0b650c149079cd8e1593504492a9940521fb9c6d
   no_addr: 4d7174e927130db17a5ff83f9279ea4c54fde2fa
-  log_port: b6da9eef0fd7963c826eca9cc0d1a23487511e5c
-  refresh-temp: 0aa7b8edf43bcc877c221227afe1fa9a6634634d
+  log_port: 41078cbc8b08039ac192dfa18dcf5d17b81edf1d
 Unapplied:
   acme_verbose: 45cba0846874c93ef7af156bf0afe59f43d82ea6
   1.0.4: 9f452b8e59adb21b90fbdda980d25a54d4360d37

diff --git a/patches/log_port b/patches/log_port
index db2ec765bafa49f999da04e45863b0dc8f3906b6..b8bf17c0596ca0170498f9aac32f1af227a6ec3a 100644 (file)
--- a/patches/log_port
+++ b/patches/log_port
@@ -1,5 +1,5 @@
 Bottom: c74c104f2280f5a29202ce1d4dec0a24004cece3
-Top:    1a7c076e90a9883cc440631deac5dd82810649dc
+Top:    03a0e5459709b2fb584adeb4e7f8996886fe1ef7
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-06 11:51:38 -0800
 
@@ -41,14 +41,14 @@ index aa26fc5..ceb72f6 100644
  
  static int acm_listen(void)
 diff --git a/src/libacm.c b/src/libacm.c
-index 9d56cd2..e693e48 100644
+index 9d56cd2..3ce0cd0 100644
 --- a/src/libacm.c
 +++ b/src/libacm.c
-@@ -57,6 +57,17 @@ extern lock_t lock;
+@@ -57,6 +57,16 @@ extern lock_t lock;
  static SOCKET sock = INVALID_SOCKET;
  static short server_port = 6125;
  
-+static short acm_get_server_port(void)
++static void acm_set_server_port(void)
 +{
 +      FILE *f;
 +
@@ -56,18 +56,16 @@ index 9d56cd2..e693e48 100644
 +              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));
+@@ -66,6 +76,7 @@ int libacm_init(void)
        if (ret)
-               goto err2;
+               return ret;
+ 
++      acm_set_server_port();
+       sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+       if (sock == INVALID_SOCKET) {
+               ret = socket_errno();

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 9070932..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,47 +0,0 @@
-Bottom: 1a7c076e90a9883cc440631deac5dd82810649dc
-Top:    03a0e5459709b2fb584adeb4e7f8996886fe1ef7
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-06 12:40:51 -0800
-
-Refresh of log_port
-
----
-
-diff --git a/src/libacm.c b/src/libacm.c
-index e693e48..3ce0cd0 100644
---- a/src/libacm.c
-+++ b/src/libacm.c
-@@ -57,7 +57,7 @@ extern lock_t lock;
- static SOCKET sock = INVALID_SOCKET;
- static short server_port = 6125;
- 
--static short acm_get_server_port(void)
-+static void acm_set_server_port(void)
- {
-       FILE *f;
- 
-@@ -65,7 +65,6 @@ static short acm_get_server_port(void)
-               fscanf(f, "%hu", (unsigned short *) &server_port);
-               fclose(f);
-       }
--      return server_port;
- }
- 
- int libacm_init(void)
-@@ -77,6 +76,7 @@ int libacm_init(void)
-       if (ret)
-               return ret;
- 
-+      acm_set_server_port();
-       sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-       if (sock == INVALID_SOCKET) {
-               ret = socket_errno();
-@@ -86,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(acm_get_server_port());
-+      addr.sin_port = htons(server_port);
-       ret = connect(sock, (struct sockaddr *) &addr, sizeof(addr));
-       if (ret)
-               goto err2;