@@ -1104,7 +1104,9 @@ mfile *mkack(mdata *data, struct sockaddr_in *addr, uint8_t state)

     a->mdata.head.opcode = data->head.opcode;

     a->mdata.head.reqid  = data->head.reqid;

     a->mdata.head.seqno  = data->head.seqno;

+    a->mdata.head.ostate = data->head.ostate;

     a->mdata.head.nstate = state;

+    a->mdata.head.error  = data->head.error;

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

   }

   return(a);

@@ -248,14 +248,19 @@ int mloop()

   lastpong = pingpong(0);

   while(loop_flag){

     gettimeofday(&curtime, NULL);

-    if(mtimeout(lastpong, MAKUO_PONG_INTERVAL))

+    if(mtimeout(lastpong, MAKUO_PONG_INTERVAL)){

       lastpong = pingpong(1);

+    }

+

+    /* udp packet receive */

     m = mftop[0];

     while(mrecv(moption.mcsocket)){

       if(m != mftop[0]){

         break;

       }

     }

+

+    /* udp packet send */

     para = 0;

     m = mftop[0];

     while(m){

@@ -266,20 +271,21 @@ int mloop()

         break;

       }

     }

+

+    /* command read */

     mcomm_check(moption.comm);

+    /* wait */

     FD_ZERO(&rfds);

     FD_ZERO(&wfds);

     FD_SET(moption.mcsocket,  &rfds);

     mcomm_fdset(moption.comm, &rfds);

-

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

       if(ismsend(moption.mcsocket, m, 0)){

         FD_SET(moption.mcsocket, &wfds);

         break;

       }

     }

-

     tv.tv_sec  = 1;

     tv.tv_usec = 0;

     if(select(1024, &rfds, &wfds, NULL, &tv) == -1)

@@ -72,10 +72,9 @@

 /*----- flags -----*/

 #define MAKUO_FLAG_ACK    1

 #define MAKUO_FLAG_CRYPT  2

-#define MAKUO_FLAG_FMARK  4

-#define MAKUO_FLAG_DRYRUN 8

-#define MAKUO_FLAG_RECURS 16

-#define MAKUO_FLAG_SYNC   32

+#define MAKUO_FLAG_DRYRUN 4

+#define MAKUO_FLAG_RECURS 8

+#define MAKUO_FLAG_SYNC   16

 /*----- sendstatus -----*/

 #define MAKUO_SENDSTATE_STAT       0  /* 更新確認待 */

@@ -97,6 +96,7 @@

 #define MAKUO_RECVSTATE_IGNORE     6

 #define MAKUO_RECVSTATE_READONLY   7

 #define MAKUO_RECVSTATE_BREAK      8

+#define MAKUO_RECVSTATE_LAST       9

 #define MAKUO_RECVSTATE_MD5OK      10

 #define MAKUO_RECVSTATE_MD5NG      11

 #define MAKUO_RECVSTATE_DELETEOK   12

@@ -345,12 +345,12 @@ int mexec_send(mcomm *c, int n, int sync)

           }

         }

         if(!t){

-          cprintf(0, c, "%s is not contained in members\r\n", optarg);

+          cprintf(0, c, "%s is not contained in members\n", optarg);

           return(0);

         }

         break;

       case '?':

-        cprintf(0, c, "invalid option -- %c\r\n", optopt);

+        cprintf(0, c, "invalid option -- %c\n", optopt);

         return(0); 

     }

   }

@@ -379,16 +379,16 @@ int mexec_send(mcomm *c, int n, int sync)

   /*----- help -----*/

   if(!fn){

     if(sync){

-      cprintf(0, c, "sync [-n] [-r] [-t host] [path]\r\n");

-      cprintf(0, c, "  -n  # dryrun\r\n");

-      cprintf(0, c, "  -r  # recursive\r\n");

-      cprintf(0, c, "  -t  # target host\r\n");

+      cprintf(0, c, "sync [-n] [-r] [-t host] [path]\n");

+      cprintf(0, c, "  -n  # dryrun\n");

+      cprintf(0, c, "  -r  # recursive\n");

+      cprintf(0, c, "  -t  # target host\n");

     }else{

-      cprintf(0, c, "send [-n] [-r] [-t host] [path]\r\n");

-      cprintf(0, c, "  -n  # dryrun\r\n");

-      cprintf(0, c, "  -r  # recursive\r\n");

-      cprintf(0, c, "  -D  # with delete\r\n");

-      cprintf(0, c, "  -t  # target host\r\n");

+      cprintf(0, c, "send [-n] [-r] [-t host] [path]\n");

+      cprintf(0, c, "  -n  # dryrun\n");

+      cprintf(0, c, "  -r  # recursive\n");

+      cprintf(0, c, "  -D  # with delete\n");

+      cprintf(0, c, "  -t  # target host\n");

     }

     return(0);

   }

