File ddl-xmas2005-erddcd.patch of Package erddcd

Overview Repositories Revisions Requests Users Attributes Meta

File ddl-xmas2005-erddcd.patch of Package erddcd (Revision f8cbc99ca69b0d2674f7f37276d4154a)

Currently displaying revision f8cbc99ca69b0d2674f7f37276d4154a , Show latest

diff -Nur DDL-xmas2005/clients/Makefile.am DDL-xmas2005.neu/clients/Makefile.am
--- DDL-xmas2005/clients/Makefile.am	2001-12-15 15:52:31.000000000 +0100
+++ DDL-xmas2005.neu/clients/Makefile.am	2008-12-13 22:06:45.000000000 +0100
@@ -1,2 +1,2 @@
 
-SUBDIRS = nmra-programmer uhl-programmer j-man loco-panel monitor simpleclient
+SUBDIRS = nmra-programmer uhl-programmer monitor simpleclient j-man loco-panel
diff -Nur DDL-xmas2005/clients/monitor/Makefile.am DDL-xmas2005.neu/clients/monitor/Makefile.am
--- DDL-xmas2005/clients/monitor/Makefile.am	2001-12-06 15:55:53.000000000 +0100
+++ DDL-xmas2005.neu/clients/monitor/Makefile.am	2008-12-13 19:31:39.000000000 +0100
@@ -2,12 +2,9 @@
 # author: Torsten Vogt
 # date  : 2001-12-06
 
-bin_PROGRAMS = monitor
+bin_PROGRAMS = srcpmonitor
 
-monitor_SOURCES = monitor.c
+srcpmonitor_SOURCES = srcpmonitor.c
 
-.c.o:
-	$(CC) $(CFLAGS) -c -o $*.o $<
-
-DFLAGS    = #-D_DEBUG_
-CFLAGS    = -Wall -O2 $(INCLUDES) -D__USER__=\"`whoami`\" -D__HOST__=\"`hostname`\" $(DFLAGS)
+# DFLAGS = -D_DEBUG_
+AM_CFLAGS = -Wall -O2 $(INCLUDES) $(DFLAGS)
diff -Nur DDL-xmas2005/clients/monitor/monitor.c DDL-xmas2005.neu/clients/monitor/monitor.c
--- DDL-xmas2005/clients/monitor/monitor.c	2001-12-15 15:52:31.000000000 +0100
+++ DDL-xmas2005.neu/clients/monitor/monitor.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,82 +0,0 @@
-/***********************************************************************
- monitor.c
-
-    This is a simple client for the 'erddcd' daemon.
-    It is for testing the info channels.
-
-    Torsten Vogt november 1999
-*************************************************************************/ 
-
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <time.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <signal.h>
-
-struct sockaddr_in socketAddr;
-int    Port ;
-char   *HostName;
-struct hostent *ServerHost;
-
-/****** data types for client information   ******/
-
-int initClient() {
-
-    int Socket;
-    bzero(&socketAddr,sizeof(socketAddr));
-
-    socketAddr.sin_family=ServerHost->h_addrtype;
-    memcpy(&socketAddr.sin_addr,ServerHost->h_addr_list[0],sizeof(socketAddr.sin_addr)); 
-    socketAddr.sin_port= htons(Port);
-    if ((Socket = socket(AF_INET, SOCK_STREAM, 0 )) == -1) {
-      perror("socket()");
-      exit(1);
-    }
-    if ( connect(Socket,  (struct sockaddr *)&socketAddr, sizeof(socketAddr))<0  ) {
-       fprintf(stderr,"\nDaemon erddcd not found on host %s on port %d.\n", 
-                HostName, Port);
-       fprintf(stderr,"erddcd is not running or is running on another port.\n\n");
-       exit(1);
-    }
-    return Socket;
-}
-
-int main(int argc, char * argv[], char* env[]) {
-
-  char      buf[80];
-  int       sckt,error;
-
-  if (argc != 3) {
-     printf("\n\nusage: monitor <hostname> <portnr>\n\n");
-     exit(1); 
-  }
-
-  HostName=malloc(sizeof(argv[1])+1);
-  if (HostName)
-     strcpy(HostName, argv[1]);
-
-  ServerHost=gethostbyname(argv[1]);
-  Port=atoi(argv[2]);
-
-  sckt=initClient();
-
-  while (1) {
-     memset(buf,0,80);
-     error=read(sckt,buf,sizeof(buf));
-     if (error==-1 || error==0) {
-        perror("read()");
-        exit(1);        
-     }
-     printf("received: ");
-     printf("%s ", buf);
-  }
-  return 0;
-}
diff -Nur DDL-xmas2005/clients/monitor/srcpmonitor.c DDL-xmas2005.neu/clients/monitor/srcpmonitor.c
--- DDL-xmas2005/clients/monitor/srcpmonitor.c	1970-01-01 01:00:00.000000000 +0100
+++ DDL-xmas2005.neu/clients/monitor/srcpmonitor.c	2001-12-15 15:52:31.000000000 +0100
@@ -0,0 +1,82 @@
+/***********************************************************************
+ monitor.c
+
+    This is a simple client for the 'erddcd' daemon.
+    It is for testing the info channels.
+
+    Torsten Vogt november 1999
+*************************************************************************/ 
+
+#include <errno.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <time.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <signal.h>
+
+struct sockaddr_in socketAddr;
+int    Port ;
+char   *HostName;
+struct hostent *ServerHost;
+
+/****** data types for client information   ******/
+
+int initClient() {
+
+    int Socket;
+    bzero(&socketAddr,sizeof(socketAddr));
+
+    socketAddr.sin_family=ServerHost->h_addrtype;
+    memcpy(&socketAddr.sin_addr,ServerHost->h_addr_list[0],sizeof(socketAddr.sin_addr)); 
+    socketAddr.sin_port= htons(Port);
+    if ((Socket = socket(AF_INET, SOCK_STREAM, 0 )) == -1) {
+      perror("socket()");
+      exit(1);
+    }
+    if ( connect(Socket,  (struct sockaddr *)&socketAddr, sizeof(socketAddr))<0  ) {
+       fprintf(stderr,"\nDaemon erddcd not found on host %s on port %d.\n", 
+                HostName, Port);
+       fprintf(stderr,"erddcd is not running or is running on another port.\n\n");
+       exit(1);
+    }
+    return Socket;
+}
+
+int main(int argc, char * argv[], char* env[]) {
+
+  char      buf[80];
+  int       sckt,error;
+
+  if (argc != 3) {
+     printf("\n\nusage: monitor <hostname> <portnr>\n\n");
+     exit(1); 
+  }
+
+  HostName=malloc(sizeof(argv[1])+1);
+  if (HostName)
+     strcpy(HostName, argv[1]);
+
+  ServerHost=gethostbyname(argv[1]);
+  Port=atoi(argv[2]);
+
+  sckt=initClient();
+
+  while (1) {
+     memset(buf,0,80);
+     error=read(sckt,buf,sizeof(buf));
+     if (error==-1 || error==0) {
+        perror("read()");
+        exit(1);        
+     }
+     printf("received: ");
+     printf("%s ", buf);
+  }
+  return 0;
+}
diff -Nur DDL-xmas2005/clients/simpleclient/Makefile.am DDL-xmas2005.neu/clients/simpleclient/Makefile.am
--- DDL-xmas2005/clients/simpleclient/Makefile.am	2001-12-16 18:47:28.000000000 +0100
+++ DDL-xmas2005.neu/clients/simpleclient/Makefile.am	2008-12-11 19:36:30.000000000 +0100
@@ -6,12 +6,8 @@
 
 simpleclient_SOURCES = simpleclient.c
 
