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

 1.2.2:

- - Support for solaris.

+ - Support for solaris10(Intel).

+ - makuosan.sysv 'status' and 'stop' option implement.

 1.2.1: 2009/6/16

  - refactoring for msync.

@@ -1,5 +1,5 @@

 1.2.2:

- - Solarisに対応

+ - Solaris10(Intel)に対応

 1.2.1: 2009/6/16

  - msyncをリファクタリング

@@ -968,7 +968,8 @@ int data_safeset16(mdata *data, uint16_t val)

   if(data->head.szdata + sizeof(uint16_t) > MAKUO_BUFFER_SIZE){

     return(-1);

   }

-  *(uint16_t *)(data->data + data->head.szdata) = htons(val);

+  val = htons(val);

+  memcpy((void *)(data->data + data->head.szdata), (void *)(&val), sizeof(val));

   data->head.szdata += sizeof(uint16_t);

   return(0);

 }

@@ -978,7 +979,8 @@ int data_safeset32(mdata *data, uint32_t val)

   if(data->head.szdata + sizeof(uint32_t) > MAKUO_BUFFER_SIZE){

     return(-1);

   }

-  *(uint32_t *)(data->data + data->head.szdata) = htonl(val);

+  val = htonl(val);

+  memcpy((void *)(data->data + data->head.szdata), (void *)(&val), sizeof(val));

   data->head.szdata += sizeof(uint32_t);

   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.2.2.

+# Generated by GNU Autoconf 2.61 for makuosan 1.2.2-rc1.

 #

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

-PACKAGE_STRING='makuosan 1.2.2'

+PACKAGE_VERSION='1.2.2-rc1'

+PACKAGE_STRING='makuosan 1.2.2-rc1'

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