@@ -515,12 +515,12 @@ int mexec_check(mcomm *c, int n)

           if(!strcmp(t->hostname, optarg))

             break;

         if(!t){

-          cprintf(0, c, "%s is not contained in members\r\n", optarg);

+          cprintf(0, c, "%s is not contained in members\n", optarg);

           return(0);

         }

         break;

       case '?':

-        cprintf(0, c, "invalid option -- %c\r\n", optopt);

+        cprintf(0, c, "invalid option -- %c\n", optopt);

         return(0); 

     }

   }

@@ -539,9 +539,9 @@ int mexec_check(mcomm *c, int n)

   /*----- help -----*/

   if(!fn){

-    cprintf(0, c,"usage: check [-t host] [-r] [path]\r\n");

-    cprintf(0, c, "  -r  # dir recursive\r\n");

-    cprintf(0, c, "  -t  # target host\r\n");

+    cprintf(0, c,"usage: check [-t host] [-r] [path]\n");

+    cprintf(0, c, "  -r  # dir recursive\n");

+    cprintf(0, c, "  -t  # target host\n");

     return(0);

   }

@@ -566,8 +566,8 @@ int mexec_check(mcomm *c, int n)

   /*----- open -----*/

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

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

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

-    cprintf(0, c, "file open error: %s\r\n", m->fn);

+	  lprintf(0, "%s: file open error (%s) %s\n", __func__, strerror(errno), m->fn);

+    cprintf(0, c, "error: file open error (%s) %s\n", strerror(errno), m->fn);

     mfdel(m);

     return(0);

   }

@@ -579,8 +579,8 @@ int mexec_check(mcomm *c, int n)

   close(m->fd);

   m->fd = -1;

   if(r == -1){

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

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

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

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

     mfdel(m);

     return(0);

   }

@@ -627,12 +627,12 @@ int mexec_dsync(mcomm *c, int n)

           if(!strcmp(t->hostname, optarg))

             break;

         if(!t){

-          cprintf(0, c, "%s is not contained in members\r\n", optarg);

+          cprintf(0, c, "%s is not contained in members\n", optarg);

           return(0);

         }

         break;

       case '?':

-        cprintf(0, c, "invalid option -- %c\r\n", optopt);

+        cprintf(0, c, "invalid option -- %c\n", optopt);

         return(0); 

     }

   }

@@ -652,10 +652,10 @@ int mexec_dsync(mcomm *c, int n)

   /*----- help -----*/

   if(c->argc[n]<2){

-    cprintf(0, c, "dsync [-r] [-t host] [-n] [path]\r\n");

-    cprintf(0, c, "  -r  # recursive\r\n");

-    cprintf(0, c, "  -t  # target host\r\n");

-    cprintf(0, c, "  -n  # dryrun\r\n");

+    cprintf(0, c, "dsync [-r] [-t host] [-n] [path]\n");

+    cprintf(0, c, "  -r  # recursive\n");

+    cprintf(0, c, "  -t  # target host\n");

+    cprintf(0, c, "  -n  # dryrun\n");

     return(0);

   }

@@ -22,7 +22,7 @@ static mfile *mrecv_mfdel(mfile *m)

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

     close(m->fd);

     m->fd = -1;

-    if(S_ISREG(m->fs.st_mode)){

+    if(!S_ISLNK(m->fs.st_mode) && S_ISREG(m->fs.st_mode)){

       mremove(moption.base_dir, m->tn);

     }

   }

