Changeset 745 for trunk/server/source3/modules/perfcount_onefs.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/modules/perfcount_onefs.c (modified) (3 diffs)

trunk/server/source3/modules/perfcount_onefs.c

@@ -20 +20 @@
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include <sys/isi_stats_protocol.h>
 #include <sys/isi_stats_client.h>
@@ -303 +304 @@
         /* get address info once, doesn't change for process */
         if (rem_addr == 0) {
-                struct sockaddr_storage sa;
-                socklen_t sa_len;
-                int fd = smbd_server_fd();
-
-                sa_len = sizeof sa;
-                if (getpeername(fd, (struct sockaddr *)&sa, &sa_len) == 0 && 
-                    sa.ss_family == AF_INET)
-                        rem_addr = ((struct sockaddr_in *)&sa)->sin_addr.s_addr;
-                else
+
+#error Isilon, please remove this after testing the code below
+
+                char *addr;
+
+                addr = talloc_sub_basic(talloc_tos(), "", "", "%I");
+                if (addr != NULL) {
+                        rem_addr = interpret_addr(addr);
+                        TALLOC_FREE(addr);
+                } else {
                         rem_addr = ISC_MASKED_ADDR;
-
-                sa_len = sizeof sa;
-                if (getsockname(fd, (struct sockaddr *)&sa, &sa_len) == 0 &&
-                    sa.ss_family == AF_INET)
-                        loc_addr = ((struct sockaddr_in *)&sa)->sin_addr.s_addr;
-                else
+                }
+
+                addr = talloc_sub_basic(talloc_tos(), "", "", "%i");
+                if (addr != NULL) {
+                        loc_addr = interpret_addr(addr);
+                        TALLOC_FREE(addr);
+                } else {
                         loc_addr = ISC_MASKED_ADDR;
+                }
         }
 
@@ -336 +340 @@
                         tmp->iod.in_bytes, tmp->iod.out_bytes));
 #endif
-                SAFE_FREE(tmp->prev);
+                SAFE_FREE(DLIST_PREV(tmp));
         }