Changeset 75

Timestamp:

06.10.2002 18:39:42 (6 years ago)

Author:

tibob

Message:

- pid configurable through command line [RC, looking at Loic Tortay's patch for pid configurable through configfile]
- various minor fixes [LT, RC]

Location:

trunk

Files:

• HISTORY (modified) (1 diff)
• Makefile.common.in (modified) (3 diffs)
• Makefile.in (modified) (2 diffs)
• VERSION (modified) (1 diff)
• doc/Makefile.in (modified) (1 diff)
• doc/ipfm.man (modified) (5 diffs)
• source/Makefile.in (modified) (1 diff)
• source/config.l (modified) (3 diffs)
• source/config.y (modified) (2 diffs)
• source/init.c (modified) (8 diffs)
• source/init.h (modified) (1 diff)
• source/ipfm.c (modified) (5 diffs)

trunk/HISTORY

@@ -2 +2 @@
 ------------------
 - typos in ipfm.conf.sample (Fixes Debian Bug #146409)
+- pid configurable through command line [RC, looking at Loic Tortay's patch for pid configurable through configfile]
+- various minor fixes [LT, RC]
 
 Version 0.11.5pre2

trunk/Makefile.common.in

@@ -1 +1 @@
 #
 # Common definitions for all the Makefile's
-# Copyright (c) 1999 Robert CHERAMY <tibob@via.ecp.fr>
+# Copyright (c) 1999-2002 Robert CHERAMY <robert@cheramy.net>
 # Copyright (c) 2001 Loïc Tortay & IN2P3 Computing Center <tortay@cc.in2p3.fr>
 #
@@ -15 +15 @@
 ETCDIR  = $(ROOT)@sysconfdir@
 LOGDIR  = $(ROOT)@localstatedir@/log
-VARRUN  = $(ROOT)@localstatedir@/run
+VARRUNDIR = $(ROOT)@localstatedir@/run
 
 INSTALL = @INSTALL@
@@ -26 +26 @@
 CONFIGFILE=$(ETCDIR)/ipfm.conf
 LOGFILE=$(LOGDIR)/ipfm/%d-%b.%H-%M
-PIDFILE=$(VARRUN)/ipfm.pid
+PIDFILE=$(VARRUNDIR)/ipfm.pid
 

trunk/Makefile.in

@@ -1 +1 @@
 #
 # Makefile for ipfm
-# Copyright (c) 1999 Robert CHERAMY <tibob@via.ecp.fr>
+# Copyright (c) 1999-2002 Robert CHERAMY <robert@cheramy.net>
 # Copyright (c) 2001 Loïc Tortay & IN2P3 Computing Center <tortay@cc.in2p3.fr>
 #
@@ -26 +26 @@
         $(INSTALL) -m 444 doc/ipfm.8 $(MANDIR)/man8/ipfm.8
         $(INSTALL) -d -m 755 $(LOGDIR)/ipfm
+        $(INSTALL) -d -m 755 $(VARRUNDIR)
 
 clean:

trunk/VERSION

@@ -1 @@
-0.11.5pre2
+0.11.5pre3

trunk/doc/Makefile.in

@@ -1 +1 @@
 #
 # Makefile for ipfm docs
+# Copyright (c) 1999-2002 Robert CHERAMY <robert@cheramy.net>
 #
 
 include ../Makefile.common
 
-SED_SCRIPT=-e "s§__CONFIGURATION_FILE§$(CONFIGURATION_FILE)§g" \
-           -e "s§__LOGFILE§$(LOG_FILE)§g"
+SED_SCRIPT=-e "s§__CONFIGURATION_FILE§$(CONFIGFILE)§g" \
+           -e "s§__LOGFILE§$(LOGFILE)§g" \
+           -e "s§__PIDFILE§$(PIDFILE)§g"
 
 all: man

trunk/doc/ipfm.man

@@ -1 +1 @@
 .\" -*-nroff-*-
 .\"
-.\"     Copyright (c) 1999-2001 Robert CHERAMY <robert@cheramy.net>
+.\"     Copyright (c) 1999-2002 Robert CHERAMY <robert@cheramy.net>
 .\"     Copyright (c) 2001 Loïc Tortay & IN2P3 Computing Center <tortay@cc.in2p3.fr>
 .\"
@@ -18 +18 @@
 .\"     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 .\"
-.TH IPFM 8 "Last change: 11 november 2001"
+.TH IPFM 8 "Last change: 06 october 2002"
 
 .SH NAME
@@ -29 +29 @@
 ][\-\-config
 .I config-file
-]  [-h][--help] [-n][--nodaemon]
+] [-h][--help] [-n][--nodaemon] [\-p
+.I pid-file
+][--pid
+.I pid-file
+]
 
 .SH DESCRIPTION
@@ -49 +53 @@
 
 .SH OPTIONS
-.IP "-c config-file, --config <file>"
+.IP "-c config-file, --config config-file"
 .I config-file
 specifies an alternate configuration file to use. By default,
@@ -58 +62 @@
 .IP "-h, --help"
 displays an help message on standard output and exit
+.IP "-p pid-file, --pid pid-file"
+.I pid-file
+specifies an alternate pid file to use. By default,
+.IR __PIDFILE
+is used.
 
 .SH SIGNALS

trunk/source/Makefile.in

@@ -1 +1 @@
 #
-# Makefile for ipfm
+# Makefile for ipfm sources
+# Copyright (c) 1999-2002 Robert CHERAMY <robert@cheramy.net>
 #
 
 include ../Makefile.common
 
-DEFINES = -DPIDFILE=\"$(PIDFILE)\" \
+DEFINES = -DDEFAULT_OPTIONS_PIDFILE=\"$(PIDFILE)\" \
           -DDEFAULT_OPTIONS_CONFIGFILE=\"$(CONFIGFILE)\" \
           -DDEFAULT_OPTIONS_LOGFILE=\"$(LOGFILE)\" 

trunk/source/config.l

@@ -3 +3 @@
   config.l - functions parsing the configuration file
   
-  (c) 1999-2000 Robert Cheramy <tibob@via.ecp.fr>
+  (c) 1999-2002 Robert Cheramy <robert@cheramy.net>
   (c) 2000      Samuel Hocevar <sam@via.ecp.fr>
  
@@ -12 +12 @@
   which helped me to understand Lex and Yacc
 
-  200010xx : sam & tibob : various config options
+  200010 : sam & tibob : various config options
  */
 
@@ -118 +118 @@
 
 [0-9A-Za-z]+          {
-                        yylval.stringval = strdup(yytext);
+                        yylval.stringval = xstrdup(yytext);
                         return STRING;
                       }

trunk/source/config.y

@@ -3 +3 @@
   config.y - functions parsing the configuration file
  
-  (c) 1999-2000 Robert Cheramy <tibob@via.ecp.fr>
+  (c) 1999-2002 Robert Cheramy <robert@cheramy.net>
   (c) 2000      Samuel Hocevar <sam@via.ecp.fr>
   (c) 2001      Loïc Tortay & IN2P3 Computing Center <tortay@cc.in2p3.fr>
@@ -221 +221 @@
         }
       | Device EOL {
+          if (NULL != device) xfree(device);
           device = $1;
         }

