@@ -16,7 +16,7 @@ BF_KEY EncKey;

 int md5sum(int fd, unsigned char *digest)

 {

   int  rd;

-  char buff[1024];

+  char buff[8192];

   MD5_CTX ctx;

   MD5_Init(&ctx);

   while(rd = read(fd, buff, sizeof(buff))){

@@ -127,36 +127,6 @@ int mcomm_read(mcomm *c, fd_set *fds){

   return(0);

 }

-int mcomm_fdset(mcomm *c, fd_set *rfds, fd_set *wfds)

-{

-  int i;

-

-  /*----- listen socket -----*/

-  if(moption.lisocket != -1){

-    FD_SET(moption.lisocket, rfds);

-  }

-

-  /*----- connect socket -----*/

-  for(i=0;i<MAX_COMM;i++){

-    if(c[i].fd[0] != -1){

-      FD_SET(c[i].fd[0], rfds);

-      if(c[i].working){

-        FD_SET(c[i].fd[0], wfds);

-      }

-    }

-    if(c[i].fd[1] != -1){

-      FD_SET(c[i].fd[1], rfds);

-    }else{

-      if(c[i].cpid){

-        if(waitpid(c[i].cpid, NULL, WNOHANG) == c[i].cpid){

-          c[i].cpid = 0;

-        }

-      }

-    }

-  }

-  return(0);

-}

-

 int mfdirchk(mfile *d){

   mfile *m;

   int len = strlen(d->fn);

@@ -223,6 +193,11 @@ int is_send(mfile *m)

   return(1);

 }

+void rfdset(int s, fd_set *fds)

+{

+  FD_SET(s, fds);

+}

+

 void wfdset(int s, fd_set *fds)

 {

   mfile *m;

@@ -234,6 +209,35 @@ void wfdset(int s, fd_set *fds)

   }

 }

+void cfdset(mcomm *c, fd_set *rfds, fd_set *wfds)

+{

+  int i;

+

+  /*----- listen socket -----*/

+  if(moption.lisocket != -1){

+    FD_SET(moption.lisocket, rfds);

+  }

+

+  /*----- connect socket -----*/

+  for(i=0;i<MAX_COMM;i++){

+    if(c[i].fd[0] != -1){

+      FD_SET(c[i].fd[0], rfds);

+      if(c[i].working){

+        FD_SET(c[i].fd[0], wfds);

+      }

+    }

+    if(c[i].fd[1] != -1){

+      FD_SET(c[i].fd[1], rfds);

+    }else{

+      if(c[i].cpid){

+        if(waitpid(c[i].cpid, NULL, WNOHANG) == c[i].cpid){

+          c[i].cpid = 0;

+        }

+      }

+    }

+  }

+}

+

 int do_select(fd_set *rfds, fd_set *wfds)

 {

   struct timeval tv;

@@ -242,7 +246,6 @@ int do_select(fd_set *rfds, fd_set *wfds)

   if(select(1024, rfds, wfds, NULL, &tv) <= 0){

     gettimeofday(&curtime, NULL);

     moption.sendready = 0;

-    mrecv_gc();

     return(-1);

   }

   gettimeofday(&curtime, NULL);

@@ -257,6 +260,11 @@ void do_pong()

   }

 }

+void do_free()

+{

+  mrecv_gc();

+}

+

 void do_recv()

 {

   while(mrecv());

@@ -295,19 +303,20 @@ void mloop()

   while(loop_flag){

     FD_ZERO(&rfds);

     FD_ZERO(&wfds);

-    FD_SET(moption.mcsocket, &rfds);

+    rfdset(moption.mcsocket, &wfds);

     wfdset(moption.mcsocket, &wfds);

-    mcomm_fdset(moption.comm, &rfds, &wfds);

+    cfdset(moption.comm, &rfds, &wfds);

     if(do_select(&rfds, &wfds)){

       do_pong();

-      continue;

+      do_free();

+    }else{

+      do_pong();

+      do_recv();

+      do_send();

+      mcomm_check(moption.comm);         /* exec check   */

+      mcomm_accept(moption.comm, &rfds); /* new console  */

+      mcomm_read(moption.comm, &rfds);   /* command exec */

     }

-    do_pong();

-    do_recv();

-    do_send();

-    mcomm_check(moption.comm);         /* exec check   */

-    mcomm_accept(moption.comm, &rfds); /* new console  */

-    mcomm_read(moption.comm, &rfds);   /* command exec */

   }

 }

