Changeset 353 in MondoRescue

Timestamp:

Jan 28, 2006, 6:42:59 PM (19 years ago)

Author:

bcornec

Message:

monitas latest version

Location:

branches/stable/monitas

Files:

• client.c (modified) (9 diffs)
• common.c (modified) (12 diffs)
• from-mondo.c (modified) (5 diffs)
• server.c (modified) (40 diffs)
• structs.h (modified) (4 diffs)
• tst.c (added)

branches/stable/monitas/client.c

@@ -62 +62 @@
 #include "structs.h"
 //#define LOG_THESE_AND_HIGHER debug
-#define LOGFILE "/var/log/monitas-client.log"
+//#define LOGFILE "/var/log/monitas-client.log"
 
 
@@ -74 +74 @@
 pthread_t g_mondo_thread=0;
 char g_command_fifo[MAX_STR_LEN+1];
-char g_logfile[MAX_STR_LEN+1] = "/var/log/monitas-client.log";
 
 /* externs */
@@ -92 +91 @@
 extern void register_pid(pid_t, char*);
 extern void set_signals(bool);
+extern int parse_options(int argc, char *argv[]);
 
 /* prototypes */
@@ -202 +202 @@
       return(1);
     }
-  strcpy(mondoparams_str, get_param_from_rcfile(CLIENT_RCFILE, "mondoarchive_params"));
+  strcpy(mondoparams_str, get_param_from_rcfile(g->client_rcfile, "mondoarchive_params"));
   sprintf(tmp, "mondoarchive_params --> '%s'", mondoparams_str);
   log_it(debug, tmp);
@@ -342 +342 @@
       return(1);
     }
-  strcpy(mondoparams_str, get_param_from_rcfile(CLIENT_RCFILE, "mondoarchive_params"));
+  strcpy(mondoparams_str, get_param_from_rcfile(g->client_rcfile, "mondoarchive_params"));
   sprintf(tmp, "mondoarchive_params --> '%s'", mondoparams_str);
   log_it(debug, tmp);
@@ -434 +434 @@
   char tmp[MAX_STR_LEN+1];
 
-  for(server_port = 8700; server_port < 8710; server_port++)
-    {
-      sin->sin_port = htons(server_port);
       if ((*p_s = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
     {
-      perror("socket");
+//    perror("socket");
+      log_it(info, "Creating socket failed: %s", strerror(errno));
       return(-1);
     }
+  for(server_port = 8700; server_port < 8710; server_port++)
+    {
+      sin->sin_port = htons(server_port);
       if (connect(*p_s, (struct sockaddr*)sin, sizeof(struct sockaddr_in)) < 0)
     {
@@ -450 +451 @@
       return(server_port);
     }
+  close(*p_s);
   return(-1);
 }
@@ -1249 +1251 @@
 //  pthread_t thread;
 
+  parse_options(argc, argv);
+
   log_it(info, "---------- Monitas (client) by Hugo Rabson ----------");
   register_pid(getpid(), "client");
@@ -1284 +1288 @@
     }
 
-//  set_param_in_rcfile(CLIENT_RCFILE, "mondoarchive_params", "-1 -L");
+//  set_param_in_rcfile(g->client_rcfile, "mondoarchive_params", "-1 -L");
   log_it(debug, "Awaiting commands from FIFO");
-  create_and_watch_fifo_for_commands(CLIENT_COMDEV);
+  create_and_watch_fifo_for_commands(g->client_comdev);
   logout_and_exit(g_server_name);
   exit(0);

branches/stable/monitas/common.c

@@ -27 +27 @@
 
 #include "structs.h"
+#include <stdarg.h>
+
+#define CLIENT_RCFILE           "/root/.monitas-client.rc"
+#define CLIENT_COMDEV           "/var/spool/monitas/client-input.dev"
+#define CLIENT_LOGFILE          "/var/log/monitas-client.log"
+#define SERVER_COMDEV           "/var/spool/monitas/server-input.dev"
+#define SERVER_STATUS_FILE      "/var/spool/monitas/server-status.txt"
+#define SERVER_LOGFILE          "/var/log/monitas-server.log"
 
 
@@ -43 +51 @@
 int create_and_watch_fifo_for_commands(char*);
 int get_bkgd_prog_result(pthread_t*);
-void log_it_SUB(char*, t_loglevel, char*);
+//void log_it_SUB(char*, t_loglevel, char*);
 bool program_still_running(char*);
 int receive_file_from_socket(FILE*fout, int socket_fd);
@@ -52 +60 @@
 void termination_in_progress(int sig);
 int transmit_file_to_socket(FILE*fin, int socket_fd);
+char *my_basename(char *path);
+int parse_options(int argc, char *argv[]);
+
+/* global vars */
+
+/* global (semi-) static data.
+ * Always use following pointer to access this struct!!
+ * Struct is initialized by parse_options() */
+static struct s_globaldata  _global_data;
+/* Global Pointer to access the (semi-) static data */
+struct s_globaldata *g = & _global_data;
 
 
@@ -73 +92 @@
 
   res = pthread_create(thread, NULL, call_prog_in_bkgd_SUB, (void*)command);
-  if (res) { log_it(fatal, "Unable to call program in background - thread creation failure"); }
+  if (res) { log_it(fatal, "Unable to call program in background - thread creation failure %s", command); }
   log_it(debug, "Done creating pthread. Will continue now.");
 }
@@ -90 +109 @@
 Return: None
 */
-  char*command;
   int res;
-  char tmp[MAX_STR_LEN+1];
-  static char result_str[MAX_STR_LEN+1];
-
-  command=(char*)cmd;
-  sprintf(tmp, "Calling '%s' in background pthread", command);
-  log_it(debug, tmp);
-  res = system(command);
-  sprintf(tmp, "'%s' is returning from bkgd process - res=%d", command, res); 
-  log_it(debug, tmp);
-  sprintf(result_str, "%d", res);
-  pthread_exit((void*)result_str);
+
+  log_it(debug, "Calling '%s' in background pthread", cmd);
+  res = system(cmd);
+  log_it(debug, "'%s' is returning from bkgd process - res=%d", cmd, res);
+  pthread_exit((void*)res);
 }
 