trunk/source/init.c

@@ -4 +4 @@
   (c) 1999      Andres Krapf <dae@via.ecp.fr>
   (c) 2000      Samuel Hocevar <sam@via.ecp.fr>
-
-  200010xx : sam   : pid file & daemon mode handling
-  20001107 : tibob : SIGUSR1 handling
-  20001207 : tibob : modifications to have a correct SIGHUP behaviour.
+  (c) 2002      Robert Chéramy <robert@cheramy.net>
+
+  200010 : sam   : pid file & daemon mode handling
+  200011 : tibob : SIGUSR1 handling
+  200012 : tibob : modifications to have a correct SIGHUP behaviour.
+  200210 : tibob : command-line configurable pid file.
+  
  */
 
@@ -72 +75 @@
 #ifdef __OS_LINUX__
   printf("\t-n, --nodaemon:\tdo not run as a daemon\n");
-  printf("\t-c, --config <file>:\tspecify an alternate configuration file\n");
+  printf("\t-c <file>, --config <file>:\tspecify an alternate configuration file\n");
   printf("\t-h, --help:\tdisplay this help and exit\n");
+  printf("\t-p <file>, --pid <file>:\tspecify an alternate pid file\n");
 #else
   printf("\t-n:\tdo not run as a daemon\n");
   printf("\t-c <file>:\tspecify an alternate configuration file\n");
   printf("\t-h:\tdisplay this help and exit\n");