-.c.o:
-	$(CC) $(CFLAGS) -c -o $*.o $<
+dist_pkgdata_DATA = loco.dat
 
-DFLAGS    = #-D_DEBUG_
-CFLAGS    = -Wall -O2 $(INCLUDES) -D__USER__=\"`whoami`\" -D__HOST__=\"`hostname`\" $(DFLAGS)
+#DFLAGS = -D_DEBUG_
+AM_CFLAGS = -Wall -O2 $(INCLUDES) -DLOCODATADIR=\"$(pkgdatadir)\" $(DFLAGS)
 
-install-data-local:
-	$(INSTALL_DATA) loco.dat $(DESTDIR)$(bindir)
-	chmod ugo+w $(DESTDIR)$(bindir)/loco.dat
diff -Nur DDL-xmas2005/clients/simpleclient/simpleclient.c DDL-xmas2005.neu/clients/simpleclient/simpleclient.c
--- DDL-xmas2005/clients/simpleclient/simpleclient.c	2001-12-15 15:52:31.000000000 +0100
+++ DDL-xmas2005.neu/clients/simpleclient/simpleclient.c	2008-12-11 19:33:57.000000000 +0100
@@ -87,7 +87,7 @@
     char buf[LINELEN];
     char *al,*ad,*pr;
 