@@ -69,11 +69,12 @@ static int mrecv_packet(int s, mdata *data, struct sockaddr_in *addr)

   socklen_t addr_len;

   while(1){

+    if(!loop_flag){

+      return(-1);

+    }

     addr_len = sizeof(struct sockaddr_in);

     recvsize = recvfrom(s, data, sizeof(mdata), 0, (struct sockaddr *)addr, &addr_len);

-    if(recvsize != -1){

-      break;

-    }else{

+    if(recvsize == -1){

       if(errno == EAGAIN){

         return(-1);

       }

@@ -84,29 +85,31 @@ static int mrecv_packet(int s, mdata *data, struct sockaddr_in *addr)

         return(-1);

       }

     }

+    if(recvsize < sizeof(data->head)){

+      lprintf(0, "%s: recv head size error\n", __func__);

+      return(-1);

+    }

+    data->head.szdata = ntohs(data->head.szdata);

+    data->head.flags  = ntohs(data->head.flags);

+    data->head.reqid  = ntohl(data->head.reqid);

+    data->head.seqno  = ntohl(data->head.seqno);

+    data->head.maddr  = ntohl(data->head.maddr);

+    data->head.mport  = ntohs(data->head.mport);

+    data->head.error  = ntohl(data->head.error);

+    if(data->head.maddr != moption.maddr.sin_addr.s_addr){

+      continue; /* other group packet */

+    }

+    if(data->head.mport != moption.maddr.sin_port){

+      continue; /* other group packet */

+    }

+    if(data->head.vproto != PROTOCOL_VERSION){

+      continue; /* other protocol */

+    }

+    if(!mrecv_decrypt(data, addr)){

+      break;

+    }

   }

-  if(recvsize < sizeof(data->head)){

-    lprintf(0, "%s: recv head size error\n", __func__);

-    return(-1);

-  }

-

-  data->head.szdata = ntohs(data->head.szdata);

-  data->head.flags  = ntohs(data->head.flags);

-  data->head.reqid  = ntohl(data->head.reqid);

-  data->head.seqno  = ntohl(data->head.seqno);

-  data->head.maddr  = ntohl(data->head.maddr);

-  data->head.mport  = ntohs(data->head.mport);

-  data->head.error  = ntohl(data->head.error);

-  if(data->head.maddr != moption.maddr.sin_addr.s_addr){

-    return(-1);

-  }

-  if(data->head.mport != moption.maddr.sin_port){

-    return(-1);

-  }

-  if(data->head.vproto != PROTOCOL_VERSION){

-    return(-1);

-  }

-  return(mrecv_decrypt(data, addr));

+  return(0);

 }

 /******************************************************************

@@ -247,8 +250,6 @@ static void mrecv_ack_dsync(mdata *data, struct sockaddr_in *addr)

   mhost *t;

   mfile *m;

-  lprintf(9, "%s: rid=%d %s\n", __func__, data->head.reqid, strmstate(data));

-

   if(data->head.nstate == MAKUO_RECVSTATE_CLOSE){

     mkreq(data, addr, MAKUO_SENDSTATE_LAST);

   }

@@ -300,7 +301,6 @@ static void mrecv_ack_del(mdata *data, struct sockaddr_in *addr)

   uint16_t len;

   char path[PATH_MAX];

-  lprintf(9, "%s: rid=%d %s\n", __func__, data->head.reqid, strmstate(data));

   if(mrecv_ack_search(&t, &m, data, addr)){

     return;

   }

@@ -525,19 +525,10 @@ static void mrecv_req_send_open(mfile *m, mdata *r)

       }

     }

   }

-  mfile *a = mfins(0);

-  if(!a){

+  if(!mkack(&(m->mdata), &(m->addr), m->mdata.head.nstate)){

     lprintf(0, "%s: out of momory\n", __func__);

     return;

   }

-  a->mdata.head.flags |= MAKUO_FLAG_ACK;

-  a->mdata.head.opcode = r->head.opcode;

-  a->mdata.head.reqid  = r->head.reqid;

-  a->mdata.head.seqno  = r->head.seqno;

-  a->mdata.head.ostate = m->mdata.head.ostate;

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

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

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

 }

 static void mrecv_req_send_mark(mfile *m, mdata *r)

@@ -548,68 +539,35 @@ static void mrecv_req_send_mark(mfile *m, mdata *r)

   if(m->mdata.head.nstate != MAKUO_RECVSTATE_OPEN){

     return;

   }

-

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

-    if(a->mdata.head.flags & MAKUO_FLAG_ACK){

-      if(a->mdata.head.reqid != r->head.reqid){

-        continue;

-      }

-      if(a->mdata.head.opcode != r->head.opcode){

-        continue;

-      }

-      if(a->mdata.head.nstate != MAKUO_RECVSTATE_MARK){

-        continue;

-      }

-      if(memcmp(&(a->addr), &(m->addr), sizeof(a->addr))){

-        continue;

-      }

-      return;

-    }

-  }

-

-  a = mfins(0);

-  a->mdata.head.flags |= MAKUO_FLAG_ACK;

-  a->mdata.head.flags |= MAKUO_FLAG_FMARK;

-  a->mdata.head.opcode = r->head.opcode;

-  a->mdata.head.reqid  = r->head.reqid;

-  a->mdata.head.seqno  = r->head.seqno;

-  a->mdata.head.ostate = m->mdata.head.nstate;

-  a->mdata.head.nstate = MAKUO_RECVSTATE_MARK;

-  a->mdata.head.szdata = 0;

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

   if(m->mdata.head.seqno < m->seqnomax){

     seq_addmark(m, m->mdata.head.seqno, m->seqnomax);

     m->mdata.head.seqno = m->seqnomax;

   }

   m->lickflag = 1;

-  

+  a = mkack(&(m->mdata),&(m->addr),MAKUO_RECVSTATE_MARK);

+  if(!a){

+    lprintf(0, "%s: out of momory\n", __func__);

+    return;

+  }

+  if(a->mdata.head.szdata){

+    return;

+  }

   for(mm=m->mark;mm;mm=mm->next){

     if(data_safeset32(&(a->mdata), mm->l)){

       break;

     }

     if(data_safeset32(&(a->mdata), mm->h)){

       a->mdata.head.szdata -= sizeof(uint32_t);

+      break;

     }

   }

 }

 static void mrecv_req_send_data_write_error(mfile *m, mdata *r)

 {

-  mfile *a = mfins(0);

-  if(!a){

+  if(!mkack(&(m->mdata), &(m->addr), m->mdata.head.nstate)){

     lprintf(0, "%s: out of momory\n", __func__);

-    return;

   }

-

-  /*----- write error notlfy -----*/

