@@ -284,7 +284,7 @@ void member_del(mhost *t)

   free(t);

 }

-void member_del_message(mhost *t, char *mess)

+void member_del_message(int err, mhost *t, char *mess)

 {

   int i;

   mfile *m;

@@ -297,12 +297,14 @@ void member_del_message(mhost *t, char *mess)

       if(m->comm){

         if(m->comm->working){

           cprintf(0, m->comm, "error: %s: %s\n", mess, m->cmdline);

-          lprintf(0, "[error] %s: %s: ST=%s RC=%02d: %s\n", 

-            __func__, 

-            mess, 

-            strmstate(&(m->mdata)),

-            m->retrycnt,

-            m->cmdline);

+          if(err){

+            lprintf(0, "[error] %s: %s: ST=%s RC=%02d: %s\n", 

+              __func__, 

+              mess, 

+              strmstate(&(m->mdata)),

+              m->retrycnt,

+              m->cmdline);

+          }

         }

       }

     }

@@ -312,7 +314,9 @@ void member_del_message(mhost *t, char *mess)

       cprintf(0, &(moption.comm[i]), "error: %s: %s(%s)\n", mess, inet_ntoa(t->ad), t->hostname);

     }

   }

-  lprintf(0, "[error] %s: %s: %s(%s)\n", __func__, mess, inet_ntoa(t->ad), t->hostname);

+  if(err){

+    lprintf(0, "[error] %s: %s: %s(%s)\n", __func__, mess, inet_ntoa(t->ad), t->hostname);

+  }

 }

 mmark *markalloc()

@@ -934,24 +938,44 @@ mfile *mkack(mdata *data, struct sockaddr_in *addr, uint8_t state)

   return(a);

 }

-int atomic_read(int fd, char *buff, int size)