@@ -119 +131 @@
 */
 {
-  char tmp[MAX_STR_LEN+1], incoming[MAX_STR_LEN+1];
+  char incoming[MAX_STR_LEN+1];
   int res=0, fd, len, pos=0;
 
   res = make_hole_for_file(devpath) + mkfifo(devpath, 700);
-  if (res) { log_it(error, "Unable to prepare command FIFO"); return(res); }
+  if (res) { log_it(error, "Unable to prepare command FIFO %s", devpath); return(res); }
   strncpy(g_command_fifo, devpath, MAX_STR_LEN);
-  if (!(fd = open(g_command_fifo, O_RDONLY))) { log_it(error, "Unable to openin command FIFO"); return(1); }
+  if (!(fd = open(g_command_fifo, O_RDONLY))) { log_it(error, "Unable to openin command FIFO %s", g_command_fifo); return(1); }
 //  log_it(info, "Awaiting commands from FIFO");
   for(;;)
@@ -140 +152 @@
           if (res)
             {
-              sprintf(tmp, "%s <-- errors occurred during processing", incoming);
-              log_it(error, tmp);
+              log_it(error,  "%s <-- errors occurred during processing", incoming);
             }
           else
             {
-              sprintf(tmp, "%s <-- command received OK", incoming);
-              log_it(info, tmp);
+              log_it(info, "%s <-- command received OK", incoming);
             }
         }
@@ -168 +178 @@
 */
 {
-  void*vp;
-  void**pvp;
+  void* vp;
+//  void**pvp;
   int res;
-  char tmp[MAX_STR_LEN+1], *p, result_str[MAX_STR_LEN+1];
-
-  pvp=&vp;
+//  char *p, result_str[MAX_STR_LEN+1];
+
+/*  pvp=&vp;
   vp=(void*)result_str;
   strcpy(result_str, "(uninitialized)");
@@ -181 +191 @@
   p = (char*)vp;
   res = atoi(p);
-  sprintf(tmp, "pthread res = %d ('%s')", res, p);
-  log_it(debug, tmp);
+  log_it(debug, "pthread res = %d ('%s')", res, p);
+*/
+  log_it(debug, "Waiting for bkgd prog to finish, so that we can get its result");
+  if ((res = pthread_join(*thread, &vp)) != 0)
+    {
+      log_it(fatal, "pthread_join failed with error  %s",
+        ((res==ESRCH)   ? "ESRCH - No thread could be found corresponding to that specified by 'thread'" :
+        ((res==EINVAL)  ? "EINVAL - The thread has been detached OR Another thread is already waiting on termination of it." :
+        ((res==EDEADLK) ? "EDEADLK - The 'tread' argument refers to the calling thread." :
+          "UNSPECIFIED"))));
+    }
   *thread = 0;
+  res = (int) vp;
+  log_it(debug, "pthread res = %d ('%s')", res, (res>256 || res<-256) ? (char*)vp : "");
   return(res);
 }