@@ -232,6 +232,7 @@ typedef struct mfile

   struct mfile *link;

   excludeitem *exclude;

   char cmdline[MAKUO_BUFFER_SIZE];

+  MD5_CTX md5;

 } mfile;

 typedef struct

@@ -271,7 +271,7 @@ int mexec_close(mcomm *c, int n)

     while(c->exclude){

       mexec_exclude_del(c, c->exclude);

     }

-    for(m=mftop[0];m;m=m->next){

+    for(m=mftop[MFSEND];m;m=m->next){

       if(m->comm == c){

         m->comm = NULL;

         lprintf(3, "%s: cancel %s\n", __func__, m->fn);

@@ -503,7 +503,6 @@ int mexec_check(mcomm *c, int n)

 {

   int e;

   int i;

-  int r;

   ssize_t size;

   char *argv[9];

   char *fn = NULL;

@@ -593,19 +592,10 @@ int mexec_check(mcomm *c, int n)

   /*----- md5 -----*/

   h = (mhash *)m->mdata.data;

   h->fnlen = strlen(m->fn);

-  r = md5sum(m->fd, h->hash);

-  close(m->fd);

-  m->fd = -1;

-  if(r == -1){

-    e = errno; 

-	  lprintf(0, "[error] %s: %s %s\n", __func__, strerror(e), m->fn);

-    cprintf(0, c, "error: %s %s\n", strerror(e), m->fn);

-    mfdel(m);

-    return(0);

-  }

   memcpy(h->filename, m->fn, h->fnlen);

   m->mdata.head.szdata = sizeof(mhash) + h->fnlen;

   h->fnlen = htons(h->fnlen);

+  MD5_Init(&(m->md5));

   /*----- sendto address -----*/

   if(t){

@@ -874,41 +874,27 @@ static void mrecv_req_send(mdata *data, struct sockaddr_in *addr)

 static void mrecv_req_md5_open(mfile *m, mdata *data, struct sockaddr_in *addr)

 {

-  int    r;

-  int    l;

+  int l;

   mhash *h;

   if(!m){

     m = mfadd(MFRECV);

-    if(!m){

-      lprintf(0,"[error] %s: out of memory\n", __func__);

-      return;

-    }

     memcpy(&(m->addr), addr, sizeof(m->addr));

     memcpy(&(m->mdata.head), &(data->head), sizeof(m->mdata.head));

     h = (mhash *)(data->data);

     l = ntohs(h->fnlen);

     memcpy(m->fn, h->filename, l);

     m->fn[l] = 0;

+    memcpy(m->mdata.data, h->hash, 16); 

     m->fd = open(m->fn, O_RDONLY);

     if(m->fd == -1){

       m->mdata.head.error  = errno;

       m->mdata.head.nstate = MAKUO_RECVSTATE_OPENERROR;

     }else{

-      r = md5sum(m->fd, m->mdata.data);

-      close(m->fd);

-      m->fd = -1;

-      if(r == -1){

-	      lprintf(0, "%s: file read error %s\n", __func__, m->fn);

-        m->mdata.head.error  = errno;

-        m->mdata.head.nstate = MAKUO_RECVSTATE_READERROR;

-      }else{

-        if(!memcmp(m->mdata.data, data->data, 16)){

-          m->mdata.head.nstate = MAKUO_RECVSTATE_MD5OK;

-        }else{

-          m->mdata.head.nstate = MAKUO_RECVSTATE_MD5NG;

-        }

-      }

+      m->mdata.head.nstate = MAKUO_RECVSTATE_OPEN;

+      m->link = mkack(&(m->mdata), &(m->addr), MAKUO_RECVSTATE_NONE);

+      m->link->link = m;

+      MD5_Init(&(m->md5));

     }

   }

   mtimeget(&(m->lastrecv));

@@ -917,15 +903,20 @@ static void mrecv_req_md5_open(mfile *m, mdata *data, struct sockaddr_in *addr)

 static void mrecv_req_md5_close(mfile *m, mdata *data, struct sockaddr_in *addr)

 {

+  if(m){

+    if(m->link){

+      close(m->fd);

+      m->fd = -1;

+      MD5_Final(m->mdata.data, &(m->md5));

+      m->link->mdata.head.nstate = MAKUO_RECVSTATE_CLOSE;

+      m->link->link = NULL;

+      m->link = NULL;

+    }

+    mrecv_mfdel(m);

+  }

   msend(mkack(data, addr, MAKUO_RECVSTATE_CLOSE));

-  mrecv_mfdel(m);

 }

-/*

- * md5チェック要求を受け取ったときの処理

- * mfileオブジェクトを生成して

- * 対象ファイルのmd5を取得する

- */

 static void mrecv_req_md5(mdata *data, struct sockaddr_in *addr)

 {

   mfile *m = mrecv_req_search(data, addr);

@@ -201,6 +201,41 @@ static void msend_ack_send(int s, mfile *m)

 static void msend_ack_md5(int s, mfile *m)

 {

+  int r;

+  char hash[16];

+  char buff[8192];

+  mfile *d = m->link;

+  if(!d){

+    msend_shot(s, m);

+    return;

+  }

+  r = read(d->fd, buff, sizeof(buff));

+  if(r > 0){

+    MD5_Update(&(d->md5), buff, r);

+    return;

+  }

+  if(r == -1){

+    if(errno == EINTR){

+      return;

+    }

+    d->mdata.head.error  = errno;

+    d->mdata.head.nstate = MAKUO_RECVSTATE_READERROR;

+    lprintf(0, "[error] %s: file read error %s\n", __func__, d->fn);

+    MD5_Final(hash, &(d->md5));

+  }else{

+    MD5_Final(hash, &(d->md5));

+    if(!memcmp(hash, d->mdata.data, 16)){

+      d->mdata.head.nstate = MAKUO_RECVSTATE_MD5OK;

+    }else{

+      d->mdata.head.nstate = MAKUO_RECVSTATE_MD5NG;

+    }

+  }

+  m->mdata.head.error  = d->mdata.head.error;

+  m->mdata.head.nstate = d->mdata.head.nstate;

+  close(d->fd);

+  d->fd = -1;

+  d->link = NULL;

+  m->link = NULL;

   msend_shot(s, m);

 }

@@ -674,6 +709,33 @@ static void msend_req_send(int s, mfile *m)

 static void msend_req_md5_open_init(int s, mfile *m)

 {

+  int e;

+  int r;

+  mhash *h;

+  char buff[8192];

+

+  h = (mhash *)m->mdata.data;

+  r = read(m->fd, buff, sizeof(buff));

+  if(r > 0){

+    MD5_Update(&(m->md5), buff, r);

+    return;

+  }

+  e = errno;

+  if(r == -1){

+    if(e == EINTR){

+      return;

+    }

+	  lprintf(0, "[error] %s: file read error(%s) %s\n", __func__, strerror(e), m->fn);

+    cprintf(0, m->comm, "error: file read error(%s) %s\n", strerror(e), m->fn);

+    MD5_Final(h->hash, &(m->md5));

+    close(m->fd);

+    m->fd = -1;

+    msend_mfdel(m);

+    return;

+  }

+  MD5_Final(h->hash, &(m->md5));

+  close(m->fd);

+  m->fd = -1;

   m->sendwait  = 1;

   m->initstate = 0;

   ack_clear(m, -1);

@@ -691,7 +753,14 @@ static void msend_req_md5_open(int s, mfile *m)

     msend_packet(s, &(m->mdata), &(m->addr));

     return;

   }

+  if(ack_check(m, MAKUO_RECVSTATE_OPEN) == 1){

+    m->initstate = 0;

+    m->sendwait  = 1;

+    ack_clear(m, MAKUO_RECVSTATE_OPEN);

+    return;

+  }

   m->initstate = 1;

+  m->sendwait  = 0;

   m->mdata.head.nstate = MAKUO_SENDSTATE_CLOSE;

 }

@@ -721,6 +790,20 @@ static void msend_req_md5_close(int s, mfile *m)

 /*----- md5 -----*/

 static void msend_req_md5(int s, mfile *m)

 {

+  if(!m->comm){

+    if(m->mdata.head.nstate == MAKUO_SENDSTATE_OPEN){

+      if(m->initstate){

+        MD5_Final(m->mdata.data, &(m->md5));

+        close(m->fd);

+        m->fd = -1;

+        msend_mfdel(m);

+        return;

+      }else{

+        m->initstate = 1;

+        m->mdata.head.nstate = MAKUO_SENDSTATE_CLOSE;

+      }

+    }

+  }

   switch(m->mdata.head.nstate){

     case MAKUO_SENDSTATE_OPEN:

       msend_req_md5_open(s, m);