-    f=fopen("loco.dat","rb");
+    f=fopen(LOCODATADIR "/loco.dat","rb");
     if (!f) { 
 	perror("fopen()"); 
 	exit(1);
diff -Nur DDL-xmas2005/clients/uhl-programmer/Makefile.am DDL-xmas2005.neu/clients/uhl-programmer/Makefile.am
--- DDL-xmas2005/clients/uhl-programmer/Makefile.am	2001-12-04 20:19:34.000000000 +0100
+++ DDL-xmas2005.neu/clients/uhl-programmer/Makefile.am	2008-12-11 19:43:07.000000000 +0100
@@ -5,3 +5,5 @@
 bin_PROGRAMS = uhl_programmer
 
 uhl_programmer_SOURCES = uhl-programmer.c
+
+AM_CFLAGS = -Wall -O2 $(INCLUDES)
diff -Nur DDL-xmas2005/clients/uhl-programmer/uhl-programmer.c DDL-xmas2005.neu/clients/uhl-programmer/uhl-programmer.c
--- DDL-xmas2005/clients/uhl-programmer/uhl-programmer.c	2001-12-04 20:51:35.000000000 +0100
+++ DDL-xmas2005.neu/clients/uhl-programmer/uhl-programmer.c	2008-12-11 19:40:25.000000000 +0100
@@ -190,7 +190,7 @@
         sprintf(buf,"SET GL M4 80 1 1 0 0 4 0 0 0 0\n");
         write(sckt,buf,strlen(buf));
         usleep(20000);
-        sprintf(buf,"SET GL M4 %d 1 0 0 0 4 0 0 0 0\n");
+        sprintf(buf,"SET GL M4 80 1 0 0 0 4 0 0 0 0\n");
         write(sckt,buf,strlen(buf));
         sleep(4);
         sprintf(buf,"STOPVOLTAGE\n");
diff -Nur DDL-xmas2005/configure.in DDL-xmas2005.neu/configure.in
--- DDL-xmas2005/configure.in	2002-05-25 09:13:02.000000000 +0200
+++ DDL-xmas2005.neu/configure.in	2008-12-14 13:45:16.000000000 +0100
@@ -1,55 +1,72 @@
 # configure.in (DDL)
-# author: Torsten Vogt
+# author: Torsten Vogt, Guido Scholz
 # date  : 2001-12-04
-# last change: 2002-05-25
+# last change: 2008-12-14
 
-AC_INIT(erddcd/erddcd.c)
-AM_INIT_AUTOMAKE(erddcd,1.5.0)
+AC_INIT([erddcd], [1.5.1],[vogt_torsten@gmx.de])
+dnl AC_CONFIG_HEADER([erddcd/config.h])
+dnl AC_CONFIG_SRCDIR([erddcd/erddcd.c])
+AM_INIT_AUTOMAKE([dist-bzip2])
 
 # dnl checks for programs.
 AC_PROG_CC
-AC_PROG_RANLIB
 AC_PROG_YACC
-AM_PROG_LEX
-AC_PATH_PROG(YACC, bison)
-AC_PATH_PROG(LEX, flex)
+AC_PROG_LEX
 AC_LANG_C
+AC_PROG_INSTALL
+AC_PROG_LIBTOOL
 
-AC_PATH_PROG(JAVAC,javac,:,$PATH)
-if test ${JAVAC} == ":"; then echo "javac not found! Abort!"; exit; fi
-AC_PATH_PROG(JAR,jar,:,$PATH)
-if test ${JAR} == ":"; then echo "jar not found! Abort!"; exit; fi
-AC_PATH_PROG(JAVAH,javah,:,$PATH)
-if test ${JAVAH} == ":"; then echo "javah not found! Abort!"; exit; fi
-
-# try to extract the directory where java lives
-JAVAHOME=`echo "${JAVAC}" | sed -e "s|/bin/javac||g"`;
-if test ${JAVAHOME#/usr} == ${JAVAHOME} ; then
-   JAVAHOME=${JAVAHOME}
-else
-   JAVAHOME=`echo "${JAVAHOME}" | sed -e "s|bin|lib|g"`;
-fi
+AC_PATH_PROG(JAVAC,javac,,)
+if test "$JAVAC" == "no"; then echo "javac not found! Abort!"; exit; fi
+AC_PATH_PROG(JAR,jar,,)
+if test "$JAR" == "no"; then echo "jar not found! Abort!"; exit; fi
+AC_PATH_PROG(JAVAH,javah,,)
+if test "$JAVAH" == "no"; then echo "javah not found! Abort!"; exit; fi
+
+AC_JNI_INCLUDE_DIR
+for dir in $JNI_INCLUDE_DIRS
+do
+    AC_CHECK_FILE("$dir/jni.h", , AC_MSG_ERROR([jni.h not found]))
+    JNI_H_DIR=$dir
+    break
+done
+AC_SUBST(JNI_H_DIR)
 
-# try to find out where the java header files for c lives
-AC_CHECK_FILE(${JAVAHOME}/include/jni.h, [JAVAHOME=${JAVAHOME}], 
-                [ echo "jni.h not found!"
-                  echo -n "give me the path where your jdk lives (e.g. /usr/lib/java): " 
-                  read JAVAHOME 
-                ])
-
-# if the last check wasn't succefull we will try again
-AC_CHECK_FILE(${JAVAHOME}/include/jni.h, [JAVAHOME=${JAVAHOME}],
-                [ echo "jni.h not found! Giving up! Abort!"; exit;
-                ])
 
-AC_SUBST(JAVAHOME)
-echo "JAVAHOME detected in ${JAVAHOME}";
+# dnl checks for libraries
+AC_CHECK_LIB(pthread, pthread_create, , AC_MSG_ERROR([libpthread not found!]))
+AC_CHECK_LIB(readline, readline, , AC_MSG_ERROR([libreadline not found!]))
 
-AC_PREFIX_DEFAULT(/opt/DDL)
-AC_PROG_INSTALL
+dnl setup hostname variable 
+AC_PATH_PROG(HOSTNAME, hostname, no)
+if test "$HOSTNAME" = "no" ; then
+  AC_MSG_ERROR(
+    [cannot find 'hostname', please check your installation.])
+fi
+DDL_HOST=`${HOSTNAME}`
+AC_SUBST(DDL_HOST)
 
-# dnl checks for libraries
-AC_CHECK_LIB(pthread,  pthread_create,,[echo "libpthread not found! Abort!"; exit;])
-AC_CHECK_LIB(readline, readline, [saved_LIBS=${LIBS}; LIBS="-lhistory -lcurses -lreadline ${saved_LIBS}"; echo "#define HAVE_LIBREADLINE 1">>confdefs.h],,  -lhistory -lcurses)
 
-AC_OUTPUT(Makefile erddcd/Makefile clients/Makefile clients/nmra-programmer/Makefile clients/uhl-programmer/Makefile clients/j-man/Makefile clients/j-man/gameport/Makefile clients/loco-panel/Makefile clients/monitor/Makefile clients/simpleclient/Makefile)
+dnl setup whoami variable
+AC_PATH_PROG(WHOAMI, whoami, no)
+if test "$WHOAMI" = "no" ; then
+  AC_MSG_ERROR(
+    [cannot find 'whoami', please check your installation.])
+fi
+DDL_USER=`${WHOAMI}`
+AC_SUBST(DDL_USER)
+
+dnl directory for jar files (java libraries)
+AC_SUBST(JARDIR, "${prefix}/share/java")
+
+AC_CONFIG_FILES([clients/loco-panel/locopanel],
+                [chmod +x clients/loco-panel/locopanel])
+AC_CONFIG_FILES([clients/j-man/jman],
+                [chmod +x clients/j-man/jman])
+
+AC_OUTPUT(Makefile erddcd/Makefile 
+          clients/Makefile clients/nmra-programmer/Makefile
+          clients/uhl-programmer/Makefile clients/monitor/Makefile
+          clients/simpleclient/Makefile
+          clients/j-man/gameport/Makefile clients/j-man/Makefile
+          clients/loco-panel/Makefile)
diff -Nur DDL-xmas2005/erddcd/erddcd.c DDL-xmas2005.neu/erddcd/erddcd.c
--- DDL-xmas2005/erddcd/erddcd.c	2005-12-03 14:42:09.000000000 +0100
+++ DDL-xmas2005.neu/erddcd/erddcd.c	2008-12-13 21:37:20.000000000 +0100
@@ -75,6 +75,7 @@
 
 #define TRUE 1
 #define FALSE 0
+#define	MAXFD	64 /* for daemon_init */
 
 /* some global variables */
 
@@ -92,7 +93,7 @@
 int        SRCPPORT = 14367;              /* default srcp port            */
 
 char       *DEVICE  = "/dev/ttyS1";       /* default device               */
-char       *PIDFILE = "/tmp/.erddcd.pid"; /* default pid file             */
+char       *PIDFILE = "/var/run/erddcd.pid"; /* default pid file             */
 int        S88PORT  = 0x378;              /* default device for s88  (mw) */
                                           /* if set to 0, port disabled   */
 int        S88CLOCK_SCALE  = 35;          /* scaler for s88 clock:   (mw) */
@@ -122,19 +123,19 @@
 
 int        boundSocket;
 struct     sockaddr_in socketAddr;
-int        addrlen=0;
+socklen_t  addrlen=0;
 
 int        srcp_boundSocket;
 struct     sockaddr_in srcp_socketAddr;
-int        srcp_addrlen=0;
+socklen_t  srcp_addrlen=0;
 
 int        feedback_boundSocket;
 struct     sockaddr_in feedback_socketAddr;
-int        feedback_addrlen=0;
+socklen_t  feedback_addrlen=0;
 
 int        info_boundSocket;
 struct     sockaddr_in info_socketAddr;
-int        info_addrlen=0;
+socklen_t  info_addrlen=0;
 
 pthread_t  MainThreadId=0;
 pthread_t  ptid=(pthread_t)NULL;
@@ -623,7 +624,7 @@
     if (!f)  
        syslog(LOG_INFO,"   cannot open %s. Ignoring.", PIDFILE); 
     else {
-       fprintf(f,"%d", pid);
+       fprintf(f,"%d\n", pid);
        fflush(f);
     }
     fclose(f);
@@ -829,6 +830,7 @@
     if (inftid!=(pthread_t)NULL) pthread_cancel(inftid);
     close_comport();
     syslog(LOG_INFO,"   SIGTERM(15) received! Terminating ...");
+    unlink(PIDFILE);
     closelog();
     exit(0);
 }
@@ -944,7 +946,7 @@
 
    f = fopen(initfn, "rb");
    if (!f) {
-      syslog(LOG_INFO,"   cannot open config file %s. Ignored!", initfn);
+      fprintf(stderr,"   Cannot open config file %s. Ignored!", initfn);
       // fclose(f);
       return;
    }
@@ -968,21 +970,21 @@
             setCharOption(&DEVICE, value, "/dev/ttyS1");
          }
          if (strcmp(variable,"pid-file")==0) {
-            setCharOption(&PIDFILE, value, "/tmp/.erddcd.pid");
+            setCharOption(&PIDFILE, value, "/var/run/erddcd.pid");
          }
          if (strcmp(variable,"srcp-port")==0) {
             setIntOption(&PORT, value, -1, -1, "");
             FEEDBACKPORT=PORT+1;
             INFOPORT=PORT+2;
             if (PORT==0) {
-               syslog(LOG_INFO,"   srcp port set to 0. Abort!");
+               fprintf(stderr,"   srcp port set to 0. Abort!\n");
                exit(1);
             }
          }
          if (strcmp(variable,"srcp08-port")==0) {
             setIntOption(&SRCPPORT, value, -1, -1, "");
             if (SRCPPORT==0) {
-               syslog(LOG_INFO,"   srcp-0.8 port set to 0. Abort!");
+               fprintf(stderr,"   srcp-0.8 port set to 0. Abort!\n");
                exit(1);
             }
          }