@@ -201 +222 @@
 */
 {
-  char sz_outstr[MAX_STR_LEN], sz_level[MAX_STR_LEN], sz_time[MAX_STR_LEN];
+  char      *sz_level = "";
   time_t time_rec;
+  struct tm  tm;
   FILE*fout;
 
   time(&time_rec);
+  localtime_r(&time_rec, &tm);
   switch(level)
     {
-      case debug: strcpy(sz_level, "DEBUG"); break;
-      case info:  strcpy(sz_level, "INFO "); break;
-      case warn:  strcpy(sz_level, "WARN "); break;
-      case error: strcpy(sz_level, "ERROR"); break;
-      case fatal: strcpy(sz_level, "FATAL"); break;
-      default:    strcpy(sz_level, "UNKWN"); break;
-    }
-  sprintf(sz_time, ctime(&time_rec));
-  sz_time[strlen(sz_time)-6] = '\0';
-  sprintf(sz_outstr, "%s %s: %s", sz_time+11, sz_level, sz_message);
+      case debug: sz_level = "DEBUG"; break;
+      case info:  sz_level = "INFO "; break;
+      case warn:  sz_level = "WARN "; break;
+      case error: sz_level = "ERROR"; break;
+      case fatal: sz_level = "FATAL"; break;
+      default:    sz_level = "UNKWN"; break;
+    }
   if ((int)level >= LOG_THESE_AND_HIGHER)
     {
-      while (!(fout=fopen(logfile,"a"))) { usleep((int)(random()%32768)); }
-      fprintf(fout, "%s\n",sz_outstr);
+      while (!(fout=fopen(logfile,"a")))
+        { usleep((int)(random()%32768)); }
+      fprintf(fout, "%02d:%02d:%02d %s: %s\n", tm.tm_hour, tm.tm_min, tm.tm_sec, sz_level, sz_message);
       fclose(fout);
     }
   if (level==fatal)
     {
-      fprintf(stderr, "Aborting now. See %s for more information.\n", g_logfile);
+      fprintf(stderr, "Aborting now. See %s for more information.\n", logfile);
+      terminate_daemon(0);
+      exit(1);
+    }
+}
+
+
+
+/*-----------------------------------------------------------*/
+
+
+
+void logToFile(char *logfile, t_loglevel level, char *filename, char *lineno, char *funcname, char *sz_message, ...)
+/*
+Purpose: Log <sz_message> and its <level> of severity to <logfile>
+Params:  logfile      name of logfile
+         level        level of severity (debug/info/warn/error/fatal)
+         sz_message   message/event [string]
+     for <level>==debug the location of the event is specified by:
+         filename     name of the file, where <sz_message> was created
+         lineno       number of the line [string], where <sz_message> was created
+         funcname     name of the function, that created the event
+Return:  None
+*/
+{
+  char      *sz_level = "";
+  time_t     time_rec;
+  struct tm  tm;
+  FILE      *fout;
+  va_list    ap;
+
+
+  time(&time_rec);
+  va_start(ap, sz_message);       // initialize the variable arguments
+  localtime_r(&time_rec, &tm);
+  switch(level)
+    {
+      case debug:
+        {
+          // sz_level = "DEBUG"; break;
+          // at debug level we add filename, lineno and functionname instead of "DEBUG"
+          // i.e.  "file.c:123, subfunction()"
+          char *fmt = "%s:%s, %s()";
+          // calculate length of resulting string:
+          size_t size = strlen(fmt) -(3*2) + 1  // length of fmt-string minus 3x 2 chars ("%s") plus 1 for terminating \0'
+                        + strlen(filename)      //   plus length of filename
+                        + strlen(lineno)        //   plus length of linenumber
+                        + strlen(funcname);     //   plus length of functionname
+          sz_level = alloca(size);          // memory is automatically free'd when this function returns
+          snprintf(sz_level, size, "%s:%s, %s()", filename, lineno, funcname);
+        } break;
+      case info:  sz_level = "INFO "; break;
+      case warn:  sz_level = "WARN "; break;
+      case error: sz_level = "ERROR"; break;
+      case fatal: sz_level = "FATAL"; break;
+      default:    sz_level = "UNKWN"; break;
+    }
+  if ((int)level >= LOG_THESE_AND_HIGHER)
+    {
+      while (!(fout=fopen(logfile,"a")))
+        { usleep((int)(random()%32768)); }
+      fprintf(fout, "%02d:%02d:%02d %s: ", tm.tm_hour, tm.tm_min, tm.tm_sec, sz_level);  // print time and level
+      vfprintf(fout, sz_message, ap);             // print message (and further args)
+      fprintf(fout, "\n");
+      fclose(fout);
+    }
+  va_end(ap);                             // finalize the variable arguments
+  if (level==fatal)
+    {
+      fprintf(stderr, "Aborting now. See %s for more information.\n", logfile);
       terminate_daemon(0);
       exit(1);
@@ -428 +518 @@
   log_it(debug, "Termination in progress");
   usleep(1000);
-  pthread_exit(0);
+  pthread_exit(NULL);
 }
 
@@ -539 +629 @@
 
 
-
-
-
-
-
+/*-----------------------------------------------------------*/
+
+
+/*
+Purpose: strip directory from filenames
+Params:  path    like: "dir1/dir2/file"
+Return:  result  pointer to the first character behind the last '/'
+*/
+char *my_basename(char *path)
+{
+    char *name;
+    if (path == NULL)
+        return (NULL);
+    name = strrchr(path, '/');
+    if (name == NULL)
+        return (path);   /* only a filename was given */
+    else
+        return (++name); /* skip the '/' and return pointer to next char */
+}
+
+
+
+
+/*-----------------------------------------------------------*/
+
+
+/*
+Purpose: analyse command line arguments and write them to global struct
+Params:  argc   number of arguments
+         argv   arguments as array of strings
+Return: result (0=success, nonzero=failure)
+*/
+int parse_options(int argc, char *argv[])
+{
+    // initialize the global data structure
+    memset( g, 0, sizeof(struct s_globaldata));
+
+    // we use malloc() here for default strings, as we wanna use free() later
+    // when changing the value. free()ing mem in the text segment would be a
+    // bad idea...
+
+    /* Initialize default values */
+#define INIT_DEFAULT_STRING(var, string)                       \
+    if ( ((var) = (char*) malloc(strlen(string)+1)) != NULL )  \
+       strcpy((var), string)
+
+    INIT_DEFAULT_STRING( g->client_rcfile, CLIENT_RCFILE );
+    INIT_DEFAULT_STRING( g->client_comdev, CLIENT_COMDEV );
+    INIT_DEFAULT_STRING( g->server_comdev, SERVER_COMDEV );
+    INIT_DEFAULT_STRING( g->server_status_file, SERVER_STATUS_FILE );
+
+    g->loglevel = LOG_THESE_AND_HIGHER;   // log messages with level >= loglevel to logfile
+
+    // evaluate if we're server or client:
+    // We decide it by looking at the name of the running program
+    if (strstr(my_basename(argv[0]), "server") != NULL)
+      {          // the server may be named 'server', 'monitos-server', 'monserver_start', ...
+        INIT_DEFAULT_STRING( g->logfile, SERVER_LOGFILE );
+      }
+    else if (strstr(my_basename(argv[0]), "client") != NULL)
+      {          // the client may be named 'client', 'monitos-client', 'monclient_start', ...
+        INIT_DEFAULT_STRING( g->logfile, CLIENT_LOGFILE );
+      }
+    else  /* this should never happen */
+      {
+        fprintf(stderr, "Don't know if we're running as server or client, when started as %s", my_basename(argv[0]));
+        INIT_DEFAULT_STRING( g->logfile, "/var/log/monitas.log" );
+      }
+
+#undef INIT_DEFAULT_STRING
+    return 0;
+}
+
+
+
+
+
+
+

branches/stable/monitas/from-mondo.c

@@ -8 +8 @@
 
 
-extern void log_it_SUB(char*, t_loglevel, char*);
+//extern void log_it_SUB(char*, t_loglevel, char*);
 char *call_program_and_get_last_line_of_output(char*);
 int call_program_and_log_output (char *);
@@ -17 +17 @@
 
 
-extern char g_logfile[MAX_STR_LEN+1];
 
 
@@ -215 +214 @@
 /*************************************************************************
  * strip_spaces() -- Hugo Rabson                                         *
- *                                                                       *
- * Purpose:                                                              *
+ *                   rewitten Stefan Huebner                             *
+ *                                                                       *
+ * Purpose:   remove leading whitespaces and control characters, replace *
+ *            TABs by SPACES, remove previous char when followed with BS,*
+ *            skip control chars, terminate string with '\0' when CR or  *
+ *            NL is detected                                             *
+ *            afterwards remove trailing whitespace                      *
  * Called by:                                                            *
  * Returns:                                                              *
@@ -223 +227 @@
 strip_spaces (char *in_out)
 {
+    char *r, *w;
+    r = w = in_out;             // initialize read and write pointer
+
+    while ( *r && *r <= ' ' )
+        ++r;                    // skip leading whitespace and control chars
+
+    for ( ; *r ; ++r )          // until end of existing string do:
+      {
+        if (*r == '\t')                 // TAB
+          { *w++ = ' ';                     // write SPACE instead
+            continue; }
+        if (*r == (char) 8)             // BACKSPACE
+          { if (w > in_out) --w;            // remove previous character (if any ;-)
+            continue; }
+        if (*r == '\n' || *r == '\r')   // CR and LF
+            break;                          // terminate copying
+        if (*r < ' ')                   // Control chars
+            continue;                       // are ignored (skipped)
+        *w++ = *r;                      // all other chars are copied
+      }
+    // all characters are copied
+    *w = '\0';                  // terminate the copied string
+    for (--w; w>in_out && *w == ' '; --w)
+        *w = '\0';              // remove trailing whitespaces
+    return;
     /** buffers ******************************************************/
-  char tmp[MAX_STR_LEN+1];
+//  char tmp[MAX_STR_LEN+1];
 
     /** pointers *****************************************************/
-  char *p;
+//  char *p;
 
     /** int *********************************************************/
-  int i;
+//  int i;
 
     /** end vars ****************************************************/
-  for (i = 0; in_out[i] <= ' ' && i < strlen (in_out); i++);
+/*  for (i = 0; in_out[i] <= ' ' && i < strlen (in_out); i++);
   strcpy (tmp, in_out + i);
   for (i = strlen (tmp); i>0 && tmp[i - 1] <= 32; i--);
@@ -277 +306 @@
     }
   in_out[i] = '\0';
+*/
 /*  for(i=strlen(in_out); i>0 && in_out[i-1]<=32; i--) {in_out[i-1]='\0';} */
 }