+int atomic_read(int fd, void *buff, int size, int nb)

 {

+  int e;

   int r;

+  int s;

+  int f;

+

+  s = size;

+  f = fcntl(fd, F_GETFL, 0);

+  if(nb){

+    fcntl(fd, F_SETFL, f | O_NONBLOCK);

+  }else{

+    fcntl(fd, F_SETFL, f & ~O_NONBLOCK);

+  }

   while(size){

     r = read(fd, buff, size);

+    e = errno;

+    /* EOF */

+    if(r == 0){

+      fcntl(fd, F_SETFL, f);

+      return(1);

+    }

+    /* ERROR */

     if(r == -1){

-      if(errno == EINTR){

+      if(e == EINTR){

         continue;

       }

+      fcntl(fd, F_SETFL, f);

+      errno = e;

       return(-1);

     }

-    if(r == 0){

-      return(1);

-    }

+    /* SUCCESS */

     size -= r;

     buff += r;

+    fcntl(fd, F_SETFL, f & ~O_NONBLOCK);

   }

+  fcntl(fd, F_SETFL, f);

   return(0);

 }

@@ -15,7 +15,7 @@ void recv_timeout(mfile *m)

     for(t=members;t;t=t->next){

       r = get_hoststate(t, m);

       if(*r == MAKUO_RECVSTATE_NONE){

-        member_del_message(t, "receive time out");

+        member_del_message(1, t, "receive time out");

         member_del(t);

         break;

       }

@@ -27,7 +27,7 @@ void recv_timeout(mfile *m)

 struct timeval *pingpong(int n)

 {

   static struct timeval tv;

-  mfile *m = mfins(0);

+  mfile *m = mfins(MFSEND);

   mping *p = NULL;

   char buff[MAKUO_HOSTNAME_MAX + 1];

@@ -186,6 +186,16 @@ int ismsend(mfile *m, int flag)

   if(!m){

     return(0);

   }

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

+    return(0);

+  }

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

+    if(flag){

+      msend(m);

+    }

+    return(0);

+  }

+

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

     if(!mfdirchk(m)){

       return(0);

@@ -238,7 +248,7 @@ void mloop()

     /* udp packet send */

     para = 0;

-    m = mftop[0];

+    m = mftop[MFSEND];

     while(m){

       n = m->next;

       para += ismsend(m, 1);

@@ -256,7 +266,7 @@ void mloop()

     FD_ZERO(&wfds);

     FD_SET(moption.mcsocket,  &rfds);

     mcomm_fdset(moption.comm, &rfds);

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

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

       if(ismsend(m, 0)){

         FD_SET(moption.mcsocket, &wfds);

         break;

@@ -265,17 +275,17 @@ void mloop()

     tv.tv_sec  = 1;

     tv.tv_usec = 0;

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

+      mrecv_gc();

       continue;

     }

-    moption.sendready = FD_ISSET(moption.mcsocket,&rfds);

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

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

-    mrecv_gc();

+    moption.sendready = FD_ISSET(moption.mcsocket,&wfds);

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

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

   }

   /* shutdown notify */

   pingpong(2);

-  msend(mftop[0]);

+  msend(mftop[MFSEND]);

 }

 int main(int argc, char *argv[])

@@ -88,6 +88,7 @@

 #define MAKUO_SENDSTATE_LAST       5  /* 送信完了   */

 #define MAKUO_SENDSTATE_ERROR      6  /* エラー発生 */

 #define MAKUO_SENDSTATE_BREAK      7  /* 送信中断   */

+#define MAKUO_SENDSTATE_WAIT       8  /* 送信待機   */

 /*----- recvstatus -----*/

 #define MAKUO_RECVSTATE_NONE       0

@@ -296,7 +297,7 @@ char *strrstate(uint8_t n);

 char *strmstate(mdata *data);

 char *stropcode(mdata *data);

 char *strackreq(mdata *data);

-void mprintf(const char *func, mfile *m);

+void mprintf(int l, const char *func, mfile *m);

 void lprintf(int l, char *fmt, ...);

 void cprintf(int l, mcomm *c, char *fmt, ...);

 void fdprintf(int s, char *fmt, ...);

@@ -329,6 +330,7 @@ int mremove(char *base, char *name);

 int mcreatedir(char  *base, char *name, mode_t mode);

 int mcreatefile(char *base, char *name, mode_t mode);

 int mcreatelink(char *base, char *name, char *link);

+int atomic_read(int fd, void *buff, int size, int nb);

 void set_filestat(char *path, uid_t uid, gid_t gid, mode_t mode);

 /*----- uid/gid -----*/

@@ -339,7 +341,7 @@ int set_gids(char *groups);

 void   member_del(mhost *h);

 mhost *member_get(struct in_addr *addr);

 mhost *member_add(struct in_addr *addr, mdata *recvdata);

-void   member_del_message(mhost *t, char *mess);

+void   member_del_message(int err, mhost *t, char *mess);

 /*----- mark operation -----*/

 mmark   *delmark(mmark *mm);

@@ -379,7 +379,7 @@ static void mrecv_ack(mdata *data, struct sockaddr_in *addr)

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

 static mfile *mrecv_req_search(mdata *data, struct sockaddr_in *addr)

 {

-  mfile *m = mftop[1];

+  mfile *m = mftop[MFRECV];

   while(m){

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

       break;

@@ -410,6 +410,7 @@ static void mrecv_req_ping(mdata *data, struct sockaddr_in *addr)

   a->mdata.p += p->versionlen;

   p->hostnamelen = htons(p->hostnamelen);

   p->versionlen  = htons(p->versionlen);

+  msend(a);

 }

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

@@ -418,7 +419,7 @@ static void mrecv_req_exit(mdata *data, struct sockaddr_in *addr)

   if(!t){

     return;

   }

-  member_del_message(t, "member exit");

+  member_del_message(0, t, "member exit");

   member_del(t);

 }

@@ -575,11 +576,6 @@ static void mrecv_req_send_mark(mfile *m, mdata *r)

   msend(a);

 }

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

-{

-  msend(mkack(&(m->mdata), &(m->addr), m->mdata.head.nstate));

-}