-  a->mdata.head.flags |= MAKUO_FLAG_ACK;

-  a->mdata.head.opcode = r->head.opcode;

-  a->mdata.head.reqid  = r->head.reqid;

-  a->mdata.head.seqno  = r->head.seqno;

-  a->mdata.head.ostate = m->mdata.head.ostate;

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

-  a->mdata.head.szdata = 0;

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

 }

 static void mrecv_req_send_data_write(mfile *m, mdata *r)

@@ -644,23 +602,15 @@ static void mrecv_req_send_data_write(mfile *m, mdata *r)

 static void mrecv_req_send_data_retry(mfile *m, mdata *r)

 {

-  lprintf(3, "%s: markcount=%04u recv=%06u size=%06u %s\n",

-    __func__,

-    m->markcount, 

-    m->recvcount, 

-    m->seqnomax,  

-    m->fn);

-

   mmark *mm;

-  mfile *a = mfins(0);

-  a->mdata.head.flags |= MAKUO_FLAG_ACK;

-  a->mdata.head.opcode = r->head.opcode;

-  a->mdata.head.reqid  = r->head.reqid;

-  a->mdata.head.seqno  = r->head.seqno;

-  a->mdata.head.ostate = m->mdata.head.nstate;

-  a->mdata.head.nstate = MAKUO_RECVSTATE_OPEN;

-  a->mdata.head.szdata = 0;

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

+  mfile *a = mkack(&(m->mdata), &(m->addr), MAKUO_RECVSTATE_OPEN);

+  if(!a){

+    lprintf(0, "%s: out of momory\n", __func__);

+    return;

+  }

+  if(a->mdata.head.szdata){

+    return;

+  }

   data_safeset32(&(a->mdata), m->mdata.head.seqno);

   data_safeset32(&(a->mdata), r->head.seqno);

   for(mm=m->mark;mm;mm=mm->next){

@@ -702,7 +652,6 @@ static void mrecv_req_send_data(mfile *m, mdata *r)

 static void mrecv_req_send_close(mfile *m, mdata *r)

 {

-  mfile  *a;

   struct stat fs;

   struct utimbuf mftime;

   char  fpath[PATH_MAX];

@@ -771,23 +720,14 @@ static void mrecv_req_send_close(mfile *m, mdata *r)

       return;

   }

-  a = mfins(0);

-  if(!a){

+  if(!mkack(&(m->mdata), &(m->addr), m->mdata.head.nstate)){

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

-  }else{

-    a->mdata.head.flags |= MAKUO_FLAG_ACK;

-    a->mdata.head.opcode = r->head.opcode;

-    a->mdata.head.reqid  = r->head.reqid;

-    a->mdata.head.seqno  = r->head.seqno;

-    a->mdata.head.ostate = m->mdata.head.ostate;

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

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

   }

 }

 static void mrecv_req_send_last(mfile *m, mdata *r)

 {

-  mkack(r, &(m->addr), MAKUO_RECVSTATE_IGNORE);

+  mkack(r, &(m->addr), MAKUO_RECVSTATE_LAST);

   mrecv_mfdel(m);

 }

@@ -795,12 +735,10 @@ static void mrecv_req_send_next(mfile *m, mdata *r)

 {

   switch(r->head.nstate){

     case MAKUO_SENDSTATE_STAT:

-      lprintf(9,"%s: %s/%s %s\n", __func__, strsstate(r->head.nstate), strrstate(m->mdata.head.nstate), m->fn);

       mrecv_req_send_stat(m, r);

       break;

     case MAKUO_SENDSTATE_OPEN:

-      lprintf(9,"%s: %s/%s %s\n", __func__, strsstate(r->head.nstate), strrstate(m->mdata.head.nstate), m->fn);

       mrecv_req_send_open(m, r);

       break;

@@ -809,23 +747,18 @@ static void mrecv_req_send_next(mfile *m, mdata *r)

       break;

     case MAKUO_SENDSTATE_MARK:

-      lprintf(9,"%s: %s/%s rid=%d seqno=%d max=%d cnt=%d %s\n", __func__,

-        strsstate(r->head.nstate), strrstate(m->mdata.head.nstate), m->mdata.head.reqid, m->mdata.head.seqno, m->seqnomax, m->markcount, m->fn);

       mrecv_req_send_mark(m, r);

       break;

     case MAKUO_SENDSTATE_CLOSE:

-      lprintf(9,"%s: %s/%s %s\n", __func__, strsstate(r->head.nstate), strrstate(m->mdata.head.nstate), m->fn);

       mrecv_req_send_close(m, r);

       break;

     case MAKUO_SENDSTATE_LAST:

-      lprintf(9,"%s: %s/%s %s\n", __func__, strsstate(r->head.nstate), strrstate(m->mdata.head.nstate), m->fn);

       mrecv_req_send_last(m, r);

       break;

     case MAKUO_SENDSTATE_BREAK:

-      lprintf(9,"%s: %s/%s %s\n", __func__, strsstate(r->head.nstate), strrstate(m->mdata.head.nstate), m->fn);

       mrecv_req_send_break(m, r);

       break;

   }

@@ -850,12 +783,12 @@ static mfile *mrecv_req_send_create(mdata *data, struct sockaddr_in *addr)

     return(NULL);

   }

-  /* copy header */

+  /* copy header and addr */

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

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

-  data->p = data->data;

   /* read mstat */

+  data->p = data->data;

   data_safeget(data, &fs, sizeof(fs));

   /* stat = mstat */

@@ -914,11 +847,14 @@ static void mrecv_req_md5_open(mfile *m, mdata *data, struct sockaddr_in *addr)

 {

   int    r;

   int    l;

-  mfile *a;

   mhash *h;

   if(!m){

     m = mfadd(1);

+    if(!m){

+      lprintf(0,"%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);

@@ -946,27 +882,17 @@ static void mrecv_req_md5_open(mfile *m, mdata *data, struct sockaddr_in *addr)

       }

     }

   }

-  a=mfadd(0);

-  a->mdata.head.flags |= MAKUO_FLAG_ACK;

-  a->mdata.head.opcode = m->mdata.head.opcode;

-  a->mdata.head.reqid  = m->mdata.head.reqid;

-  a->mdata.head.seqno  = 0;

-  a->mdata.head.szdata = 0;

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

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

   mtimeget(&(m->lastrecv));

+  if(!mkack(&(m->mdata), &(m->addr), m->mdata.head.nstate)){

+    lprintf(0,"%s: out of memory\n", __func__);

+  }

 }

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

 {

-  mfile *a = mfadd(0);

-  a->mdata.head.flags |= MAKUO_FLAG_ACK;

-  a->mdata.head.opcode = data->head.opcode;

-  a->mdata.head.reqid  = data->head.reqid;

-  a->mdata.head.szdata = 0;

-  a->mdata.head.seqno  = 0;

-  a->mdata.head.nstate = MAKUO_RECVSTATE_CLOSE;

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

+  if(!mkack(data, addr, MAKUO_RECVSTATE_CLOSE)){

+    lprintf(0,"%s: out of memory\n", __func__);

+  }

   mrecv_mfdel(m);

 }

@@ -977,14 +903,7 @@ static void mrecv_req_md5_close(mfile *m, mdata *data, struct sockaddr_in *addr)

  */

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

 {

-  mfile *m = mftop[1];

-  while(m){

-    if(!memcmp(&m->addr, addr, sizeof(m->addr)) && m->mdata.head.reqid == data->head.reqid){

-      mtimeget(&m->lastrecv);

-      break;

-    }

-    m = m->next;

-  }

+  mfile *m = mrecv_req_search(data, addr);

   switch(data->head.nstate){

     case MAKUO_SENDSTATE_OPEN:

       mrecv_req_md5_open(m, data, addr);

@@ -1105,7 +1024,6 @@ static void dsync_scan(int fd, char *base, int recurs, excludeitem *e)

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

 {

-  lprintf(9, "%s:\n", __func__);

   mkack(data, addr, MAKUO_RECVSTATE_OPEN);

   if(m){

     return;

@@ -1130,7 +1048,6 @@ static void mrecv_req_dsync_data(mfile *m, mdata *data, struct sockaddr_in *addr

   char path[PATH_MAX];

   uint16_t len;

-  lprintf(9, "%s:\n", __func__);

   mkack(data, addr, MAKUO_RECVSTATE_OPEN);

   if(m->mdata.head.seqno >= data->head.seqno){

     return;

@@ -1195,7 +1112,6 @@ static void mrecv_req_dsync_data(mfile *m, mdata *data, struct sockaddr_in *addr

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

 {

-  lprintf(9, "%s:\n", __func__);

   if(!m){

     return;

   }

@@ -1208,7 +1124,6 @@ static void mrecv_req_dsync_last(mfile *m, mdata *data, struct sockaddr_in *addr

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

 {

-  lprintf(9, "%s:\n", __func__);

   if(m){

     if(m->link){

       m->link->mdata.head.nstate = MAKUO_SENDSTATE_BREAK;

@@ -1224,7 +1139,6 @@ static void mrecv_req_dsync_break(mfile *m, mdata *data, struct sockaddr_in *add

  */

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

 {

-  lprintf(9, "%s: rid=%d %s %s\n", __func__, data->head.reqid, stropcode(data), strmstate(data));

   mfile *m = mrecv_req_search(data, addr);

   switch(data->head.nstate){

     case MAKUO_SENDSTATE_OPEN:

@@ -1253,7 +1167,6 @@ static void mrecv_req_del_open(mdata *data, struct sockaddr_in *addr)

   mfile *a = mkack(data, addr, MAKUO_RECVSTATE_OPEN);

   char path[PATH_MAX];

-  lprintf(9, "%s: rid=%d\n", __func__, data->head.reqid);

   if(!a){

     lprintf(0, "%s: arror ack can't create\n", __func__);

     return;

@@ -1264,7 +1177,6 @@ static void mrecv_req_del_open(mdata *data, struct sockaddr_in *addr)

     len -= sizeof(uint32_t);

     data_safeget(data, path, len);

     path[len] =  0;

-    lprintf(9, "%s: rid=%d %s\n", __func__, data->head.reqid, path);

     if(lstat(path, &(a->fs)) == -1 && errno == ENOENT){

       data_safeset16(&(a->mdata), len + sizeof(uint32_t));

       data_safeset32(&(a->mdata), 0);

@@ -1300,7 +1212,6 @@ static void mrecv_req_del_data(mdata *data, struct sockaddr_in *addr)

   mfile *a = mkack(data, addr, MAKUO_RECVSTATE_OPEN);

   char path[PATH_MAX];

-  lprintf(9, "%s:\n", __func__);

   if(m){

     return;

   }

@@ -1333,7 +1244,6 @@ static void mrecv_req_del_data(mdata *data, struct sockaddr_in *addr)

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

 {

-  lprintf(9, "%s:\n", __func__);

   mfile *m = mrecv_req_search(data, addr);

   mfile *a = mkack(data, addr, MAKUO_RECVSTATE_CLOSE);

   if(!m){

@@ -1344,7 +1254,6 @@ static void mrecv_req_del_close(mdata *data, struct sockaddr_in *addr)

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

 {

-  lprintf(9, "%s: rid=%d %s %s\n", __func__, data->head.reqid, stropcode(data),  strsstate(data->head.nstate));

   switch(data->head.nstate){

     case MAKUO_SENDSTATE_OPEN: 

       mrecv_req_del_open(data, addr);

@@ -1398,12 +1307,10 @@ void mrecv_gc()

   /* file timeout */

   while(m){

     if(mtimeout(&(m->lastrecv), MAKUO_RECV_GCWAIT)){

-      if(MAKUO_RECVSTATE_CLOSE != m->mdata.head.nstate){

-        lprintf(0,"%s: mfile object GC state=%s %s\n",

-          __func__, 

-          strrstate(m->mdata.head.nstate), 

-          m->fn);

-      }

+      lprintf(0,"%s: mfile object GC state=%s %s\n",

+        __func__, 

+        strrstate(m->mdata.head.nstate), 

+        m->fn);

       m = mrecv_mfdel(m);

       continue;

     }

@@ -1440,12 +1347,6 @@ int mrecv(int s)

   if(mrecv_packet(s, &data, &addr) == -1){

     return(0);

   }

-  lprintf(9, "%s: %s %s rid=%d seq=%d\n", 

-    __func__, 

-    stropcode(&data), 

-    strmstate(&data),

-    data.head.reqid, 

-    data.head.seqno); 

   if(data.head.flags & MAKUO_FLAG_ACK){

     mrecv_ack(&data, &addr);

   }else{

@@ -72,52 +72,43 @@ static int msend_packet(int s, mdata *data, struct sockaddr_in *addr)

   senddata.head.error  = htonl(senddata.head.error);

   szdata += sizeof(mhead);

-  while(1){ 

+  while(loop_flag){ 

     FD_ZERO(&fds);

     FD_SET(moption.mcsocket, &fds);

     tv.tv_sec  = 1;

     tv.tv_usec = 0;

     if(select(1024, NULL, &fds, NULL, &tv) != 1){

-      if(!loop_flag){

-        return(-1);

-      }

       continue;

     }

     r = sendto(s, &senddata, szdata, 0, (struct sockaddr*)addr, sizeof(struct sockaddr_in));

     if(r == szdata){

-      return(1);

+      return(0);

     }

     if(r == -1){

-      if(errno == EAGAIN){

-        lprintf(0,"%s: EAGAIN\n", __func__);

-        return(-1);

-      }

       if(errno == EINTR){

         continue;

-      }else{

-        break;

       }

+      lprintf(0,"%s: send error (%s) %s %s rid=%d size=%d seqno=%d\n",

+        __func__,

+        strerror(errno), 

+        stropcode(data), 

+        strmstate(data),

+        data->head.reqid, 

+        szdata, 

+        data->head.seqno);

+      break;

+    }else{

+      lprintf(0, "%s: send size error %s %s rid=%d datasize=%d sendsize=%d seqno=%d\n",

+        __func__,

+        stropcode(data), 

+        strmstate(data),

+        data->head.reqid,

+        szdata, 

+        r, 

+        data->head.seqno);

+      break;

     }

   }

-  if(r != -1){

-    lprintf(0, "%s: send size error %s %s rid=%d datasize=%d sendsize=%d seqno=%d\n",

-      __func__,

-      stropcode(data), 

-      strmstate(data),

-      data->head.reqid,

-      szdata, 

-      r, 

-      data->head.seqno);

-    return(0);

-  }

-  lprintf(0,"%s: send error (%s) %s %s rid=%d size=%d seqno=%d\n",

-    __func__,

-    strerror(errno), 

-    stropcode(data), 

-    strmstate(data),

-    data->head.reqid, 

-    szdata, 

-    data->head.seqno);

   return(-1);

 }

@@ -180,7 +171,7 @@ static int msend_retry(mfile *m)

 /* send & free */

 static void msend_shot(int s, mfile *m)

 {

-  if(msend_packet(s, &(m->mdata), &(m->addr)) == 1){

+  if(!msend_packet(s, &(m->mdata), &(m->addr))){

     msend_mfdel(m);

   }

 }

@@ -254,7 +245,6 @@ static void msend_req_send_break_init(int s, mfile *m)

 static void msend_req_send_break(int s, mfile *m)

 {

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

   if(m->initstate){

     msend_req_send_break_init(s, m);

     return;

@@ -392,7 +382,6 @@ static void msend_req_send_stat(int s, mfile *m)

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

     return;

   }

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

   if(m->mdata.head.flags & MAKUO_FLAG_SYNC){

     msend_req_send_stat_delete_report(m);

     m->initstate = 1;

@@ -440,7 +429,6 @@ static void msend_req_send_open_init(int s, mfile *m)

 static void msend_req_send_open(int s, mfile *m)

 {

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

   if(m->initstate){

     msend_req_send_open_init(s, m);

     return;

@@ -449,7 +437,6 @@ static void msend_req_send_open(int s, mfile *m)

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

     return;

   }

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

   if(ack_check(m, MAKUO_RECVSTATE_UPDATE) == 1){

     m->sendwait = 1;

     ack_clear(m, MAKUO_RECVSTATE_UPDATE);

@@ -480,7 +467,6 @@ static void msend_req_send_markdata(int s, mfile *m)

   m->mdata.head.seqno = seq_getmark(m);

   offset = m->mdata.head.seqno;

   offset *= MAKUO_BUFFER_SIZE;

-  lprintf(9, "%s: block send retry seqno=%u count=%u\n", __func__, m->mdata.head.seqno, m->markcount);

   lseek(m->fd, offset, SEEK_SET);

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

   if(r>0){

@@ -569,7 +555,6 @@ static void msend_req_send_mark(int s, mfile *m)

     msend_req_send_mark_init(s, m);

     return;

   }

-  lprintf(9, "%s: MARK mark=%d %s\n", __func__, m->markcount, m->fn);

   m->mdata.head.nstate = MAKUO_SENDSTATE_DATA;

 }

@@ -681,7 +666,6 @@ static void msend_req_md5_open_init(int s, mfile *m)

 static void msend_req_md5_open(int s, mfile *m)

 {

   if(m->initstate){

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

     msend_req_md5_open_init(s, m);

     return;

   }

@@ -713,7 +697,6 @@ static void msend_req_md5_close(int s, mfile *m)

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

     return;

   }

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

   msend_mfdel(m);

 }

@@ -732,7 +715,6 @@ static void msend_req_md5(int s, mfile *m)

 static void msend_req_dsync_open(int s, mfile *m)

 {

-  lprintf(9, "%s: init=%d wait=%d\n", __func__, m->initstate, m->sendwait);

   if(m->initstate){

     m->initstate = 0;

     m->sendwait  = 1;

@@ -769,19 +751,16 @@ static void msend_req_dsync_data_init(int s, mfile *m)

     }

     data_safeset16(&(m->mdata), len);

     data_safeset(&(m->mdata), e->pattern, len);

-    lprintf(9, "%s: exclude add %s\n", __func__, e->pattern);

     m->mdata.head.seqno++;

     e = e->next;

   }

   if(m->mdata.head.szdata == 0){

     m->mdata.head.seqno++;

   }

-  lprintf(9,"%s: rid=%d seqno=%d size=%d\n", __func__, m->mdata.head.reqid, m->mdata.head.seqno, m->mdata.head.szdata);

 }

 static void msend_req_dsync_data(int s, mfile *m)

 {

-  lprintf(9, "%s: init=%d wait=%d\n", __func__, m->initstate, m->sendwait);

   if(m->initstate){

     msend_req_dsync_data_init(s, m);

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

@@ -799,7 +778,6 @@ static void msend_req_dsync_data(int s, mfile *m)

 static void msend_req_dsync_close(int s, mfile *m)

 {

-  lprintf(9, "%s: init=%d wait=%d\n", __func__, m->initstate, m->sendwait);

   if(m->initstate){

     m->sendwait  = 1;

     m->initstate = 0;

@@ -814,7 +792,6 @@ static void msend_req_dsync_close(int s, mfile *m)

 static void msend_req_dsync_break(int s, mfile *m)

 {

-  lprintf(9, "%s: init=%d wait=%d\n", __func__, m->initstate, m->sendwait);

   if(m->initstate){

     m->initstate = 0;

     m->sendwait  = 1;

@@ -832,7 +809,6 @@ static void msend_req_dsync_break(int s, mfile *m)

 /*----- dsync -----*/

 static void msend_req_dsync(int s, mfile *m)

 {

-  lprintf(9, "%s: rid=%d %s %s\n", __func__, m->mdata.head.reqid, stropcode(&(m->mdata)), strmstate(&(m->mdata)));

   if(m->mdata.head.nstate != MAKUO_SENDSTATE_LAST){

     if(!m->comm){

       if(m->mdata.head.nstate != MAKUO_SENDSTATE_BREAK){

@@ -862,7 +838,6 @@ static void msend_req_dsync(int s, mfile *m)

 static void msend_req_del_mark(int s, mfile *m)

 {

-  lprintf(9, "%s:\n", __func__);

   mfile *d = m->link; /* dsync object */

   if(m->initstate){

     m->initstate = 0;

@@ -916,7 +891,6 @@ static void msend_req_del_stat(int s, mfile *m)

     return;

   }