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

+1.1.3:

+ -

+

 1.1.2:

  - fix: not send shutdown message 

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

                          "RECV_IGNORE  ",

                          "RECV_READONLY",

                          "RECV_BREAK   ",

+                         "RECV_LAST    ",

                          "RECV_MD5OK   ",

                          "RECV_MD5NG   ",

                          "RECV_DELETEOK",

@@ -75,6 +76,7 @@ uint8_t rstatenumlist[]={MAKUO_RECVSTATE_NONE,

                          MAKUO_RECVSTATE_IGNORE,

                          MAKUO_RECVSTATE_READONLY,

                          MAKUO_RECVSTATE_BREAK,

+                         MAKUO_RECVSTATE_LAST,

                          MAKUO_RECVSTATE_MD5OK,

                          MAKUO_RECVSTATE_MD5NG,

                          MAKUO_RECVSTATE_DELETEOK,

@@ -292,9 +294,9 @@ void mprintf(const char *func, mfile *m)

     m->fn);

 }

-int getrid()

+uint32_t getrid()

 {

-  static int rid=0;

+  static uint32_t rid=0;

   return(rid++);

 }

@@ -435,18 +437,35 @@ void member_del(mhost *t)

 {

   mhost *p;

   mhost *n;

-  if(!t)

+  if(!t){

     return;

+  }

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

-  if(p = (mhost *)t->prev)

+  if(p = (mhost *)t->prev){

     p->next = t->next;

-  if(n = (mhost *)t->next)

+  }

+  if(n = (mhost *)t->next){

     n->prev = t->prev;

-  if(members == t)

+  }

+  if(members == t){

     members = n;

+  }

   free(t);

 }

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

+{

+  int i;

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

+    if(moption.comm[i].working){

+      cprintf(0, &(moption.comm[i]), "error: %s %s(%s)\n", 

+        mess, 

+        inet_ntoa(t->ad), 

+        t->hostname);

+    }

+  }

+}