-

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

 {

   off_t offset;

@@ -592,7 +588,7 @@ static void mrecv_req_send_data_write(mfile *m, mdata *r)

     m->mdata.head.error  = errno;

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

     m->mdata.head.nstate = MAKUO_RECVSTATE_WRITEERROR;

-    mrecv_req_send_data_write_error(m, r);

+    msend(mkack(&(m->mdata), &(m->addr), m->mdata.head.nstate));

     lprintf(0, "[error] %s: seek error (%s) seq=%u\n",

       __func__,

       strerror(m->mdata.head.error), 

@@ -603,7 +599,7 @@ static void mrecv_req_send_data_write(mfile *m, mdata *r)

     m->mdata.head.error  = errno;

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

     m->mdata.head.nstate = MAKUO_RECVSTATE_WRITEERROR;

-    mrecv_req_send_data_write_error(m, r);

+    msend(mkack(&(m->mdata), &(m->addr), m->mdata.head.nstate));

     lprintf(0, "[error] %s: write error (%s) seqno=%d size=%d %s\n",

       __func__,

       strerror(m->mdata.head.error), 

@@ -623,18 +619,17 @@ static void mrecv_req_send_data_retry(mfile *m, mdata *r)

     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){

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

-      break;

-    }

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

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

-      break;

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

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

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

+    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;

+      }

     }

   }

   msend(a);

@@ -884,7 +879,7 @@ static void mrecv_req_send(mdata *data, struct sockaddr_in *addr)

     mrecv_req_send_next(m, data);

   }else{

     if(data->head.nstate != MAKUO_SENDSTATE_DATA){

-      mkack(data, addr, MAKUO_RECVSTATE_IGNORE);

+      msend(mkack(data, addr, MAKUO_RECVSTATE_IGNORE));

     }

   }

 }

@@ -929,12 +924,12 @@ static void mrecv_req_md5_open(mfile *m, mdata *data, struct sockaddr_in *addr)

     }

   }

   mtimeget(&(m->lastrecv));

-  mkack(&(m->mdata), &(m->addr), m->mdata.head.nstate);

+  msend(mkack(&(m->mdata), &(m->addr), m->mdata.head.nstate));

 }

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

 {

-  mkack(data, addr, MAKUO_RECVSTATE_CLOSE);

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

   mrecv_mfdel(m);

 }

