Changeset 353 in MondoRescue for branches/stable/monitas/client.c

Timestamp:

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

Author:

bcornec

Message:

monitas latest version

File:

• branches/stable/monitas/client.c (modified) (9 diffs)

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