+

 mmark *markalloc()

 {

   mmark *mm = calloc(1, sizeof(mmark));

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

 #! /bin/sh

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

-# Generated by GNU Autoconf 2.61 for makuosan 1.1.2.

+# Generated by GNU Autoconf 2.61 for makuosan 1.1.3.

 #

 # 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.1.2'

-PACKAGE_STRING='makuosan 1.1.2'

+PACKAGE_VERSION='1.1.3'

+PACKAGE_STRING='makuosan 1.1.3'

 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.1.2 to adapt to many kinds of systems.

+\`configure' configures makuosan 1.1.3 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.1.2:";;

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

    esac

   cat <<\_ACEOF

@@ -1360,7 +1360,7 @@ fi

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

 if $ac_init_version; then

   cat <<\_ACEOF

-makuosan configure 1.1.2

+makuosan configure 1.1.3

 generated by GNU Autoconf 2.61

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

@@ -1374,7 +1374,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.1.2, which was

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

 generated by GNU Autoconf 2.61.  Invocation command line was

   $ $0 $@

@@ -2065,7 +2065,7 @@ fi

 # Define the identity of the package.

  PACKAGE='makuosan'

- VERSION='1.1.2'

+ VERSION='1.1.3'

 cat >>confdefs.h <<_ACEOF

@@ -9005,7 +9005,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.1.2, which was

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

 generated by GNU Autoconf 2.61.  Invocation command line was

   CONFIG_FILES    = $CONFIG_FILES

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

 _ACEOF

 cat >>$CONFIG_STATUS <<_ACEOF

 ac_cs_version="\\

-makuosan config.status 1.1.2

+makuosan config.status 1.1.3

 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.1.2, info-makuosan@klab.jp)

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

 AM_INIT_AUTOMAKE

 AC_CONFIG_SRCDIR([makuosan.c])

 AC_CONFIG_HEADER([config.h])

@@ -8,19 +8,21 @@ void recv_timeout(mfile *m)

 {

   mhost   *t;

   uint8_t *r;

-  if(m){

-    m->retrycnt = MAKUO_SEND_RETRYCNT;

-    do{

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

-        r = get_hoststate(t, m);

-        if(*r == MAKUO_RECVSTATE_NONE){

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

-          member_del(t);

-          break;

-        }

-      }

-    }while(t); 

+  if(!m){

+    return;

   }

+  m->retrycnt = MAKUO_SEND_RETRYCNT;

+  do{

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

+      r = get_hoststate(t, m);

+      if(*r == MAKUO_RECVSTATE_NONE){

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

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

+        member_del(t);

+        break;

+      }

+    }

+  }while(t); 

 }

 struct timeval *pingpong(int n)

@@ -210,7 +212,6 @@ int ismsend(int s, mfile *m, int flag)

   return(1);

 }

-/***** main loop *****/

 void mloop()

 {

   int para;

@@ -220,8 +221,11 @@ void mloop()

   fd_set wfds;

   struct timeval *lastpong;

   struct timeval tv;

-  

+

+  /* multicast ping request */  

   lastpong = pingpong(0);

+

+  /* main loop */

   while(loop_flag){

     gettimeofday(&curtime, NULL);

     if(mtimeout(lastpong, MAKUO_PONG_INTERVAL)){

@@ -264,13 +268,16 @@ void mloop()

     }

     tv.tv_sec  = 1;

     tv.tv_usec = 0;

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

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

       continue;

+    }

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

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

     mrecv_gc();

   }

-  pingpong(2); /* exit notify */

+

+  /* shutdown notify */

+  pingpong(2);

   msend(moption.mcsocket, mftop[0]);

 }

@@ -55,8 +55,8 @@

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

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

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

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

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

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

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

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

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

@@ -105,9 +105,9 @@

 #define MAKUO_RECVSTATE_CLOSEERROR 93

 /*----- mexec mode -----*/

-#define MAKUO_MEXEC_SEND  0

-#define MAKUO_MEXEC_DRY   1

-#define MAKUO_MEXEC_MD5   2

+#define MAKUO_MEXEC_SEND 0

+#define MAKUO_MEXEC_DRY  1

+#define MAKUO_MEXEC_MD5  2

 /*----- struct -----*/

 typedef struct

@@ -313,6 +313,7 @@ excludeitem *mfnmatch(char *str, excludeitem *exclude);         /* is match */

 int isexclude(char *fn, excludeitem *exclude, int dir);         /*          */

 /*----- filesystem operation -----*/

+int linkcmp(mfile *m);

 int statcmp(struct stat *s1, struct stat *s2);

 int mremove(char *base, char *name);

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

@@ -324,10 +325,11 @@ void set_filestat(char *path, uid_t uid, gid_t gid, mode_t mode);

 int set_guid(uid_t uid, gid_t gid, gid_t *gids);

 int set_gids(char *groups);

-/*----- node operation -----*/

+/*----- member operation -----*/

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

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

 mmark   *delmark(mmark *mm);

@@ -349,12 +351,12 @@ void msend_clean();

 int  mrecv(int s);

 void msend(int s, mfile *m);

-/*----- other -----*/

-int getrid();

-int linkcmp(mfile *m);

-int space_escape(char *str);

-int workend(mcomm *c);

+/*----- time -----*/

 int mtimeget(struct timeval *tv);

 int mtimeout(struct timeval *tf, uint32_t msec);

+/*----- other -----*/

+uint32_t getrid();

+int space_escape(char *str);

+int workend(mcomm *c);

@@ -295,6 +295,7 @@ int mexec_help(mcomm *c, int n)

 int mexec_send(mcomm *c, int n, int sync)

 {

+  int e;

   int i;

   int j;

   ssize_t size;

@@ -419,26 +420,15 @@ int mexec_send(mcomm *c, int n, int sync)

   }

 	if(lstat(fn, &m->fs) == -1){

-    if(errno == ENOENT){

+    e = errno;

+    if(e == ENOENT){

       if(sync){

         m->mdata.head.flags |= MAKUO_FLAG_SYNC;

         return(0);

       }      

     }

-	  cprintf(0, c, "error: file not found %s\n", fn);

-		lprintf(1, "%s: lstat() error argc=%d cmd=%s\n",

-      __func__, 

-      c->argc[n], 

-      c->cmdline[n]);

-    for(i=0;i<c->argc[n];i++){

-		  lprintf(1, "%s: read error argv[%d]=%s\n",

-        __func__, 

-        i, 

-        c->parse[n][i]);

-    }

-		lprintf(0, "%s: read error file=%s\n", 

-      __func__, 

-      fn);

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

+		lprintf(0, "%s: %s %s\n", __func__, strerror(e), fn);

 		mfdel(m);

     return(0);

 	}

@@ -405,8 +405,12 @@ static void mrecv_req_ping(mdata *data, struct sockaddr_in *addr)

 }

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

-{

+{ 

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

+  if(!t){

+    return;

+  }

+  member_del_message(t, "member exit");

   member_del(t);

 }

@@ -1323,6 +1327,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");

       if(t->next){

         t = t->next;

         member_del(t->prev);

@@ -1342,11 +1347,15 @@ void mrecv_clean()

 int mrecv(int s)

 {

+  mhost *t;

   mdata  data;

   struct sockaddr_in addr;

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

     return(0);

   }

+  if(t=member_get(&addr.sin_addr)){

+    mtimeget(&t->lastrecv);

+  }

   if(data.head.flags & MAKUO_FLAG_ACK){

     mrecv_ack(&data, &addr);

   }else{

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

 static void msend_req_send_open_init(int s, mfile *m)

 {

+  int e;

   m->sendwait  = 1;

   m->initstate = 0;

   ack_clear(m, MAKUO_RECVSTATE_UPDATE);

@@ -420,12 +421,13 @@ static void msend_req_send_open_init(int s, mfile *m)

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

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

     }else{

+      e = errno;

       m->sendwait  = 0;

       m->initstate = 1;

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

       m->mdata.head.nstate = MAKUO_SENDSTATE_CLOSE;

-      cprintf(0, m->comm, "error: can't open (%s) %s\n", strerror(errno), m->fn);

-      lprintf(0, "%s: can't open (%s) %s\n", __func__,   strerror(errno), m->fn);

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

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

     }

   }

 }

@@ -620,6 +622,14 @@ static void msend_req_send_last(int s, mfile *m)

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

     return;

   }

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

+    msend_req_send_last_init(s, m);

+    return;

+  }

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

+    msend_req_send_last_init(s, m);

+    return;

+  }

   msend_mfdel(m);

 }