@@ -1089,11 +1084,11 @@ static int dsync_scan(int fd, char *base, int recurs, excludeitem *e)

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

 {

-  mkack(data, addr, MAKUO_RECVSTATE_OPEN);

+  msend(mkack(data, addr, MAKUO_RECVSTATE_OPEN));

   if(m){

     return;

   }

-  m = mfadd(1);

+  m = mfadd(MFRECV);

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

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

   m->mdata.head.flags  = data->head.flags;

@@ -1113,7 +1108,7 @@ static void mrecv_req_dsync_data(mfile *m, mdata *data, struct sockaddr_in *addr

   char path[PATH_MAX];

   uint16_t len;

-  mkack(data, addr, MAKUO_RECVSTATE_OPEN);

+  msend(mkack(data, addr, MAKUO_RECVSTATE_OPEN));

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

     return;

   }

@@ -1178,13 +1173,13 @@ static void mrecv_req_dsync_data(mfile *m, mdata *data, struct sockaddr_in *addr

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

 {

   if(!m){

-    mkack(data, addr, MAKUO_RECVSTATE_CLOSE);

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

     return;

   }

   if(m->link){

-    mkack(data, addr, MAKUO_RECVSTATE_OPEN);

+    msend(mkack(data, addr, MAKUO_RECVSTATE_OPEN));

   }else{

-    mkack(data, addr, MAKUO_RECVSTATE_CLOSE);

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

   }

 }

@@ -1209,7 +1204,7 @@ static void mrecv_req_dsync_break(mfile *m, mdata *data, struct sockaddr_in *add

     }

     mrecv_mfdel(m);

   }

-  mkack(data, addr, MAKUO_RECVSTATE_BREAK);

+  msend(mkack(data, addr, MAKUO_RECVSTATE_BREAK));

 }

 /*

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

       data_safeset(&(a->mdata), path, len);

     }

   }

+  msend(a);

 }

 static void mrecv_req_del_data_report(mfile *m, mcomm *c, uint32_t err, char *hn, char *path)

@@ -1289,17 +1285,18 @@ static void mrecv_req_del_data(mdata *data, struct sockaddr_in *addr)

   char *hn = "unknown host";

   mhost *t = member_get(&(addr->sin_addr));

   mcomm *c = NULL;

+  mfile *a = NULL;

   mfile *m = mrecv_req_search(data, addr);

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

   char path[PATH_MAX];

+  msend(mkack(data, addr, MAKUO_RECVSTATE_OPEN));

   if(m){

     return;

   }

   if(t){

     hn = t->hostname;

   }

-  m = mfadd(1);

+  m = mfadd(MFRECV);

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

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

   m->mdata.head.nstate = MAKUO_RECVSTATE_OPEN;

@@ -1307,7 +1304,7 @@ static void mrecv_req_del_data(mdata *data, struct sockaddr_in *addr)

   if(data->head.flags & MAKUO_FLAG_DRYRUN){

     m->dryrun = 1;

   }

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

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

     if((a->mdata.head.reqid == data->head.seqno) && (a->comm != NULL)){

       c = a->comm;

       break;

@@ -1326,7 +1323,7 @@ static void mrecv_req_del_data(mdata *data, struct sockaddr_in *addr)

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

 {

   mfile *m = mrecv_req_search(data, addr);

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

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

   mrecv_mfdel(m);

 }

@@ -1367,7 +1364,7 @@ static void mrecv_req(mdata *data, struct sockaddr_in *addr)

       mrecv_req_del(data,   addr);

       break;

     default:

-      mkack(data, addr, MAKUO_RECVSTATE_IGNORE);

+      msend(mkack(data, addr, MAKUO_RECVSTATE_IGNORE));

       break;

   }

 }

@@ -1380,13 +1377,12 @@ static void mrecv_req(mdata *data, struct sockaddr_in *addr)

 void mrecv_gc()

 {

   mhost *t = members;

-  mfile *m = mftop[1]; 

+  mfile *m = mftop[MFRECV]; 

   /* file timeout */

   while(m){

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

-      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;

     }

@@ -1399,7 +1395,7 @@ void mrecv_gc()

       t = t->next;

     }else{

       lprintf(0,"%s: pong timeout %s\n", __func__, t->hostname);

-      member_del_message(t, "pong time out");

+      member_del_message(1, t, "pong time out");

       if(t->next){

         t = t->next;

         member_del(t->prev);

@@ -1413,7 +1409,7 @@ void mrecv_gc()

 void mrecv_clean()

 {

-  mfile *m = mftop[1];

+  mfile *m = mftop[MFRECV];

   while(m=mrecv_mfdel(m));

 }

@@ -1424,7 +1420,7 @@ int mrecv()

   mdata data;

   struct sockaddr_in addr;

-  m = mftop[0];

+  m = mftop[MFSEND];

   if(mrecv_packet(moption.mcsocket, &data, &addr) == -1){

     return(0);

   }

@@ -1436,6 +1432,6 @@ int mrecv()

   }else{

     mrecv_req(&data, &addr);

   }

-  return(m == mftop[0]);

+  return(m == mftop[MFSEND]);

 }