branches/stable/monitas/server.c

@@ -80 +80 @@
 
 #define NOOF_THREADS 10
-#define LOGFILE "/var/log/monitas-server.log"
-#define log_it(x,y) { log_it_SUB(g_logfile,x,y); }
+//#define LOGFILE "/var/log/monitas-server.log"
+//#define log_it(x,y) { log_it_SUB(g_logfile,x,y); }
 
 
@@ -100 +100 @@
 extern char *tmsg_to_string(t_msg);
 extern int transmit_file_to_socket(FILE*,int);
-
+extern int parse_options(int argc, char *argv[]);
 
 
@@ -108 +108 @@
 char g_command_fifo[MAX_STR_LEN+1]; // Device which server will monitor for incoming commands
 pthread_t g_threadinfo[NOOF_THREADS]; // One thread per port, to watch for requests from clients
-char g_logfile[MAX_STR_LEN+1] = "/var/log/monitas-server.log";
 char g_server_status_file[MAX_STR_LEN+1];
 
@@ -156 +155 @@
   FILE*fout;
 
-  sprintf(tmp, "%s - backup of %s commencing", ipaddr, clientpath);
-  log_it(info, tmp);
-  sprintf(outfile, "/var/spool/monitas/%s/%s.dat", ipaddr, call_program_and_get_last_line_of_output("date +%s"));
-  if (does_file_exist(outfile)) { log_it(error, "Backup storage location exists already. That should be impossible."); return(1); }
+  log_it(info, "%s - backup of %s commencing", ipaddr, clientpath);
+  sprintf(outfile, "/var/spool/monitas/%s/%lu.dat", ipaddr, time(NULL));
+  if (does_file_exist(outfile)) { log_it(error, "Backup storage location '%s' exists already. That should be impossible.", outfile); return(1); }
   if (make_hole_for_file(outfile))
-    { res++; log_it(error, "Cannot write archive to spool dir"); }
+    { res++; log_it(error, "Cannot write archive to spool dir '%s'", outfile); }
   else if (!(fout=fopen(outfile, "w")))