@@ -1056,7 +1058,7 @@
       pbuf=fgets(buf, 255, f); 
    }
    fclose(f);
-   syslog(LOG_INFO,"   config file %s successfully read", initfn);
+   /*fprintf(stderr,"   config file %s successfully read", initfn);*/
 }
 
 void usage() {
@@ -1077,7 +1079,7 @@
    fprintf(stdout,"         -T <s88 refresh>     (default: 100 ms)\n");
 
    fprintf(stdout,"         -S <i8255_device>    (default: /dev/port)\n");
-   fprintf(stdout,"         -f <pidfile>         (default: /tmp/.erddcd.pid)\n");
+   fprintf(stdout,"         -f <pidfile>         (default: /var/run/erddcd.pid)\n");
    fprintf(stdout,"         -r                   (enable feedback on portnr+1, default: %d)\n", PORT+1);
    fprintf(stdout,"         -i                   (enable info channel on portnr+2, default: %d)\n", PORT+2);
    fprintf(stdout,"         -c <delay>           (enable shortcut checking, reaction delay in usec)\n");
@@ -1098,52 +1100,65 @@
    exit(0);    
 }
 
+/*
+ * daemonize process
+ * this is from "UNIX Network Programming, W. R. Stevens et al."
+ */
+int daemon_init()
+{
+    int i;
+    pid_t pid;
+
+    if ((pid = fork()) < 0)
+        return (-1);
+    else if (pid)
+        /* parent terminates */
+        _exit(0);
+
+    /* child 1 continues... */
+
+    /* become session leader */
+    if (setsid() < 0)
+        return (-1);
+
+    signal(SIGHUP, SIG_IGN);
+    if ((pid = fork()) < 0)
+        return (-1);
+    else if (pid)
+        /* child 1 terminates */
+        _exit(0);
+
+    /* child 2 continues... */
+
+    /* change working directory */
+    chdir("/");
+
+    /* close off file descriptors */
+    for (i = 0; i < MAXFD; i++)
+        close(i);
+
+    /* redirect stdin, stdout, and stderr to /dev/null */
+    open("/dev/null", O_RDONLY);
+    open("/dev/null", O_RDWR);
+    open("/dev/null", O_RDWR);
+
+    /* success */
+    return 0;
+}
+
+
+
 int main(int argc, char *argv[]) {
  
    int             cp_dev; 
    int             c;
    int             error;
-   pid_t           pid;
    int             dummy;
-   char            *ddlhome, *fnbuffer;
-
-   // tvo 2005-12-03
-   error = pthread_mutex_init(&refreshcycle_mutex, NULL);
-   if (error) {
-      syslog(LOG_INFO, "cannot create mutex (refreshcycle_mutex). Abort!");
-      exit(1);
-   }    
 
    SERVERSTATE = "RUNNING";
    
-   /* init logging with syslog */
-   openlog("erddcd",LOG_CONS,LOG_USER);
-
-   syslog(LOG_INFO, "erddcd %d.%d.%d   by Torsten Vogt", MAJOR_VERSION,
-                                                         MINOR_VERSION,
-                                                         COMPILE_PASS);
-   syslog(LOG_INFO, "   last compiled at %s on host %s from user %s.",
-                                                         __DATE__ ,
-                                                         __HOST__,
-                                                         __USER__);
-
-   syslog(LOG_INFO, "   with SRCP %s", SRCPVER);
-
-   sprintf(ERDDCDIDSTRING,"erddcd v%d.%d.%d; srcp %s\n",
-                           MAJOR_VERSION, MINOR_VERSION, COMPILE_PASS, SRCPVER);
-
    // first we try to read a global config file
-   read_initfile("/etc/erddcdrc");
-   // then we try to read a config file under DDL_HOME
-   ddlhome=getenv("DDLHOME");
-   if (ddlhome) {
-      fnbuffer = malloc(strlen(ddlhome)+50);
-      sprintf(fnbuffer,"%s/erddcdrc", ddlhome);
-      read_initfile(fnbuffer);
-      free(fnbuffer);
-   }
-   // at last we try to read a config file in local directory
-   read_initfile("erddcdrc");
+   read_initfile("/etc/erddcd.conf");
 
    /* check command line */
    opterr=0;
@@ -1222,49 +1237,61 @@
       }
    } 
 
