@@ -1,3 +1,8 @@

+1.0.1:

+ - add spec file   (support/makuosan.spec)

+ - add init script (support/makuosan.sysv)

+ - support for FreeBSD & MacOSX

+

 1.0.0:

  - stable release

  - change default value -f option. 1 to 3

@@ -39,7 +39,6 @@ char *rstatestrlist[16] = {"RECV_NONE",

                            "RECV_CLOSE",

                            "RECV_IGNORE",

                            "RECV_READONLY",

-                           "RECV_RETRY",

                            "RECV_MD5OK",

                            "RECV_MD5NG",

                            "RECV_OPENERR",

@@ -56,7 +55,6 @@ uint8_t rstatenumlist[16]={MAKUO_RECVSTATE_NONE,

                            MAKUO_RECVSTATE_CLOSE,

                            MAKUO_RECVSTATE_IGNORE,

                            MAKUO_RECVSTATE_READONLY,

-                           MAKUO_RECVSTATE_RETRY,

                            MAKUO_RECVSTATE_MD5OK,

                            MAKUO_RECVSTATE_MD5NG,

                            MAKUO_RECVSTATE_OPENERROR,

@@ -358,15 +356,15 @@ int seq_addmark(mfile *m, uint32_t lseq, uint32_t useq)

     }

   }

   size = m->marksize;

-  while(size < m->markcount + useq - lseq)

+  while(size < m->markcount + useq - lseq){

     size += 1024;

+  }

   if(size != m->marksize){

     n = realloc(m->mark, sizeof(uint32_t) * size);

     if(!n){

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

       return(-1); 

     }

-    a = mfins(0);

     m->mark = n;

     m->marksize = size;

   }

@@ -378,19 +376,13 @@ int seq_addmark(mfile *m, uint32_t lseq, uint32_t useq)

         break;

     if(j == m->markcount){

       m->mark[m->markcount++] = i;

+      m->markdelta++;

     }

   }

-

-  /***** complaint *****/

-  if(a){

-    lprintf(2,"%s: complaint (%d/%d) %s\n", __func__, m->markcount, m->marksize, m->fn);

-    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.szdata = 0;

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

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

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

+  lprintf(1,"%s: l=%u u=%u sub=%d\n", __func__, lseq, useq, useq - lseq);

+  if(m->markdelta>64){

+    m->markdelta = 0;

+    return(1);

   }

   return(0);

 }

@@ -1,6 +1,6 @@

 #! /bin/sh

 # Guess values for system-dependent variables and create Makefiles.

-# Generated by GNU Autoconf 2.61 for makuosan 1.0.1.

+# Generated by GNU Autoconf 2.61 for makuosan 1.0.2.

 #

 # Report bugs to <info-makuosan@klab.jp>.

 #

@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}

 # Identity of this package.

 PACKAGE_NAME='makuosan'

 PACKAGE_TARNAME='makuosan'

-PACKAGE_VERSION='1.0.1'

-PACKAGE_STRING='makuosan 1.0.1'

+PACKAGE_VERSION='1.0.2'

+PACKAGE_STRING='makuosan 1.0.2'

 PACKAGE_BUGREPORT='info-makuosan@klab.jp'

 ac_unique_file="makuosan.c"

@@ -1209,7 +1209,7 @@ if test "$ac_init_help" = "long"; then

   # Omit some internal or obsolete options to make the list less imposing.

   # This message is too long to be a string in the A/UX 3.1 sh.

   cat <<_ACEOF