-    { res++; log_it(fatal, "Failed to openout temp data file"); }
+    { res++; log_it(fatal, "Failed to openout temp data file '%s'", outfile); }
   else
     {
-      sprintf(tmp, "Backing up %s - archive=%s", ipaddr, outfile);
-      log_it(debug, tmp);
+      log_it(debug, "Backing up %s - archive=%s", ipaddr, outfile);
       rec_to_client.msg_type = trigger_backup;
       strncpy(rec_to_client.body, clientpath, sizeof(rec_to_client.body));
@@ -193 +190 @@
   if (res>0)
     {
-      sprintf(tmp, "%s - error(s) occurred while backing up %s", ipaddr, clientpath);
-      log_it(error, tmp);
+      log_it(error, "%s - error(s) occurred while backing up %s", ipaddr, clientpath);
       rec_to_client.msg_type = backup_fail;
       sprintf(rec_to_client.body, "Failed to backup %s", clientpath);
@@ -202 +198 @@
   else
     {
-      sprintf(tmp, "%s - backed up %s ok", ipaddr, clientpath);
-      log_it(info, tmp);
+      log_it(info, "%s - backed up %s ok", ipaddr, clientpath);
       rec_to_client.msg_type = backup_ok;
       sprintf(rec_to_client.body, "%s - backed up ok", clientpath);
@@ -211 +206 @@
     {
       res++;
-      sprintf(tmp, "Unable to notify %s of backup success/failure", ipaddr);
-      log_it(error, tmp);
+      log_it(error, "Unable to notify %s of backup success/failure", ipaddr);
       i = find_client_in_clientlist(ipaddr);
       if (i>=0) { forcibly_logout_client(i); }
@@ -241 +235 @@
   FILE*fin;
 
-  sprintf(tmp, "%s - comparison of %s commencing", ipaddr, clientpath);
-  log_it(info, tmp);
+  log_it(info, "%s - comparison of %s commencing", ipaddr, clientpath);
 // FIXME - don't assume the latest backup contains the files we want ;)
   sprintf(tmp, "find /var/spool/monitas/%s -type f | sort | tail -n1", ipaddr);
   strcpy(infile, call_program_and_get_last_line_of_output(tmp));
-  sprintf(tmp, "Comparing to data file '%s'", infile);
-  log_it(debug, tmp);
-  if (!does_file_exist(infile)) { log_it(error, "Backup not found. That should be impossible."); return(1); }
-  sprintf(tmp, "Comparing %s - archive=%s", ipaddr, infile);
-  log_it(debug, tmp);
+  log_it(debug, "Comparing to data file '%s'", infile);
+  if (!does_file_exist(infile)) { log_it(error, "Backup '%s' not found. That should be impossible.", infile); return(1); }
+  log_it(debug, "Comparing %s - archive=%s", ipaddr, infile);
   rec_to_client.msg_type = trigger_compare;
   strncpy(rec_to_client.body, clientpath, sizeof(rec_to_client.body));
@@ -256 +247 @@
     { log_it(error, "compare_client - failed to send msg to client"); return(1); }
   if (!(fin=fopen(infile, "r")))
-    { log_it(fatal, "Failed to openin temp data file"); }
+    { log_it(fatal, "Failed to openin temp data file '%s'", infile); }
   res += transmit_file_to_socket(fin, socket_fd);
   len=read(socket_fd, (char*)&i, sizeof(i));
@@ -267 +258 @@
   if (res>0)
     {
-      sprintf(tmp, "%s - error(s) occurred while comparing %s", ipaddr, clientpath);
-      log_it(error, tmp);
+      log_it(error, "%s - error(s) occurred while comparing %s", ipaddr, clientpath);
       rec_to_client.msg_type = compare_fail;
       sprintf(rec_to_client.body, "Failed to compare %s", clientpath);
@@ -275 +265 @@
   else
     {
-      sprintf(tmp, "%s - compared %s ok", ipaddr, clientpath);
-      log_it(info, tmp);
+      log_it(info, "%s - compared %s ok", ipaddr, clientpath);
       rec_to_client.msg_type = compare_ok;
       sprintf(rec_to_client.body, "%s - compared ok", clientpath);
@@ -283 +272 @@
   if (send_msg_to_client(&rec_to_client, ipaddr, port, &socket_fd))
     {
-      sprintf(tmp, "Unable to notify %s of compare success/failure", ipaddr);
-      log_it(error, tmp);
+      log_it(error, "Unable to notify %s of compare success/failure", ipaddr);
       i = find_client_in_clientlist(ipaddr);
       if (i>=0) { forcibly_logout_client(i); }
@@ -307 +295 @@
 {
   int i;
-  char tmp[MAX_STR_LEN+1];
 
   for(i = 0; i < g_clientlist.items; i++)
@@ -313 +300 @@
       if (!strcmp(clientIP, g_clientlist.el[i].ipaddr))
     { return(i); }
-      sprintf(tmp, "find_client_in_clientlist: Compared %s to clientlist[%d]=%s; failed\n", clientIP, i, g_clientlist.el[i].ipaddr);
-      log_it(debug, tmp);
+      log_it(debug, "find_client_in_clientlist: Compared %s to clientlist[%d]=%s; failed\n", clientIP, i, g_clientlist.el[i].ipaddr);
     }
   return(-1);
@@ -359 +345 @@
   int res=0;
 
-  sprintf(tmp, "Forcibly logging %s out", g_clientlist.el[clientno].ipaddr);
-  log_it(info, tmp);
+  log_it(info, "Forcibly logging %s out", g_clientlist.el[clientno].ipaddr);
   rec_to_client.msg_type = logout_ok; /* to confirm logout */
   strcpy(rec_to_client.body, "Server is shutting down. You are forced to logout");
@@ -366 +351 @@
   if (--g_clientlist.items > 0)
     {
-      sprintf(tmp, "Moving clientlist[%d] to clientlist[%d]", clientno, g_clientlist.items);
-      log_it(debug, tmp);
+      log_it(debug, "Moving clientlist[%d] to clientlist[%d]", clientno, g_clientlist.items);
       sprintf(tmp, "Was ipaddr=%s; now is ipaddr=", g_clientlist.el[clientno].ipaddr);
       memcpy((void*)&g_clientlist.el[clientno], (void*)&g_clientlist.el[g_clientlist.items], sizeof(struct s_registered_client_record));
       strcat(tmp, g_clientlist.el[clientno].ipaddr);
+      /* FIXME: tmp must never contain '%'-sequences */
       log_it(debug, tmp);
     }
@@ -419 +404 @@
 */
 {
-  char clientIP[MAX_STR_LEN+1], tmp[MAX_STR_LEN+1];
+  char clientIP[MAX_STR_LEN+1];
   unsigned char *ptr;
   int res=0;
@@ -426 +411 @@
   ptr = (unsigned char*)(&sin->sin_addr);
   sprintf(clientIP, "%d.%d.%d.%d", ptr[0], ptr[1], ptr[2], ptr[3]);
-  sprintf(tmp, "clientIP = %s", clientIP);
-  log_it(debug, tmp);
-  sprintf(tmp, "%s message from %s [%s] (port %d)", tmsg_to_string(rec->msg_type), clientIP, rec->body, rec->port);
-  log_it(debug, tmp);
+  log_it(debug, "clientIP = %s", clientIP);
+  log_it(debug, "%s message from %s [%s] (port %d)", tmsg_to_string(rec->msg_type), clientIP, rec->body, rec->port);
   switch(rec->msg_type)
     {
@@ -471 +454 @@
   struct s_server2client_msg_record rec_to_client;
   int clientno;
-  char tmp[MAX_STR_LEN+1];
 
 //FIXME - lock g_clientlist[]
@@ -479 +461 @@
       rec_to_client.msg_type = login_fail;
       sprintf(rec_to_client.body, "Sorry, you're already logged in!");
-      sprintf(tmp, "Ignoring login rq from %s: he's already logged in.", clientIP);
-      log_it(error, tmp);
+      log_it(error, "Ignoring login rq from %s: he's already logged in.", clientIP);
 /* FIXME - ping client (which will have a child watching for incoming
 packets by now - you didn't forget to do that, did you? :)) - to find out
@@ -497 +478 @@
       g_clientlist.el[clientno].busy = false;
       g_clientlist.items ++;
-      sprintf(tmp, "Login request from %s ACCEPTED", clientIP);
-      log_it(info, tmp);
+      log_it(info, "Login request from %s ACCEPTED", clientIP);
       strcpy(g_clientlist.el[clientno].last_progress_rpt, "Logged in");
     }
@@ -523 +503 @@
   struct s_server2client_msg_record rec_to_client;
   int i, res=0;
-  char tmp[MAX_STR_LEN+1];
 
   i = find_client_in_clientlist(clientIP);
@@ -550 +529 @@
       g_clientlist.items--;
       rec_to_client.msg_type = logout_ok; /* to confirm logout */
-      sprintf(tmp, "Logout request from %s ACCEPTED", clientIP);
-      log_it(info, tmp);
+      log_it(info,  "Logout request from %s ACCEPTED", clientIP);
     }
   send_msg_to_client(&rec_to_client, clientIP, rec_from_client->port, NULL);
@@ -575 +553 @@
   struct s_server2client_msg_record rec_to_client;
   int i;
-  char tmp[MAX_STR_LEN+1];
 
   i = find_client_in_clientlist(clientIP);
   if (i < 0)
     {
-      sprintf(tmp, "Hey, %s isn't logged in. I'm not going to pong him.", clientIP);
-      log_it(error, tmp);
+      log_it(error, "Hey, %s isn't logged in. I'm not going to pong him.", clientIP);
     }
   else
@@ -611 +587 @@
 //  struct s_server2client_msg_record rec_to_client;
   int i, res=0;
-  char tmp[MAX_STR_LEN+1];
 
   i = find_client_in_clientlist(clientIP);
   if (i < 0)
     {
-      sprintf(tmp, "Hey, %s isn't logged in. I'm not going to deal with his progress_rpt.", clientIP);
-      log_it(error, tmp);
+      log_it(error, "Hey, %s isn't logged in. I'm not going to deal with his progress_rpt.", clientIP);
       res++;
     }
@@ -645 +619 @@
 //  struct s_server2client_msg_record rec_to_client;
   int i, res=0;
-  char tmp[MAX_STR_LEN+1], command[MAX_STR_LEN+1], first_half[MAX_STR_LEN+1], second_half[MAX_STR_LEN+1], *p;
+  char command[MAX_STR_LEN+1], first_half[MAX_STR_LEN+1], second_half[MAX_STR_LEN+1], *p;
 
   i = find_client_in_clientlist(clientIP);
   if (i < 0)
     {
-      sprintf(tmp, "Hey, %s isn't logged in. I'm not going to deal with his request.", clientIP);
-      log_it(error, tmp);
+      log_it(error, "Hey, %s isn't logged in. I'm not going to deal with his request.", clientIP);
       res++;
     }
@@ -659 +632 @@
       p = strchr(first_half, ' ');
       if (!p) { second_half[0]='\0'; } else { strcpy(second_half, p); *p='\0'; }
-      sprintf(command, "echo \"%s %s%s\" > %s", first_half, clientIP, second_half, SERVER_COMDEV);
+      sprintf(command, "echo \"%s %s%s\" > %s", first_half, clientIP, second_half, g->server_comdev);
       log_it(debug, command);
       i = system(command);
@@ -683 +656 @@
 int res=0, port;
 int clientno;
-char tmp[MAX_STR_LEN+1];
 int pos;
 char command[MAX_STR_LEN+1], ipaddr[MAX_STR_LEN+1],
@@ -698 +670 @@
 
 //          for(i=0; i<strlen(command); i++) { command[i]=command[i]|0x60; }
-          sprintf(tmp, "cmd=%s ipaddr=%s path=%s", command, ipaddr, path);
-          log_it(debug, tmp);
-          sprintf(tmp, "%s of %s on %s <-- command received", command, path, ipaddr);
-          log_it(info, tmp);
+          log_it(debug, "cmd=%s ipaddr=%s path=%s", command, ipaddr, path);
+          log_it(info, "%s of %s on %s <-- command received", command, path, ipaddr);
           if ((clientno = find_client_in_clientlist(ipaddr)) < 0)
             {
-              sprintf(tmp, "%s not found in clientlist; so, %s failed.", ipaddr, command);
-              log_it(error, tmp);
+              log_it(error, "%s not found in clientlist; so, %s failed.", ipaddr, command);
             }
           else if (g_clientlist.el[clientno].busy == true)
             {
-              sprintf(tmp, "%s is busy; so, %s failed.", ipaddr, command);
-              log_it(error, tmp);
+              log_it(error, "%s is busy; so, %s failed.", ipaddr, command);
             }
           else
@@ -724 +692 @@
               else
                 {
-                  sprintf(tmp, "%s - cannot '%s'. Command unknown.", ipaddr, command);
-                  log_it(error, tmp);
+                  log_it(error, "%s - cannot '%s'. Command unknown.", ipaddr, command);
                   res=1;
                 }
@@ -753 +720 @@
   FILE*fin;
 
-  sprintf(tmp, "%s - restoration of %s commencing", ipaddr, clientpath);
-  log_it(info, tmp);
+  log_it(info, "%s - restoration of %s commencing", ipaddr, clientpath);
 // FIXME - don't assume the latest backup contains the files we want ;)
   sprintf(tmp, "find /var/spool/monitas/%s -type f | sort | tail -n1", ipaddr);
   strcpy(infile, call_program_and_get_last_line_of_output(tmp));
-  sprintf(tmp, "Restoring from data file '%s'", infile);
-  log_it(debug, tmp);
-  if (!does_file_exist(infile)) { log_it(error, "Backup not found. That should be impossible."); return(1); }
-  sprintf(tmp, "Restoring %s - archive=%s", ipaddr, infile);
-  log_it(debug, tmp);
+  log_it(debug, "Restoring from data file '%s'", infile);
+  if (!does_file_exist(infile)) { log_it(error, "Backup '%s' not found. That should be impossible.", infile); return(1); }
+  log_it(debug, "Restoring %s - archive=%s", ipaddr, infile);
   rec_to_client.msg_type = trigger_restore;
   strncpy(rec_to_client.body, clientpath, sizeof(rec_to_client.body));
@@ -782 +746 @@
   if (res>0)
     {
-      sprintf(tmp, "%s - error(s) occurred while restoring %s", ipaddr, clientpath);
-      log_it(error, tmp);
+      log_it(error, "%s - error(s) occurred while restoring %s", ipaddr, clientpath);
       rec_to_client.msg_type = restore_fail;
       sprintf(rec_to_client.body, "Failed to restore %s", clientpath);
@@ -790 +753 @@
   else
     {
-      sprintf(tmp, "%s - restored %s ok", ipaddr, clientpath);
-      log_it(info, tmp);
+      log_it(info, "%s - restored %s ok", ipaddr, clientpath);
       rec_to_client.msg_type = restore_ok;
       sprintf(rec_to_client.body, "%s - restored ok", clientpath);
@@ -798 +760 @@
   if (send_msg_to_client(&rec_to_client, ipaddr, port, &socket_fd))
     {
-      sprintf(tmp, "Unable to notify %s of restore success/failure", ipaddr);
-      log_it(error, tmp);
+      log_it(error, "Unable to notify %s of restore success/failure", ipaddr);
       i = find_client_in_clientlist(ipaddr);
       if (i>=0) { forcibly_logout_client(i); }
@@ -830 +791 @@
 struct sockaddr_in sin;
 int  s;
-char tmp[MAX_STR_LEN+1];
 if ((hp = gethostbyname(clientIP)) == NULL)
 {
-sprintf(tmp, "send_msg_to_client: %s: unknown host", clientIP);
-log_it(error, tmp);
+log_it(error, "send_msg_to_client: %s: unknown host", clientIP);
 return(1);
 }
@@ -845 +804 @@
 { perror("socket"); log_it(error, "send_msg_to_client: SOCKET error"); return(1); }
 if (connect(s, (struct sockaddr*)&sin, sizeof(struct sockaddr_in)) < 0)
-{ sprintf(tmp, "Failed to connect to client %s on port %d", clientIP, port); log_it(error, tmp); return(1); }
+{ log_it(error, "Failed to connect to client %s on port %d", clientIP, port); return(1); }
 send(s, (char*)rec, sizeof(struct s_server2client_msg_record), 0);
 if (psocket) { *psocket=s; } else { close(s); }
-sprintf(tmp, "Sent %s msg [%s] to %s (port %d)", tmsg_to_string(rec->msg_type), rec->body, clientIP, port);
-log_it(debug, tmp);
+log_it(debug, "Sent %s msg [%s] to %s (port %d)", tmsg_to_string(rec->msg_type), rec->body, clientIP, port);
 return(0);
 }
@@ -883 +841 @@
       usleep(50000);
     }
-  sprintf(tmp, "Now monitoring ports %d thru %d for requests from clients.", 8700, 8700+NOOF_THREADS-1);
-  log_it(info, tmp);
+  log_it(info, "Now monitoring ports %d thru %d for requests from clients.", 8700, 8700+NOOF_THREADS-1);
 }
 
@@ -950 +907 @@
   int watch_port;
   struct sockaddr_in sin;
-  char buf[MAX_STR_LEN+1], tmp[MAX_STR_LEN+1];
+  char buf[MAX_STR_LEN+1];
   int len, s, new_s;
   struct s_client2server_msg_record rec;
@@ -962 +919 @@
   if ((s = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
     {
-      sprintf(tmp, "Unable to open socket on port #%d", watch_port);
-      log_it(error, tmp);
+      log_it(error, "Unable to open socket on port #%d", watch_port);
       return((void*)-1);
     }
   if (bind(s, (struct sockaddr*)&sin, sizeof(sin)) < 0)
     {
-      sprintf(tmp, "Cannot bind %d - %s\n", watch_port, strerror(errno));
-      log_it(error, tmp);
+      log_it(error, "Cannot bind %d - %s\n", watch_port, strerror(errno));
       return((void*)-1);
     }
   if (listen(s, MAX_PENDING) < 0)
     {
-      sprintf(tmp, "Cannot setup listen (%d) - %s\n", watch_port, strerror(errno));
-      log_it(error, tmp);
+      log_it(error, "Cannot setup listen (%d) - %s\n", watch_port, strerror(errno));
       return((void*)-1);
     }
   /* service incoming connections */
-  sprintf(tmp, "Bound port #%d OK", watch_port);
-  log_it(debug, tmp);
+  log_it(debug, "Bound port #%d OK", watch_port);
   while(true)
     {
@@ -1016 +969 @@
   pthread_t server_status_thread;
 
+  parse_options(argc, argv);
+
   log_it(info, "---------- Monitas (server) by Hugo Rabson ----------");
   register_pid(getpid(), "server");
   set_signals(true);
   start_threads_to_watch_ports_for_requests();
-  pthread_create(&server_status_thread, NULL, generate_server_status_file_regularly, (void*)SERVER_STATUS_FILE);
-  create_and_watch_fifo_for_commands(SERVER_COMDEV);
+  pthread_create(&server_status_thread, NULL, generate_server_status_file_regularly, (void*)g->server_status_file);
+  create_and_watch_fifo_for_commands(g->server_comdev);
   log_it(warn, "Execution should never reach this point");
   exit(0);

branches/stable/monitas/structs.h

@@ -1 +1 @@
 /* structs.h 
 
+07/17
+- add central global struct
 
 06/16
-- added CLIENT_RCFILE
+- added CLIENT_RCFILE [moved to common.c on 07/17]
 - added .bodyAux to msg record structure
 
 06/14
-- added SERVER_COMDEV and CLIENT_COMDEV
+- added SERVER_COMDEV and CLIENT_COMDEV [moved to common.c on 07/17]
 
 06/11
@@ -45 +47 @@
 
 
-#define log_it(x,y) { log_it_SUB(g_logfile,x,y); }
+/* moved to common.c :
 #define CLIENT_RCFILE "/root/.monitas-client.rc"
 #define CLIENT_COMDEV "/var/spool/monitas/client-input.dev"
 #define SERVER_COMDEV "/var/spool/monitas/server-input.dev"
 #define SERVER_STATUS_FILE "/var/spool/monitas/server-status.txt"
+*/
 #define MAX_STR_LEN 510
 #define MAX_PENDING 8 /* silently limited to 5 by BSD, says a Linux manual */
@@ -56 +59 @@
 #define XFER_BUF_SIZE 16384 /* for sending archives between client and server */
                             /* NB: 32768 doesn't work; don't ask me why */
+
 typedef enum { false=0, true=1} bool;
 typedef enum { unused=0, login, logout, ping, pong, login_ok, logout_ok, 
@@ -63 +67 @@
                 begin_stream, end_stream, user_req, progress_rpt } t_msg;
 typedef enum { debug, info, warn, error, fatal } t_loglevel;
+
+
+//#define log_it(x,y) { log_it_SUB(g_logfile,x,y); }
+#ifndef __XSTR
+#   define __XSTR(x) _XSTR(x)
+#   define _XSTR(x) #x
+#endif
+#define log_it(lvl,msg,args...) { logToFile(g->logfile,lvl,__FILE__,__XSTR(__LINE__),__FUNCTION__,msg , ## args); }
+extern void logToFile(char *logfile, t_loglevel level, char *filename, char *lineno, char *funcname, char *sz_message, ...);
+
+
+/*
+ * Global structure for all data that doesn't change at runtime.
+ * The data may be modified at program start via command line options,
+ * or -not implemented yet- via environment variables or server-client
+ * communication.
+ */
+struct s_globaldata
+{
+    char *client_rcfile;        // path+name of client's rc file
+    char *client_comdev;        // path+name of client's
+    char *server_comdev;        // path+name of server's
+    char *server_status_file;   // path+name of server's
+
+    char *logfile;              // path+name of logfile
+    t_loglevel loglevel;        // lowest level of msg written in the logfile
+};
+/*
+ * there is one (1) global instance of above struct [defined in common.c] and
+ * one global pointer [also in common.c] to address the struct inside all functions.
+ * The pointer is declared here as external to permit the global access.
+ */
+extern struct s_globaldata *g;
+
+