+   if (FORCE_DOFORK) {
+
+       /*daemonize process*/
+       if (0 != daemon_init()) {
+           fprintf(stderr, "Daemonization failed!\n");
+           exit(1);
+       }
+   }
+   else
+      fprintf(stderr,"   WARNING: erddcd called with -F, server not daemonized!");
+
+   /* init logging with syslog */
+   openlog("erddcd",LOG_CONS,LOG_USER);
+
+   syslog(LOG_INFO, "erddcd %d.%d.%d   by Torsten Vogt", MAJOR_VERSION,
+                                                         MINOR_VERSION,
+                                                         COMPILE_PASS);
+   syslog(LOG_INFO, "   last compiled at %s on host %s from user %s.",
+                                                         __DATE__ ,
+                                                         __HOST__,
+                                                         __USER__);
+
+   syslog(LOG_INFO, "   with SRCP %s", SRCPVER);
+
+   sprintf(ERDDCDIDSTRING,"erddcd v%d.%d.%d; srcp %s\n",
+                           MAJOR_VERSION, MINOR_VERSION, COMPILE_PASS, SRCPVER);
+
    // tvo 2005-10-29
    // if kernel_version > 2.4, improve nmradcc timing has to be disabled
    // this is a workaround, till i know how i can set uart's custom_divisor
    // with kernel 2.6
    if (IMPROVE_NMRADCC_TIMING && strncmp(kernel_version(), "2.4", 3) > 0) {
       IMPROVE_NMRADCC_TIMING = 0;
-      syslog(LOG_INFO,"   INFO: improved nmradcc timing disabled because of kernel version greater than 2.4!");
+      syslog(LOG_INFO,"   INFO: improved nmradcc timing disabled "
+              "because of kernel version greater than 2.4!");
    }
 
    if (FORCE_RUNASROOT) {
       setuid(0);
       if (geteuid()!=0) {
-         fprintf(stderr,"\nOoops, only user 'root' can start erddcd! Abort!\n\n");
-         fprintf(stderr,"you can solve this problem on three ways:\n\n");
-         fprintf(stderr,"   1.) whenever you start erddcd you must be root!\n");
-         fprintf(stderr,"   2.) change owner of the file erddcd to root (chown root:root erddcd) \n");
-         fprintf(stderr,"       and set the uid bit (chmod u+s erddcd)!\n");
-         fprintf(stderr,"   3.) use commandline option -R\n");
-         fprintf(stderr,"       Be careful with this option: erddcd can't do\n");
-         fprintf(stderr,"       it's work correctly!\n\n");
+         syslog(LOG_INFO,"Ooops, only user 'root' can start erddcd! Abort!");
+         syslog(LOG_INFO,"you can solve this problem on three ways:");
+         syslog(LOG_INFO,"   1.) whenever you start erddcd you must be root!");
+         syslog(LOG_INFO,"   2.) change owner of the file erddcd to root "
+                 "(chown root:root erddcd)");
+         syslog(LOG_INFO,"       and set the uid bit (chmod u+s erddcd)!");
+         syslog(LOG_INFO,"   3.) use commandline option -R");
+         syslog(LOG_INFO,"       Be careful with this option: erddcd can't do");
+         syslog(LOG_INFO,"       it's work correctly!");
          exit(1);
       }
    }
    else
       syslog(LOG_INFO,"   WARNING: erddcd called with -R. daemon is not running as root!");
 
