[gridftp-commit] CVS update: MODIFIED: src, globus_i_gfs_data.c ...

[John Bresnahan]

  User: bresnaha
  Date: 07/06/27 11:30:56

  Modified:    server/src Tag: gfork3 globus_i_gfs_control.c
                        globus_i_gfs_data.c
  Log:
  another race.  1 section not properly setting handle state before forcing a close
  
  Revision  Changes    Path
  No                   revision
  
  http://viewcvs.globus.org/viewcvs.cgi/gridftp/server/src/Tag:
  No                   revision
  
  http://viewcvs.globus.org/viewcvs.cgi/gridftp/server/src/gfork3
  1.34.26.2 +0 -3      gridftp/server/src/globus_i_gfs_control.c
  
  http://viewcvs.globus.org/viewcvs.cgi/gridftp/server/src/globus_i_gfs_control.c.diff?r1=1.34.26.1&r2=1.34.26.2
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: globus_i_gfs_control.c
  ===================================================================
  RCS file: /home/globdev/CVS/globus-packages/gridftp/server/src/globus_i_gfs_control.c,v
  retrieving revision 1.34.26.1
  retrieving revision 1.34.26.2
  diff -u -b -r1.34.26.1 -r1.34.26.2
  --- globus_i_gfs_control.c	27 Jun 2007 14:35:08 -0000	1.34.26.1
  +++ globus_i_gfs_control.c	27 Jun 2007 16:30:55 -0000	1.34.26.2
  @@ -1398,7 +1398,6 @@
       return;
       
   error_init:
  -printf("HERE 1\n");
       tmp_str = globus_error_print_friendly(globus_error_peek(result));
       globus_gridftp_server_control_finished_transfer(
           op,
  @@ -1508,7 +1507,6 @@
       return;
       
   error_init:
  -printf("HERE 2\n");
       tmp_str = globus_error_print_friendly(globus_error_peek(result));
       globus_gridftp_server_control_finished_transfer(
           op,
  @@ -1567,7 +1565,6 @@
       return;
       
   error_init:
  -printf("HERE 3\n");
       tmp_str = globus_error_print_friendly(globus_error_peek(result));
       globus_gridftp_server_control_finished_transfer(
           op,
  
  
  
  1.53.2.3  +4 -0      gridftp/server/src/globus_i_gfs_data.c
  
  http://viewcvs.globus.org/viewcvs.cgi/gridftp/server/src/globus_i_gfs_data.c.diff?r1=1.53.2.2&r2=1.53.2.3
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: globus_i_gfs_data.c
  ===================================================================
  RCS file: /home/globdev/CVS/globus-packages/gridftp/server/src/globus_i_gfs_data.c,v
  retrieving revision 1.53.2.2
  retrieving revision 1.53.2.3
  diff -u -b -r1.53.2.2 -r1.53.2.3
  --- globus_i_gfs_data.c	27 Jun 2007 14:35:08 -0000	1.53.2.2
  +++ globus_i_gfs_data.c	27 Jun 2007 16:30:55 -0000	1.53.2.3
  @@ -2169,6 +2169,8 @@
           case GLOBUS_L_GFS_DATA_HANDLE_INUSE:
           case GLOBUS_L_GFS_DATA_HANDLE_CLOSED:
           default:
  +            printf("bad state %d\n", op->data_handle->state);
  +
               globus_assert(0 && "possible memory corruption");
               break;
       }
  @@ -4713,6 +4715,8 @@
                       case GLOBUS_L_GFS_DATA_FINISH_WITH_ERROR:
                           if(op->data_handle->is_mine)
                           {
  +                            op->data_handle->state = GLOBUS_L_GFS_DATA_HANDLE_CLOSING;
  +
                               result = globus_ftp_control_data_force_close(
                                   &op->data_handle->data_channel,
                                   globus_l_gfs_data_complete_fc_cb,