+  printf("\t-p <file>:\tspecify an alternate pid file\n");
 #endif /* __OS_LINUX__ */
   printf("\nPlease report bugs to ipfm@via.ecp.fr\n");
@@ -94 +99 @@
     { "help", 0, NULL, 0 },
     { "nodaemon", 0, &run_as_daemon, 0 },
+    { "pidfile", 1, NULL, 0 },
     { NULL, 0, NULL, 0 }
   };
@@ -99 +105 @@
         
   Options.ConfigFile = NULL;
-
-#ifdef __OS_LINUX__
-  while (EOF != (ch = getopt_long(argc, argv, "hnc:", long_options,
+  Options.PidFile = NULL;
+
+#ifdef __OS_LINUX__
+  while (EOF != (ch = getopt_long(argc, argv, "hncp:", long_options,
                                  &option_index))) {
 #else
-  while (EOF != (ch = getopt(argc, argv, "hnc:"))) {
+  while (EOF != (ch = getopt(argc, argv, "hncp:"))) {
 #endif /* __OS_LINUX__ */
     switch(ch) {          
@@ -110 +117 @@
     case 0:
       switch (option_index) {
-        case 0:
-          Options.ConfigFile = xstrdup(optarg);
-          break;
-        case 1:
-          print_help();
-          exit(0);
-          break;
-    }
+      case 0:
+        Options.ConfigFile = xstrdup(optarg);
+        break;
+      case 1:
+        print_help();
+        exit(0);
+        break;
+      case 2:
+        run_as_daemon = 0;
+        break;
+      case 3:
+        Options.PidFile = xstrdup(optarg);
+        break;
+      }
+      break;
 #endif /* __OS_LINUX__ */
     case 'c':
@@ -125 +139 @@
       run_as_daemon = 0;
       break;
+    case 'p':
+      Options.PidFile = xstrdup(optarg);
+      break;
     case 'h':
     case '?':
@@ -143 +160 @@
   if (NULL == Options.ConfigFile) {
     Options.ConfigFile = xstrdup(DEFAULT_OPTIONS_CONFIGFILE);
+  }
+  if (NULL == Options.PidFile) {
+    Options.PidFile = xstrdup(DEFAULT_OPTIONS_PIDFILE);
   }
 }
@@ -234 +254 @@
 
   if (run_as_daemon) {
-    remove_pid (PIDFILE);
+    remove_pid (Options.PidFile);
   }
 

trunk/source/init.h

@@ -27 +27 @@
 struct OptionsType {
   char *ConfigFile;
+  char *PidFile;
 };
 

trunk/source/ipfm.c

@@ -5 +5 @@
  *********************************************************************
 
- (c) 1999-2000 Robert Cheramy <tibob@via.ecp.fr>
+ (c) 1999-2002 Robert Cheramy <robert@cheramy.net>
  (c) 2000      Samuel Hocevar <sam@via.ecp.fr>
  (c) 1999      Andres Krapf <dae@via.ecp.fr>
@@ -14 +14 @@
  *********************************************************************
 
- 200010xx: sam & tibob : clear and dump options
-           sam : PID file & daemon mode handling
+ 200010: sam & tibob : clear and dump options
+         sam : PID file & daemon mode handling
+ 200210: tibob : configurable PID file
 
  */
@@ -55 +56 @@
 #include "utils.h"
 
-// struct passwd *runas;
 struct AllLogsType * pAllLogs = NULL;
 extern int run_as_daemon;
+extern struct OptionsType Options;
 
 int main(int argc, char *argv[]) {
@@ -69 +70 @@
   if (run_as_daemon) {
     /* Check PID */
-    if (check_pid(PIDFILE)) {
+    if (check_pid(Options.PidFile)) {
       printf ("Already running, exiting.\n");
       exit (1);
@@ -83 +84 @@
 
     /* Write PID file */
-    if (!write_pid(PIDFILE)) {
+    if (!write_pid(Options.PidFile)) {
       exit (1);
     }
   }
   
-  /* Disabled because I can't close the socket as nobody.
-     And I don't feel like using threads now :)
-  runas = getpwnam("nobody");
-  setuid(runas->pw_uid);
-  */
-
   for(;;) {
     p_packet = (struct ip *) getnextippkt();