+\`configure' configures makuosan 1.2.2-rc1 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.2.2:";;

+     short | recursive ) echo "Configuration of makuosan 1.2.2-rc1:";;

    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.2.2

+makuosan configure 1.2.2-rc1

 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.2.2, which was

+It was created by makuosan $as_me 1.2.2-rc1, 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.2.2'

+ VERSION='1.2.2-rc1'

 cat >>confdefs.h <<_ACEOF

@@ -9206,7 +9206,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.2.2, which was

+This file was extended by makuosan $as_me 1.2.2-rc1, which was

 generated by GNU Autoconf 2.61.  Invocation command line was

   CONFIG_FILES    = $CONFIG_FILES

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

 _ACEOF

 cat >>$CONFIG_STATUS <<_ACEOF

 ac_cs_version="\\

-makuosan config.status 1.2.2

+makuosan config.status 1.2.2-rc1

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

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

 AM_INIT_AUTOMAKE

 AC_CONFIG_SRCDIR([makuosan.c])

 AC_CONFIG_HEADER([config.h])

@@ -197,26 +197,28 @@ static void minit_option_getenv()

   struct group  *gr;

   if(env=getenv("MAKUOSAN_BASE")){

-    realpath(env, moption.base_dir);

+    if(*env){

+      realpath(env, moption.base_dir);

+    }

   }

   if(env=getenv("MAKUOSAN_PORT")){

-    if(atoi(env)){

+    if(*env && atoi(env)){

       moption.maddr.sin_port = htons(atoi(env));

       moption.laddr.sin_port = htons(atoi(env));

     }

   }

   if(env=getenv("MAKUOSAN_USER")){

-    if(minit_option_setuid(env)){

+    if(*env && minit_option_setuid(env)){

       exit(1);

     }

   }

   if(env=getenv("MAKUOSAN_GROUP")){

-    if(minit_option_setgid(env)){

+    if(*env && minit_option_setgid(env)){

       exit(1);

     }

   }

   if(env=getenv("MAKUOSAN_GROUPS")){

-    if(minit_option_setgids(env)){

+    if(*env && minit_option_setgids(env)){

       exit(1);

     }

   }

@@ -556,8 +558,10 @@ static void minit_setguid()

 static void minit_daemonize()

 {

   int pid;

-  if(moption.dontfork)

+  if(moption.dontfork){

+    lprintf(0, "pid       : %d\n", getpid());

     return;

+  }

   pid = fork();

   if(pid == -1){

@@ -572,8 +576,10 @@ static void minit_daemonize()

     fprintf(stderr, "%s: can't fork()\n", __func__);

     exit(1); 

   }

-  if(pid)

+  if(pid){

+    lprintf(0, "pid       : %d\n",pid);

     _exit(0);

+  }

   /*----- daemon process -----*/

   close(2);

@@ -97,8 +97,8 @@ static int mrecv_packet(int s, mdata *data, struct sockaddr_in *addr)

     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.maddr  = data->head.maddr;

+    data->head.mport  = data->head.mport;

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

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

       continue; /* other group packet */

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

   senddata.head.flags  = htons(senddata.head.flags);

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

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

-  senddata.head.maddr  = htonl(senddata.head.maddr);

-  senddata.head.mport  = htons(senddata.head.mport);

+  senddata.head.maddr  = senddata.head.maddr;

+  senddata.head.mport  = senddata.head.mport;

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

   szdata += sizeof(mhead);

@@ -1230,6 +1230,7 @@ void msend(mfile *m)

     }

   }

 }

+

 void msend_clean()

 {

   mfile *m = mftop[MFSEND];

@@ -56,10 +56,19 @@ install -Dp -m0755 support/makuosan.sysv %{buildroot}%{_initrddir}/makuosan

 # Default configs

 mkdir -p %{buildroot}/%{_sysconfdir}/sysconfig

 cat <<EOF >%{buildroot}/%{_sysconfdir}/sysconfig/%{name}

+# Base Directory (Necessity)

 BASE_DIR=""

+

+# Other

 PORT="5000"

+MCAST_ADDRESS="224.0.0.108"

 IP_ADDRESS="127.0.0.1"

 SOCKET=""

+LOGLEVEL="1"

+MAKUOSAN_USER=""   

+MAKUOSAN_GROUP=""  

+MAKUOSAN_GROUPS=""

+OPTIONS=""

 EOF

 %clean

@@ -18,44 +18,62 @@

 PATH=/sbin:/bin:/usr/bin:/usr/sbin

-BASE_DIR=""

-PORT="5000"

-IP_ADDRESS="127.0.0.1"

-SOCKET=""

-

 # Source function library.

 . /etc/init.d/functions

+export MAKUOSAN_USER

+export MAKUOSAN_GROUP

+export MAKUOSAN_GROUPS

+export MAKUOSAN_BASE

+export MAKUOSAN_PORT

+export MAKUOSAN_SOCK

+

 # Get config.

-test -f /etc/sysconfig/network && . /etc/sysconfig/network

+test -f /etc/sysconfig/network  && . /etc/sysconfig/network

 test -f /etc/sysconfig/makuosan && . /etc/sysconfig/makuosan

-

+[ -n "$BASE_DIR" ] && MAKUOSAN_BASE=$BASE_DIR;

+[ -n "$PORT"     ] && MAKUOSAN_PORT=$PORT

+[ -n "$SOCKET"   ] && MAKUOSAN_SOCK=$SOCKET

 # Check that networking is up.

 [ "${NETWORKING}" = "yes" ] || exit 0

-[ -n "${SOCKET}"] || SOCKET="-U ${SOCKET}"

-

-[ -f /usr/sbin/makuosan ] || exit 1

+[ -x /usr/sbin/makuosan ]   || exit 1

 RETVAL=0

-

 prog="makuosan"

 start(){

     # Check config.

-    if [ -z "${BASE_DIR}" ]; then

-        echo "base directory setting (BASE_DIR) is empty."

+    if [ -z "${MAKUOSAN_BASE}" ]; then

+        echo "base directory setting (MAKUOSAN_BASE) is empty."

         exit 1

     fi

-    if [ ! -d "${BASE_DIR}" ]; then

-        echo "${BASE_DIR} is not exists."

+    if [ ! -d "${MAKUOSAN_BASE}" ]; then

+        echo "${MAKUOSAN_BASE} is not exists."

         exit 1

     fi

-

+    if [ -z "$LOGLEVEL" ]; then

+      LOGLEVEL=1

+    fi

+    if [ -n "$MCAST_ADDRESS" ]; then

+      OPTIONS="-m $MCAST_ADDRESS $OPTIONS"

+    fi

+    if [ -n "$IP_ADDRESS" ]; then

+      OPTIONS="-l $IP_ADDRESS $OPTIONS"

+    fi

+    OPTIONS="-d $LOGLEVEL $OPTIONS"

     echo -n $"Starting $prog: "

-    $prog -b "$BASE_DIR" -p "$PORT" -l "$IP_ADDRESS" "$SOCKET"

+    $prog $OPTIONS 2>/tmp/makuosan.$$

     RETVAL=$?

-    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog

+    if [ $RETVAL -eq 0 ]; then

+      touch /var/lock/subsys/$prog

+      p=`egrep '^pid ' /tmp/makuosan.$$ | cut -f 2 -d:`

+      echo $p > /var/run/${prog}.pid

+      echo_success

+    else

+      echo_failure

+    fi

+    rm -f /tmp/makuosan.$$

     echo

     return $RETVAL

 }

@@ -66,17 +84,18 @@ stop(){

     RETVAL=$?

     if [ $RETVAL -eq 0 ] ; then

         rm -f /var/lock/subsys/$prog

+        rm -f /var/run/${prog}.pid

     fi

     echo

     return $RETVAL

 }

-reload(){

-    echo -n $"Reloading configuration: "	

-    killproc $prog -HUP

-    RETVAL=$?

-    echo

-    return $RETVAL

+status(){

+  OPT="-c tcp:127.0.0.1:5000"

+  [ -z "$PORT"          ] && PORT=5000

+  [ -n "$IP_ADDRESS"    ] && OPT="-c tcp:$IPADDRESS:$PORT"

+  [ -n "$MAKUOSAN_SOCK" ] && OPT="-c $MAKUOSAN_SOCK"

+  msync $OPT --status

 }

 restart(){

@@ -84,12 +103,6 @@ restart(){

     start

 }

-condrestart(){

-    [ -e /var/lock/subsys/$prog ] && restart

-    return 0

-}

-

-

 # See how we were called.

 case "$1" in

     start)

@@ -99,19 +112,13 @@ case "$1" in

 	stop

 	;;

     status)

-	status $prog

+	status

 	;;

     restart)

 	restart

 	;;

-    reload)

-	reload

-	;;

-    condrestart)

-	condrestart

-	;;

     *)

-	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"

+	echo $"Usage: $0 {start|stop|status|restart}"

 	RETVAL=1

 esac