-\`configure' configures makuosan 1.0.1 to adapt to many kinds of systems.

+\`configure' configures makuosan 1.0.2 to adapt to many kinds of systems.

 Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1275,7 +1275,7 @@ fi

 if test -n "$ac_init_help"; then

   case $ac_init_help in

-     short | recursive ) echo "Configuration of makuosan 1.0.1:";;

+     short | recursive ) echo "Configuration of makuosan 1.0.2:";;

    esac

   cat <<\_ACEOF

@@ -1359,7 +1359,7 @@ fi

 test -n "$ac_init_help" && exit $ac_status

 if $ac_init_version; then

   cat <<\_ACEOF

-makuosan configure 1.0.1

+makuosan configure 1.0.2

 generated by GNU Autoconf 2.61

 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,

@@ -1373,7 +1373,7 @@ cat >config.log <<_ACEOF

 This file contains any messages produced by compilers while

 running configure, to aid debugging if configure makes a mistake.

-It was created by makuosan $as_me 1.0.1, which was

+It was created by makuosan $as_me 1.0.2, which was

 generated by GNU Autoconf 2.61.  Invocation command line was

   $ $0 $@

@@ -2064,7 +2064,7 @@ fi

 # Define the identity of the package.

  PACKAGE='makuosan'

- VERSION='1.0.1'

+ VERSION='1.0.2'

 cat >>confdefs.h <<_ACEOF

@@ -8995,7 +8995,7 @@ exec 6>&1

 # report actual input values of CONFIG_FILES etc. instead of their

 # values after options handling.

 ac_log="

-This file was extended by makuosan $as_me 1.0.1, which was

+This file was extended by makuosan $as_me 1.0.2, which was

 generated by GNU Autoconf 2.61.  Invocation command line was

   CONFIG_FILES    = $CONFIG_FILES

@@ -9052,7 +9052,7 @@ Report bugs to <bug-autoconf@gnu.org>."

 _ACEOF

 cat >>$CONFIG_STATUS <<_ACEOF

 ac_cs_version="\\

-makuosan config.status 1.0.1

+makuosan config.status 1.0.2

 configured by $0, generated by GNU Autoconf 2.61,

   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

@@ -1,7 +1,7 @@

 #                                               -*- Autoconf -*-

 # Process this file with autoconf to produce a configure script.

 AC_PREREQ(2.61)

-AC_INIT(makuosan, 1.0.1, info-makuosan@klab.jp)

+AC_INIT(makuosan, 1.0.2, info-makuosan@klab.jp)

 AM_INIT_AUTOMAKE

 AC_CONFIG_SRCDIR([makuosan.c])

 AC_CONFIG_HEADER([config.h])

@@ -56,7 +56,7 @@

 /*----- timeout -----*/

 #define MAKUO_SEND_TIMEOUT  500    /* 再送間隔(ms)                                 */

 #define MAKUO_SEND_RETRYCNT 120    /* 再送回数                                     */

-#define MAKUO_SEND_DELAYSTP 1      /* 送出遅延時間の増分(ms)                       */

+#define MAKUO_SEND_DELAYSTP 0      /* 送出遅延時間の増分(ms)                       */

 #define MAKUO_PONG_TIMEOUT  180000 /* メンバから除外するまでの時間(ms)             */

 #define MAKUO_PONG_INTERVAL 45000  /* PING送信間隔(ms)                             */

 #define MAKUO_RECV_GCWAIT   180000 /* 消し損ねたオブジェクトを開放する待ち時間(ms) */

@@ -70,6 +70,8 @@

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

 #define MAKUO_FLAG_ACK   1

 #define MAKUO_FLAG_CRYPT 2

+#define MAKUO_FLAG_WAIT  4

+#define MAKUO_FLAG_FMARK 8

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

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

@@ -90,7 +92,6 @@

 #define MAKUO_RECVSTATE_CLOSE      5

 #define MAKUO_RECVSTATE_IGNORE     6

 #define MAKUO_RECVSTATE_READONLY   7

-#define MAKUO_RECVSTATE_RETRY      8

 #define MAKUO_RECVSTATE_MD5OK      10

 #define MAKUO_RECVSTATE_MD5NG      11

 #define MAKUO_RECVSTATE_OPENERROR  90

@@ -190,8 +191,12 @@ typedef struct

   uint32_t senddelay;

   uint32_t initstate;

   uint32_t recvcount;

+  uint32_t markdelta;

   uint32_t markcount;

+  uint32_t waitcount;

+  uint32_t waitspan;

   uint32_t marksize;

+  uint32_t seqnonow;

   uint32_t seqnomax;

   mdata mdata;

   mcomm *comm;

@@ -331,6 +331,7 @@ int mexec_send(mcomm *c, int n)

 	m->comm      = c;

   m->dryrun    = (mode == MAKUO_MEXEC_DRY);

   m->initstate = 1;

+  m->seqnonow  = 0;

   m->seqnomax  = m->fs.st_size / MAKUO_BUFFER_SIZE;

   if(m->fs.st_size % MAKUO_BUFFER_SIZE){

     m->seqnomax++; 

@@ -615,15 +616,17 @@ int mexec_status(mcomm *c, int n)

     cprintf(0, c, "basedir  : %s/\n", moption.base_dir);

   }

   count = 0;

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

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

     count++;

+  }

   cprintf(0,c,"send file: %d\n", count);

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

-    if(m->lickflag){

-      cprintf(0, c, "  %s %s (%d/%d)\n", SSTATE(m->mdata.head.nstate), m->fn, m->mdata.head.seqno,m->seqnomax); 

-    }else{

-      cprintf(0, c, "  %s %s (%d/%d)\n", SSTATE(m->mdata.head.nstate), m->fn, m->mdata.head.seqno,m->seqnomax); 

+    uint32_t snow = m->seqnonow;

+    uint32_t smax = m->seqnomax;

+    if(snow > smax){

+      snow = smax;

     }

+    cprintf(0, c, "  %s %s (%u:%u/%u)\n", SSTATE(m->mdata.head.nstate), m->fn, m->markcount, snow, smax); 

   }

   count = 0;

@@ -209,6 +209,20 @@ static void mrecv_ack_ping(mdata *data, struct sockaddr_in *addr)

   member_add(&addr->sin_addr, data);

 }

+static void mrecv_ack_send_mark(mdata *data, mfile *m, mhost *t)

+{

+  uint32_t *d = (uint32_t *)(data->data);

+  while(d < (uint32_t *)&data->data[data->head.szdata]){

+    if(*d >= m->seqnomax){

+      lprintf(0, "%s: mark seqno error seq=%d max=%d %s from %s\n", __func__,

+         *d, m->seqnomax, m->fn, t->hostname);

+      break;

+    }

+    seq_addmark(m, *d, (*d) + 1);

+    d++;

+  }

+}

+

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

 {

   uint8_t *r;

@@ -224,31 +238,22 @@ static void mrecv_ack_send(mdata *data, struct sockaddr_in *addr)

       data->head.reqid, RSTATE(data->head.nstate), inet_ntoa(t->ad), t->hostname, m->fn);

   }

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

-    uint32_t *d = (uint32_t *)(data->data);

-    while(d < (uint32_t *)&data->data[data->head.szdata]){

-      if(*d >= m->seqnomax){

-        lprintf(0, "%s: mark seqno error seq=%d max=%d %s from %s\n", __func__,

-           *d, m->seqnomax, m->fn, t->hostname);

-        break;

-      }

-      seq_addmark(m, *d, (*d) + 1);

-      d++;

+    mrecv_ack_send_mark(data, m, t);

+    if(data->head.flags & MAKUO_FLAG_FMARK){

+      return;

     }

   }

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

-    lprintf(0, "%s: send retry %s from %s\n", __func__, m->fn, t->hostname);

-    m->sendwait   = 0;

-    m->lickflag   = 0;

-    m->senddelay += MAKUO_SEND_DELAYSTP;

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

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

-  }else{

-    if(r = get_hoststate(t, m)){

-      *r = data->head.nstate;

-    }else{

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

+  if(data->head.nstate == MAKUO_RECVSTATE_OPEN){

+    mrecv_ack_send_mark(data, m, t);

+    if(data->head.flags & MAKUO_FLAG_FMARK){

+      return;

     }

   }

+  if(r = get_hoststate(t, m)){

+    *r = data->head.nstate;

+  }else{

+    lprintf(0, "%s: hoststate error\n", __func__);

+  }

   mrecv_ack_report(m, t, data);

 }

@@ -462,49 +467,53 @@ static void mrecv_req_send_open(mfile *m, mdata *r)

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

 }

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

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

 {

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

     return;

-  if(m->lickflag){

-    if(!seq_delmark(m, r->head.seqno)){

-      return;

-    }

-  }else{

-    if(m->mdata.head.seqno > r->head.seqno){

-      seq_delmark(m, r->head.seqno);

-    }else{

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

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

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

-      }

-      m->mdata.head.seqno++;

-    }

+  mfile *a = mfins(0);

+  if(!a){

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

+    return;

   }

-  if(lseek(m->fd, r->head.seqno * MAKUO_BUFFER_SIZE, SEEK_SET) == -1){

-    lprintf(0, "%s: seek error seq=%d size=%d fd=%d err=%d\n", __func__, (int)r->head.seqno, r->head.szdata, m->fd, errno);

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

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

-  }else{

-    if(write(m->fd, r->data, r->head.szdata) != -1){

-      m->recvcount++;

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

+  if(m->markcount){

+    if(MAKUO_BUFFER_SIZE < m->markcount * sizeof(uint32_t)){

+      a->marksize = MAKUO_BUFFER_SIZE / sizeof(uint32_t);

     }else{

-      lprintf(0, "%s: write error seqno=%d size=%d fd=%d err=%d\n", __func__, (int)r->head.seqno, r->head.szdata, m->fd, errno);

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

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

+      a->marksize = m->markcount;

     }

+    a->markcount = a->marksize;

+    a->mark = malloc(a->marksize * sizeof(uint32_t));

+    memcpy(a->mark, m->mark, a->marksize * sizeof(uint32_t));

+    lprintf(3, "%s: repeat mark=%04d reqest=%03d recv=%06d size=%06d %s\n", __func__,

+      m->markcount, a->markcount, m->recvcount, m->seqnomax,  m->fn);

   }

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

-    return;

-  }

+}

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

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

+{

   mfile *a = mfins(0);

   if(!a){

     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;

@@ -515,12 +524,38 @@ static void mrecv_req_send_data(mfile *m,  mdata *r)

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

 }

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

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

 {

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

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

     return;

+  }

+  if(lseek(m->fd, r->head.seqno * MAKUO_BUFFER_SIZE, SEEK_SET) == -1){

+    lprintf(0, "%s: seek error seq=%d size=%d fd=%d err=%d\n", __func__, (int)r->head.seqno, r->head.szdata, m->fd, errno);

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

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

+    mrecv_req_send_data_write_error(m, r);

+    return; /* seek error */

+  }

+  if(write(m->fd, r->data, r->head.szdata) != -1){

+    m->recvcount++;

+  }else{

+    lprintf(0, "%s: write error seqno=%d size=%d fd=%d err=%d\n", __func__, (int)r->head.seqno, r->head.szdata, m->fd, errno);

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

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

+    mrecv_req_send_data_write_error(m, r);

+  }

+}

-  mfile *a = mfins(0);

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

+{

+  mfile *a;

+  uint32_t *markptr = m->mark;

+  uint32_t  markcnt = m->markcount;

+

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

+    __func__, m->markcount, m->recvcount, m->seqnomax,  m->fn);

+

+  a = mfins(0);

   if(!a){

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

     return;

@@ -530,27 +565,68 @@ static void mrecv_req_send_mark(mfile *m, mdata *r)

   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.nstate = MAKUO_RECVSTATE_OPEN;

   a->mdata.head.szdata = 0;

-

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

-  m->lickflag = 1;

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

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

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

-  }

-  if(m->markcount){

-    if(MAKUO_BUFFER_SIZE < m->markcount * sizeof(uint32_t)){

+

+  while(markcnt){

+    a = mfins(0);

+    if(!a){

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

+      return;

+    }

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

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

+    if(MAKUO_BUFFER_SIZE < (markcnt * sizeof(uint32_t))){

       a->marksize = MAKUO_BUFFER_SIZE / sizeof(uint32_t);

     }else{

-      a->marksize = m->markcount;

+      a->marksize = markcnt;

     }

-    a->markcount = a->marksize;

-    a->mark = malloc(a->marksize * sizeof(uint32_t));

-    memcpy(a->mark, m->mark, a->marksize * sizeof(uint32_t));

-    lprintf(3, "%s: repeat mark=%04d reqest=%03d recv=%06d size=%06d %s\n", __func__,

-      m->markcount, a->markcount, m->recvcount, m->seqnomax,  m->fn);

+    if(a->markcount = a->marksize){

+      a->mark = malloc(a->marksize * sizeof(uint32_t));

+      memcpy(a->mark, markptr, a->marksize * sizeof(uint32_t));

+      markptr += a->marksize;

+      markcnt -= a->marksize;

+    }

+  }

+}

+

+static void mrecv_req_send_data(mfile *m, mdata *r)

+{

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

+    return;

+  }

+  if(r->head.flags & MAKUO_FLAG_WAIT){

+    mrecv_req_send_data_retry(m, r);

+    return;

+  }

+  if(m->lickflag){

+    if(seq_delmark(m, r->head.seqno)){

+      mrecv_req_send_data_write(m, r);

+    }

+    return;

+  }

+  if(m->mdata.head.seqno > r->head.seqno){

+    if(seq_delmark(m, r->head.seqno)){

+      mrecv_req_send_data_write(m, r);

+    }

+    return;

+  }

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

+    if(seq_addmark(m, m->mdata.head.seqno, r->head.seqno) == 1){

+      mrecv_req_send_data_retry(m, r);

+    }

+    m->mdata.head.seqno = r->head.seqno;

   }

+  mrecv_req_send_data_write(m, r);

+  m->mdata.head.seqno++;

 }

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

@@ -356,49 +356,53 @@ static void msend_req_send_open(int s, mfile *m)

 static void msend_req_send_markdata(int s, mfile *m)

 {

-  int i;

   int r;

   if(!m->markcount){

     /* close */

     m->initstate = 1;

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

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

     m->mdata.head.nstate = MAKUO_SENDSTATE_CLOSE;

     return;

   }

-  lprintf(4, "%s: block send retry %d\n", __func__, m->markcount);

-  for(i=0;i<m->markcount;i++){

-    m->mdata.head.seqno = m->mark[i];

-    lseek(m->fd, m->mdata.head.seqno * MAKUO_BUFFER_SIZE, SEEK_SET);

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

-    if(r>0){

-      m->mdata.head.szdata = r;

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

+  m->markcount--;

+  lprintf(4, "%s: block send retry seqno=%u count=%u\n", __func__, m->mark[m->markcount], m->markcount);

+  m->mdata.head.seqno = m->mark[m->markcount];

+  lseek(m->fd, m->mdata.head.seqno * MAKUO_BUFFER_SIZE, SEEK_SET);

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

+  if(r>0){

+    m->mdata.head.szdata = r;

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

+  }else{

+    if(!r){

+      lprintf(0, "%s: read eof? seqno=%d\n", __func__, m->mdata.head.seqno);

     }else{

-      if(!r){

-        lprintf(0, "%s: read eof? seqno=%d\n", __func__, m->mdata.head.seqno);

-      }else{

-        lprintf(0, "%s: read err! seqno=%d errno=%d\n", __func__, m->mdata.head.seqno, errno);

-      }

+      lprintf(0, "%s: read err! seqno=%d errno=%d\n", __func__, m->mdata.head.seqno, errno);

     }

   }

-  m->markcount = 0;

-  m->initstate = 1;

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

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

-  ack_clear(m, MAKUO_RECVSTATE_MARK);

+  if(m->markcount == 0){

+    m->initstate = 1;

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

+  }

 }

 static void msend_req_send_filedata(int s, mfile *m)

 {

   int readsize;

+  if(m->markcount){

+    m->markcount--;

+    m->mdata.head.seqno = m->mark[m->markcount];

+  }else{

+    if(m->seqnonow == 0){

+      m->waitspan  = 1024;

+      m->waitcount = m->waitspan;

+    }

+    m->mdata.head.seqno = m->seqnonow++;

+  }

   lseek(m->fd, m->mdata.head.seqno * MAKUO_BUFFER_SIZE, SEEK_SET);

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

   if(readsize > 0){

     m->mdata.head.szdata = readsize;

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

-      m->mdata.head.seqno++;

-    }

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

   }else{

     if(readsize == -1){

       /* err */

@@ -412,6 +416,13 @@ static void msend_req_send_filedata(int s, mfile *m)

       m->lickflag  = 1;

     }

   }

+  if(m->waitcount){

+    m->waitcount--;

+  }else{

+    m->sendwait = 1;

+    ack_clear(m, MAKUO_RECVSTATE_UPDATE);

+    ack_clear(m, MAKUO_RECVSTATE_OPEN);

+  }

 }

 static void msend_req_send_data(int s, mfile *m)

@@ -421,6 +432,29 @@ static void msend_req_send_data(int s, mfile *m)

     m->mdata.head.nstate = MAKUO_SENDSTATE_BREAK;

     return;

   }

+  if(m->sendwait){

+    m->mdata.head.seqno  = 0;

+    m->mdata.head.szdata = 0;

+    m->mdata.head.flags |= MAKUO_FLAG_WAIT;

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

+    return;

+  }

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

+    uint32_t wp = m->markcount * 100 / m->waitspan;

+    m->mdata.head.flags &= ~MAKUO_FLAG_WAIT;

+    /* slow */

+    if(m->waitspan > 16){

+      if(wp > 50){

+        m->waitspan /= 2;

+      }

+    }

+    /* fast */

+    if(wp < 10){

+      m->waitspan *= 2;

+    }

+    m->waitcount = m->waitspan;

+    lprintf(0,"%s: waitspan=%u markcount=%d\n", __func__, m->waitspan, m->markcount);    

+  }

   if(m->lickflag){

     msend_req_send_markdata(s, m); /* send retry */

   }else{

@@ -434,6 +468,7 @@ static void msend_req_send_mark_init(int s, mfile *m)

   m->initstate = 0;

   ack_clear(m, MAKUO_RECVSTATE_UPDATE);

   ack_clear(m, MAKUO_RECVSTATE_OPEN);

+  ack_clear(m, MAKUO_RECVSTATE_MARK);

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

 }