@@ -100,7 +100,7 @@ static int msend_packet(int s, mdata *data, struct sockaddr_in *addr)

     moption.sendready = 0;

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

     if(r == szdata){

-      return(0); // success

+      return(0); /* success */

     }

     if(r == -1){

       if(errno == EINTR){

@@ -144,51 +144,34 @@ static int msend_retry(mfile *m)

     m->retrycnt = MAKUO_SEND_RETRYCNT;

     return(0);

   }

-  /*

-  if(m->mdata.head.opcode == MAKUO_OP_DSYNC){

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

-      m->retrycnt--;

-      w = (MAKUO_SEND_RETRYCNT - m->retrycnt) * MAKUO_SEND_TIMEOUT;

-      if(w < 15000){

-        return(0);

-      }else{

-        m->retrycnt = MAKUO_SEND_RETRYCNT;

-      }

-    }

-  }

-  */

-  lprintf(2, "%s: send retry count=%02d rid=%06d op=%s state=%s %s\n", 

-    __func__,

-    m->retrycnt, 

-    m->mdata.head.reqid, 

-    stropcode(&(m->mdata)),

-    strmstate(&(m->mdata)), 

-    m->fn);

-  for(t=members;t;t=t->next){

-    r = get_hoststate(t, m);

-    if(!r){

-      lprintf(0, "%s: can't alloc state area %s\n",

-        __func__, 

-        t->hostname);

-      continue;

-    }

-    switch(moption.loglevel){

-      case 2:

-        if(*r == MAKUO_RECVSTATE_NONE){

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

-            __func__, 

-           strrstate(*r), 

-           inet_ntoa(t->ad), 

-           t->hostname);

-        }

-        break;

-      default:

-        lprintf(3, "%s:   %s %s(%s)\n", 

+  if(moption.loglevel > 1){

+    mprintf(2, __func__, m); 

+    for(t=members;t;t=t->next){

+      r = get_hoststate(t, m);

+      if(!r){

+        lprintf(0, "%s: can't alloc state area %s\n",

           __func__, 

-          strrstate(*r), 

-          inet_ntoa(t->ad), 

           t->hostname);

-        break;

+        continue;

+      }

+      switch(moption.loglevel){

+        case 2:

+          if(*r == MAKUO_RECVSTATE_NONE){

+            lprintf(0, "%s:   %s %s(%s)\n", 

+              __func__, 

+             strrstate(*r), 

+             inet_ntoa(t->ad), 

+             t->hostname);

+          }

+          break;

+        default:

+          lprintf(3, "%s:   %s %s(%s)\n", 

+            __func__, 

+            strrstate(*r), 

+            inet_ntoa(t->ad), 

+            t->hostname);

+          break;

+      }

     }

   }

   m->retrycnt--;

@@ -905,19 +888,29 @@ static int msend_req_del_stat_read_pathcmp(int s, mfile *m)

 static void msend_req_del_stat_read(int s, mfile *m)

 {

+  int r;

   mfile *d;

   uint16_t len;

-  d = mkreq(&(m->mdata), &(m->addr), MAKUO_SENDSTATE_OPEN);

-  d->mdata.head.flags = m->mdata.head.flags;

-  d->mdata.head.reqid = getrid();

-  d->initstate = 1;

-  d->sendwait  = 0;

-  d->sendto    = 1;

-  d->dryrun    = m->dryrun;

-  d->recurs    = m->recurs;

-  d->link      = m;

-  d->mdata.p   = d->mdata.data;

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

+    if(d->link == m){

+      if(d->mdata.head.nstate == MAKUO_SENDSTATE_WAIT){

+        break;

+      }

+    }

+  }

+  if(!d){

+    d = mkreq(&(m->mdata), &(m->addr), MAKUO_SENDSTATE_WAIT);

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

+    d->mdata.head.reqid = getrid();

+    d->initstate = 1;

+    d->sendwait  = 0;

+    d->sendto    = 1;

+    d->dryrun    = m->dryrun;

+    d->recurs    = m->recurs;

+    d->link      = m;

+    d->mdata.p   = d->mdata.data;

+  }

   if(m->len >= sizeof(m->mod)){

     len = m->len - sizeof(m->mod);

@@ -928,7 +921,14 @@ static void msend_req_del_stat_read(int s, mfile *m)

   }

   while(1){

-    if(atomic_read(m->pipe, &(m->len), sizeof(m->len))){

+    if(r = atomic_read(m->pipe, &(m->len), sizeof(m->len), 1)){

+      if(r == -1){

+        if(errno == EAGAIN){

+          return;

+        }else{

+          lprintf(0, "[error] %s: length read error\n", __func__);

+        }

+      }

       break;

     }

     if(m->len <= sizeof(m->mod)){

@@ -936,11 +936,11 @@ static void msend_req_del_stat_read(int s, mfile *m)

       break;

     }

     len = m->len - sizeof(m->mod);

-    if(atomic_read(m->pipe, &(m->mod), sizeof(m->mod))){

+    if(atomic_read(m->pipe, &(m->mod), sizeof(m->mod), 0)){

       lprintf(0, "[error] %s: filemode read error\n", __func__);

       break;

     }

-    if(atomic_read(m->pipe, m->tn, len)){

+    if(atomic_read(m->pipe, m->tn, len, 0)){

       lprintf(0, "[error] %s: filename read error\n", __func__);

       break;

     }

@@ -956,13 +956,17 @@ static void msend_req_del_stat_read(int s, mfile *m)

       continue;

     }

     if(d->mdata.head.szdata + sizeof(m->len) + m->len > MAKUO_BUFFER_SIZE){

-      return; /* packet full */

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

+    }else{

+      strcpy(d->fn, m->tn);

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

+      data_safeset32(&(d->mdata), m->mod);

+      data_safeset(&(d->mdata), m->tn, len);

+      m->len = 0;

     }

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

-    data_safeset32(&(d->mdata), m->mod);

-    data_safeset(&(d->mdata), m->tn, len);

-    m->len = 0;

+    return;

   }

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

   close(m->pipe);

   m->pipe      = -1;

   m->initstate =  1;

@@ -1011,6 +1015,15 @@ static void msend_req_del_last(int s, mfile *m)

 static void msend_req_del_break(int s, mfile *m)

 {

+  mfile *d;

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

+    if(d->link == m){

+      if(d->mdata.head.nstate == MAKUO_SENDSTATE_WAIT){

+        msend_mfdel(d);

+        break;

+      }

+    }

+  }

   msend_mfdel(m);

   lprintf(0,"%s: break dsync\n", __func__);

 }

@@ -1136,19 +1149,18 @@ static void msend_req(int s, mfile *m)

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

 void msend(mfile *m)

 {

-  if(msend_retry(m)){

-    return;

-  }

-  mtimeget(&m->lastsend);

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

     msend_ack(moption.mcsocket, m); 

   }else{

-    msend_req(moption.mcsocket, m); 

+    if(!msend_retry(m)){

+      msend_req(moption.mcsocket, m); 

+      mtimeget(&m->lastsend);

+    }

   }

 }

 void msend_clean()

 {

-  mfile *m = mftop[0];

+  mfile *m = mftop[MFSEND];

   while(m=msend_mfdel(m));

 }

@@ -28,6 +28,7 @@ char *sstatestrlist[]={"SEND_STAT   ",

                        "SEND_LAST   ",

                        "SEND_ERROR  ",

                        "SEND_BREAK  ",

+                       "SEND_WAIT   ",

                        "SEND_UNKNOWN"};

 uint8_t sstatenumlist[]={MAKUO_SENDSTATE_STAT,

@@ -38,6 +39,7 @@ uint8_t sstatenumlist[]={MAKUO_SENDSTATE_STAT,

                          MAKUO_SENDSTATE_LAST,

                          MAKUO_SENDSTATE_ERROR,

                          MAKUO_SENDSTATE_BREAK,

+                         MAKUO_SENDSTATE_WAIT,

                          MAKUO_STATE_MAX};

 char *rstatestrlist[] = {"RECV_NONE    ",

@@ -182,11 +184,11 @@ void cprintf(int l, mcomm *c, char *fmt, ...)

   }

 }

-void mprintf(const char *func, mfile *m)

+void mprintf(int l, const char *func, mfile *m)

 {

   if(!m)

     return;

-  lprintf(9, "%s: rc=%d rid=%d init=%d wait=%d %s %s %s %s\n",

+  lprintf(l, "%s: rc=%d rid=%d init=%d wait=%d %s %s %s %s\n",

     func, 

     m->retrycnt,

     m->mdata.head.reqid,