-   if (FORCE_DOFORK) {
-      /* something a daemon should do */
-      if ((pid=fork())<0)
-         return -1;
-      else
-         if (pid!=0) exit(0);
-
-      // tvo 2005-11-02
-      if (strncmp(kernel_version(), "2.4", 3) <= 0) {
-         setsid(); // This makes problems with kernel 2.6
-      }
-
-      chdir("/");
-      umask(0);
-   }
-   else
-      syslog(LOG_INFO,"   WARNING: erddcd called with -F. daemon not forked!");
 
    if (IMPROVE_NMRADCC_TIMING)
       syslog(LOG_INFO,"   nmra dcc improved feature enabled!");
@@ -1278,6 +1305,13 @@
       ENABLED_PROTOCOLS = (EP_MAERKLIN | EP_NMRADCC);
    }
 
+   // tvo 2005-12-03
+   error = pthread_mutex_init(&refreshcycle_mutex, NULL);
+   if (error) {
+      syslog(LOG_INFO, "cannot create mutex (refreshcycle_mutex). Abort!");
+      exit(1);
+   }    
+
    inst_signal_handler(); 
 
    cp_dev=init_comport(DEVICE);
@@ -1362,7 +1396,9 @@
    CreatePIDFile(getpid());
 
    // don't let end main thread
