[Pvfs2-cvs] commit by nlmills in pvfs2/src/client/sysint: client-state-machine.h finalize.c pint-sysint-utils.c sys-create.sm sys-getattr.sm

CVS commit program cvs at parl.clemson.edu
Wed Jun 16 16:45:32 EDT 2010


Update of /projects/cvsroot/pvfs2/src/client/sysint
In directory parlweb1:/tmp/cvs-serv2142/src/client/sysint

Modified Files:
      Tag: cu-security-branch
	client-state-machine.h finalize.c pint-sysint-utils.c 
	sys-create.sm sys-getattr.sm 
Log Message:
lots of little fixes that have been in the works for a while


Index: client-state-machine.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/client-state-machine.h,v
diff -p -u -r1.173.4.12 -r1.173.4.13
--- client-state-machine.h	21 May 2010 21:38:14 -0000	1.173.4.12
+++ client-state-machine.h	16 Jun 2010 20:45:31 -0000	1.173.4.13
@@ -47,8 +47,7 @@
 /* Default number of milliseconds to delay before retries */
 #define PVFS2_CLIENT_RETRY_DELAY_MS_DEFAULT  2000
 
-/* Default timout buffer for capabilities */
-/* nlmills: TODO:  Figure out a better way to handle this */
+/* grab a new capability if the current one expires in 2 minutes or less */
 #define CAP_TIMEOUT_BUFFER 120
 
 int PINT_client_state_machine_initialize(void);

Index: finalize.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/finalize.c,v
diff -p -u -r1.41.10.1 -r1.41.10.2
--- finalize.c	25 Aug 2009 17:55:54 -0000	1.41.10.1
+++ finalize.c	16 Jun 2010 20:45:31 -0000	1.41.10.2
@@ -58,7 +58,6 @@ int PVFS_sys_finalize()
 
     PINT_encode_finalize();
 
-    /* nlmills: TODO: fix finalize (segfault) */
     PINT_client_security_finalize();
 
     PINT_dist_finalize();

Index: pint-sysint-utils.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/pint-sysint-utils.c,v
diff -p -u -r1.35.30.4 -r1.35.30.5
--- pint-sysint-utils.c	8 Jun 2010 15:55:08 -0000	1.35.30.4
+++ pint-sysint-utils.c	16 Jun 2010 20:45:31 -0000	1.35.30.5
@@ -115,7 +115,13 @@ int PINT_lookup_parent(
  */
 #ifdef HAVE_OPENSSL
 
-/* nlmills: TODO: document me */
+/* PINT_client_security_initialize
+ *
+ * Initializes OpenSSL libraries used by security code.
+ *
+ * returns 0 on success
+ * returns negative PVFS error on failure
+ */
 int PINT_client_security_initialize(void)
 {
     int ret;
@@ -143,7 +149,13 @@ int PINT_client_security_initialize(void
     return 0;
 }
 
-/* nlmills: TODO: document me */
+/* PINT_client_security_finalize
+ *
+ * Cleans up after the OpenSSL library.
+ *
+ * returns 0 on success
+ * returns negative PVFS error on failure
+ */
 int PINT_client_security_finalize(void)
 {
     gen_mutex_lock(&security_init_mutex);

Index: sys-create.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-create.sm,v
diff -p -u -r1.115.2.9 -r1.115.2.10
--- sys-create.sm	2 Jun 2010 18:50:50 -0000	1.115.2.9
+++ sys-create.sm	16 Jun 2010 20:45:31 -0000	1.115.2.10
@@ -451,7 +451,6 @@ static PINT_sm_action create_create_setu
                 &server_type));
     }
 
-    /* nlmills: TODO: get the capability before this */
     PINT_SERVREQ_CREATE_FILL(
         msg_p->req,
         sm_p->getattr.attr.capability,

Index: sys-getattr.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/client/sysint/sys-getattr.sm,v
diff -p -u -r1.110.4.10 -r1.110.4.11
--- sys-getattr.sm	25 Aug 2009 17:55:55 -0000	1.110.4.10
+++ sys-getattr.sm	16 Jun 2010 20:45:31 -0000	1.110.4.11
@@ -547,35 +547,6 @@ static int getattr_object_getattr_comp_f
 
     attr =  &sm_p->getattr.attr;
     
-/* nlmills: TODO: remove debugging aid */
-#if 0
-    gossip_err("Owner: %u\n", 
-        (unsigned int) sm_p->getattr.attr.capability.owner);
-    gossip_err("Op mask: %d\n", 
-        sm_p->getattr.attr.capability.op_mask);
-    gossip_err("Fsid: %d\n", 
-        sm_p->getattr.attr.capability.fsid);
-    gossip_err("Handles: %d\n", 
-        sm_p->getattr.attr.capability.num_handles);
-    if (sm_p->getattr.attr.capability.num_handles > 0) 
-        gossip_err("Handle: %llu\n", 
-            (long long unsigned int) sm_p->getattr.attr.capability.handle_array[0]);
-    gossip_err("Sig size: %d\n", 
-        sm_p->getattr.attr.capability.sig_size);
-    if (sm_p->getattr.attr.capability.signature) 
-        gossip_err("Sig: %d%d%d%d%d%d%d%d%d%d\n", 
-                sm_p->getattr.attr.capability.signature[0],
-                sm_p->getattr.attr.capability.signature[1],
-                sm_p->getattr.attr.capability.signature[2],
-                sm_p->getattr.attr.capability.signature[3],
-                sm_p->getattr.attr.capability.signature[4],
-                sm_p->getattr.attr.capability.signature[5],
-                sm_p->getattr.attr.capability.signature[6],
-                sm_p->getattr.attr.capability.signature[7],
-                sm_p->getattr.attr.capability.signature[8],
-                sm_p->getattr.attr.capability.signature[9]);
-#endif
-
     /* if the ref_type mask is set to a non-zero value (!PVFS_TYPE_NONE)
      * a -PVFS_error will be triggered if the
      * attributes received are not one of the the types specified.



More information about the Pvfs2-cvs mailing list