===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/oxmain.c,v
retrieving revision 1.20
retrieving revision 1.24
diff -u -p -r1.20 -r1.24
--- OpenXM/src/kxx/oxmain.c	2004/09/17 12:32:11	1.20
+++ OpenXM/src/kxx/oxmain.c	2006/06/05 00:25:50	1.24
@@ -1,4 +1,4 @@
-/*  $OpenXM: OpenXM/src/kxx/oxmain.c,v 1.19 2004/09/17 08:46:10 takayama Exp $  */
+/*  $OpenXM: OpenXM/src/kxx/oxmain.c,v 1.23 2006/02/25 09:11:10 takayama Exp $  */
 /* nullserver01 */
 #include <stdio.h>
 #include <fcntl.h>
@@ -6,6 +6,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>
+#include <sys/resource.h>
 #include <netinet/in.h>
 #include <netdb.h>
 #include <signal.h>
@@ -33,10 +34,12 @@ int Quiet = 0;
 int LocalMode = 1;
 int NotifyPortnumber = 0;
 int Do_not_use_control_stream_to_tell_no_server = 1;
+int IgnoreSIGINT = 1;
 static void errorToStartEngine(void);
 static int findOxServer(char *server);
 static void couldNotFind(char *s);
 /*  gcc -v -c hoge.c */
+static void mywait();
 
 void *sGC_malloc(int n) {
   return (void *)malloc(n);
@@ -59,6 +62,9 @@ main(int argc, char *argv[]) {
   char *passData = NULL;
   int result;
   int sleepingTime = 0;
+  int authEncoding=0;
+  FILE *fp;
+  char *stmp;
   extern int OxTerminateMode;
 
   signal(SIGHUP,SIG_IGN);  /* ignore x of xterm */
@@ -118,6 +124,19 @@ main(int argc, char *argv[]) {
       if (i<argc) {
         sscanf(argv[i],"%d",&sleepingTime);
       }
+    }else if (strcmp(argv[i],"-authEncoding") == 0) {
+      i++;
+      if (strcmp(argv[i],"file") == 0) {
+        authEncoding = 1;
+      }else{
+        fprintf(stderr,"Unknown -authEncoding %s.\n",argv[i]);
+        oxmainUsage(); exit(10);
+      }
+    }else if (strcmp(argv[i],"-ignoreSIGINT") == 0) {
+      i++;
+      if (i<argc) {
+        IgnoreSIGINT = argv[i];
+      }
     }else {
       fprintf(stderr,"Unknown option %s.\n",argv[i]);
       oxmainUsage(); exit(10);
@@ -147,7 +166,22 @@ main(int argc, char *argv[]) {
   }
 
   /* Decrypt passControl and passData, here. Lookup cryptmethod. */
+  if (authEncoding == 1) {
+	stmp = (char *)sGC_malloc(strlen(getenv("HOME"))+strlen(passControl)+
+							  strlen(passData)+128);
+	sprintf(stmp,"%s/.openxm/tmp.opt/%s",(char *)getenv("HOME"),passControl);
+	fp = fopen(stmp,"r");
+	if (fp == NULL) { fprintf(stderr,"passControl file %s is not found.\n",stmp); exit(1);}
+	fgets(stmp,127,fp); passControl = stmp; fclose(fp);
 
+	stmp = (char *)sGC_malloc(strlen(getenv("HOME"))+strlen(passControl)+
+							  strlen(passData)+128);
+	sprintf(stmp,"%s/.openxm/tmp.opt/%s",(char *)getenv("HOME"),passData);
+	fp = fopen(stmp,"r");
+	if (fp == NULL) { fprintf(stderr,"passData file %s is not found.\n",stmp); exit(1);}
+	fgets(stmp,127,fp); passData = stmp; fclose(fp);
+  }
+
   if (reverse) {
     /* The order is very important. */
     fdControl = socketConnectWithPass(sname,portControl,passControl);
@@ -288,7 +322,8 @@ oxmainUsage() {
   fprintf(stderr,"Usage: \n");
   fprintf(stderr,"  ox [-ox serverprogram -host name -data portnum -control portnum -monitor]\n");
   fprintf(stderr," [-insecure -portfile fname -reverse -passControl xxxyyyzzz -passData pppqqqrrr]");
-  fprintf(stderr," [-finish]");
+  fprintf(stderr," [-finish]  [-wait seconds] [-authEncoding [file]]");
+  fprintf(stderr," [-ignoreSIGINT [1|0]]");
   fprintf(stderr,"\n");
   fprintf(stderr,"-reverse: ox server connects to the client.\n");
   fprintf(stderr,"          The client must give a one time password to ox server to connect to the client with -pass* option.\n");
@@ -326,6 +361,7 @@ parentServerMain(int fdControl, int fdStream) {
   extern OxTerminateMode;
   extern void myServerExit();
 
+  signal(SIGCHLD,mywait);
   if (OxTerminateMode) {
 	/*
 	  OxTerminateMode cannot be used if you run ox by xterm -exec ox ...
@@ -381,6 +417,7 @@ void myServerExit() {
 
 childServerMain(int fdControl, int fdStream) {
   int i;
+  struct rlimit res;
   close(fdControl);   /* close(0); dup(fdStream); */
   dup2(fdStream,3);
   dup2(fdStream,4);  
@@ -420,7 +457,15 @@ childServerMain(int fdControl, int fdStream) {
 	  putenv(s);
 	}
   }
+  getrlimit(RLIMIT_STACK,&res);
+  if (res.rlim_cur < 65536000) {
+    fprintf(stderr,"RLIMIT_STACK is increased to 65Mbytes by setrlimit.\n");
+	res.rlim_cur = 65536000;
+	setrlimit(RLIMIT_STACK,&res);
+  }
 
+  if (IgnoreSIGINT) signal(SIGINT, SIG_IGN);
+
   if (PacketMonitor) {
     if (execle(ServerName,ServerName,"-monitor",NULL,environ)) {
       fprintf(stderr,"%s cannot be executed with -monitor.\n",ServerName);
@@ -482,5 +527,16 @@ static void couldNotFind(char *s) {
 }
 
 
+static void mywait() {
+  int status;
+  int pid;
+  int i,j;
+  /* signal(SIGCHLD,SIG_IGN); */
+  pid = wait(&status);
+  fprintf(stderr,"Control: child process %d is exiting.\n",pid);
+  fprintf(stderr,"Control: Shutting down the control server.\n");
+  sleep(2);
+  exit(0);
+}