-   while (1) { sleep(60); }
+   while (1) {
+       sleep(60);
+   }
    
    return 0;
 }
diff -Nur DDL-xmas2005/erddcd/input_8255.c DDL-xmas2005.neu/erddcd/input_8255.c
--- DDL-xmas2005/erddcd/input_8255.c	2005-11-28 07:40:09.000000000 +0100
+++ DDL-xmas2005.neu/erddcd/input_8255.c	2008-12-11 21:47:30.000000000 +0100
@@ -161,6 +161,9 @@
    if (i==nr_of_pollchannels) return; /* sckt not found, don't worry */
    while (i<(nr_of_pollchannels-1)) { poll_channels[i]=poll_channels[i+1];i++;}
    nr_of_pollchannels--;
+   /*close feedback port socket*/
+   shutdown(sckt, 0);
+   close(sckt);
    if (nr_of_pollchannels==0) { 
       pthread_cancel(i8255polltid);
       i8255polltid=(pthread_t)NULL;
diff -Nur DDL-xmas2005/erddcd/maerklin_s88.c DDL-xmas2005.neu/erddcd/maerklin_s88.c
--- DDL-xmas2005/erddcd/maerklin_s88.c	2005-11-28 07:40:09.000000000 +0100
+++ DDL-xmas2005.neu/erddcd/maerklin_s88.c	2008-12-11 21:48:22.000000000 +0100
@@ -292,6 +292,9 @@
 	if (i==nr_of_pollchannels) return; /* sckt not found, don't worry */
 	while (i<(nr_of_pollchannels-1)) { poll_channels[i]=poll_channels[i+1];i++;}
 	nr_of_pollchannels--;
+        /*close feedback port socket*/
+        shutdown(sckt, 0);
+        close(sckt);
 	if (nr_of_pollchannels==0) { 
 		pthread_cancel(s88polltid);
 		s88polltid=(pthread_t)NULL;
diff -Nur DDL-xmas2005/erddcd/Makefile.am DDL-xmas2005.neu/erddcd/Makefile.am
--- DDL-xmas2005/erddcd/Makefile.am	2003-01-13 11:03:58.000000000 +0100
+++ DDL-xmas2005.neu/erddcd/Makefile.am	2008-12-11 19:22:54.000000000 +0100
@@ -1,27 +1,36 @@
 # Makefile.am (DDL/erddcd)
-# author: Torsten Vogt
+# author: Torsten Vogt, Guido Scholz
 # date  : 2001-12-04
 # last change: 2002-05-25
 
-bin_PROGRAMS = erddcd
-bin_SCRIPTS = ddld
+sbin_PROGRAMS = erddcd
+# bin_SCRIPTS = ddld
 
-erddcd_SOURCES = erddcd.h cycles.h queue.h maerklin.h maerklin_s88.h        \
-                 input_8255.h nmra.h srcp-common.h ga_manager.h             \
-                 erddcd.c cycles.c queue.c maerklin.c maerklin_s88.c        \
-                 input_8255.c nmra.c srcp-common.c ga_manager.c             \
-                 srcp-0.7-global.h srcp-0.7.h srcp-0.7.c                    \
-                 srcp-07-flex.l srcp-07-yacc.y srcp-0.7-yacc.h              \
-                 srcp-0.8-global.h srcp-0.8.h srcp-0.8.c                    \
-                 srcp-08-flex.l srcp-08-yacc.y srcp-0.8-yacc.h              \
-                 srcpbus.c srcpbus.h                                        \
-                 srcpinfochannelmgr.c srcpinfochannelmgr.h
-
-.c.o:
-	$(CC) $(CFLAGS) -c -o $*.o $<
+erddcd_SOURCES = \
+	cycles.c cycles.h \
+	erddcd.c erddcd.h \
+	ga_manager.c ga_manager.h \
+	input_8255.c input_8255.h \
+	maerklin.c maerklin.h\
+	maerklin_s88.c maerklin_s88.h \
+	motorolacodes.h \
+	nmra.c nmra.h \
+	queue.c queue.h \
+	srcp-0.7.c srcp-0.7.h \
+	srcp-0.7-global.h \
+	srcp-0.7-yacc.h \
+	srcp-07-flex.l \
+	srcp-07-yacc.y \
+	srcp-0.8.c srcp-0.8.h \
+	srcp-0.8-global.h \
+	srcp-0.8-yacc.h \
+	srcp-08-flex.l \
+	srcp-08-yacc.y \
+	srcpbus.c srcpbus.h \
+	srcp-common.c srcp-common.h \
+	srcpinfochannelmgr.c srcpinfochannelmgr.h
 
 # say flex and bison how to make their output
-
 srcp-07-yacc.c: srcp-07-yacc.y
 	$(YACC) -y --name-prefix=srcp07 -d -o srcp-07-yacc.c srcp-07-yacc.y
 
@@ -34,12 +43,14 @@
 srcp-08-flex.c: srcp-08-flex.l
 	$(LEX) -Pscrp08 -osrcp-08-flex.c srcp-08-flex.l
 
+CLEANFILES = \
+	srcp-07-yacc.c srcp-07-yacc.h srcp-07-flex.c \
+	srcp-08-yacc.c srcp-08-yacc.h srcp-08-flex.c
+
+#DFLAGS    = -D_DEBUG_
+AM_CFLAGS = -Wall -O2 $(INCLUDES) -D__USER__=\"$(DDL_USER)\" -D__HOST__=\"$(DDL_HOST)\" $(DFLAGS)
 
-DFLAGS    = #-D_DEBUG_
-CFLAGS    = -Wall -O2 $(INCLUDES) -D__USER__=\"`whoami`\" -D__HOST__=\"`hostname`\" $(DFLAGS)
+AM_YFLAGS = -d
 
-YFLAGS = -d
+dist_sysconf_DATA = erddcd.conf
 
-EXTRA_DIST = erddcdrc
-install-data-local:
-	$(INSTALL_DATA) $(EXTRA_DIST) $(DESTDIR)$(prefix)
diff -Nur DDL-xmas2005/erddcd/queue.h DDL-xmas2005.neu/erddcd/queue.h
--- DDL-xmas2005/erddcd/queue.h	2005-11-28 07:40:11.000000000 +0100
+++ DDL-xmas2005.neu/erddcd/queue.h	2007-10-30 20:00:00.000000000 +0100
@@ -41,7 +41,7 @@
 #define QNBLOCOPKT  6
 #define QNBACCPKT   7    
 
-extern pthread_mutex_t queue_mutex;   /* mutex to synchronize the queue */
+//extern pthread_mutex_t queue_mutex;   /* mutex to synchronize the queue */
 
 void queue_init();
 void queue_add(int addr, char *packet, int packet_type, int packet_size);
diff -Nur DDL-xmas2005/erddcd/srcp-0.8.c DDL-xmas2005.neu/erddcd/srcp-0.8.c
--- DDL-xmas2005/erddcd/srcp-0.8.c	2005-11-28 07:40:10.000000000 +0100
+++ DDL-xmas2005.neu/erddcd/srcp-0.8.c	2008-12-07 18:58:29.000000000 +0100
@@ -1261,7 +1261,7 @@
 		                  int devicegroup, int addr) {
 
    char tmpbuf[40];
-   char *devices;
+   char *devices = '\0';;
    char info[80], *cp;
 
    if (busnr<0 || busnr>=SRCPBUSCOUNT) {
diff -Nur DDL-xmas2005/Makefile.am DDL-xmas2005.neu/Makefile.am
--- DDL-xmas2005/Makefile.am	2001-12-16 18:47:28.000000000 +0100
+++ DDL-xmas2005.neu/Makefile.am	2008-12-13 18:55:05.000000000 +0100
@@ -3,6 +3,3 @@
 
 EXTRA_DIST = COPYING AUTHORS README NEWS
 
-install-data-local:
-	$(INSTALL_DATA) $(EXTRA_DIST) $(DESTDIR)$(prefix)
-	$(INSTALL) scripts/rc/erddcd.rc $(DESTDIR)$(bindir)

Places

File ddl-xmas2005-erddcd.patch of Package erddcd (Revision f8cbc99ca69b0d2674f7f37276d4154a)

Places