===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/oxmain.c,v
retrieving revision 1.21
retrieving revision 1.29
diff -u -p -r1.21 -r1.29
--- OpenXM/src/kxx/oxmain.c	2005/02/28 12:53:44	1.21
+++ OpenXM/src/kxx/oxmain.c	2016/09/26 11:43:38	1.29
@@ -1,4 +1,12 @@
-/*  $OpenXM: OpenXM/src/kxx/oxmain.c,v 1.20 2004/09/17 12:32:11 takayama Exp $  */
+/*  $OpenXM: OpenXM/src/kxx/oxmain.c,v 1.28 2016/08/27 00:11:27 takayama Exp $  */
+/*  Note on IntelMac. [2006.06.05]
+    SIGINT does not seem to be blocked on the rosetta emulator of ppc
+    on the IntelMac's. "ox" should be universal binary.
+   A dirty hack to generate a universal binary of ox is as follows.
+   (1) Add -arch ppc -arch i386 to CFLAGS in src/kxx/Makefile
+       and src/kan96xx/plugin/Makefile
+   (2) Build ox
+*/
 /* nullserver01 */
 #include <stdio.h>
 #include <fcntl.h>
@@ -6,6 +14,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,11 +42,13 @@ int Quiet = 0;
 int LocalMode = 1;
 int NotifyPortnumber = 0;
 int Do_not_use_control_stream_to_tell_no_server = 1;
+int IgnoreSIGINT = 1;
+int Ox_protocol_1999 = 0;
 static void errorToStartEngine(void);
 static int findOxServer(char *server);
 static void couldNotFind(char *s);
 /*  gcc -v -c hoge.c */
-static void mywait();
+static void mywait(int m);
 
 void *sGC_malloc(int n) {
   return (void *)malloc(n);
@@ -60,9 +71,13 @@ 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 */
+  int sighup[]={SIGHUP,-1};
+  block_signal(sighup);  /* ignore x of xterm */
   strcpy(sname,"localhost");
   strcpy(ServerName,SERVERNAME);
   i = 1;
@@ -119,6 +134,21 @@ 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) {
+        sscanf(argv[i],"%d",&IgnoreSIGINT);
+      }
+    }else if (strcmp(argv[i],"-protocol_1999") == 0) {
+      Ox_protocol_1999=1;
     }else {
       fprintf(stderr,"Unknown option %s.\n",argv[i]);
       oxmainUsage(); exit(10);
@@ -148,7 +178,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);
@@ -289,7 +334,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");
@@ -325,9 +371,10 @@ parentServerMain(int fdControl, int fdStream) {
   int message = 1;
   int controlByteOrder;
   extern OxTerminateMode;
-  extern void myServerExit();
+  extern void myServerExit(int m);
 
-  signal(SIGCHLD,mywait);
+  int sigchld[]={SIGCHLD,-1};
+  unblock_signal(sigchld);
   if (OxTerminateMode) {
 	/*
 	  OxTerminateMode cannot be used if you run ox by xterm -exec ox ...
@@ -343,8 +390,11 @@ parentServerMain(int fdControl, int fdStream) {
   /* Set the network byte order. */
   fprintf(stderr,"controlByteOrder=%x\n",controlByteOrder);
 
-
-  signal(SIGINT,myServerExit);
+  /*  int sigint[]={SIGINT,-1};
+  set_signal(sigint[0],myServerExit);
+  unblock_signal(sigint);
+  */
+  mysignal(SIGINT,SIG_IGN);
   while(1) {
     mtag = oxfdGetOXheader(fdControl,&SerialCurrentControl);
     /* get the message_tag */
@@ -354,28 +404,32 @@ parentServerMain(int fdControl, int fdStream) {
     switch( id ) {
     case SM_control_kill:
       if (message) printf("[control] control_kill\n");
-      oxSendResultOfControl(fdControl);
+      /* oxSendResultOfControl(fdControl); */
       sleep(2);
-      myServerExit();
+      myServerExit(0);
       break;
     case SM_control_reset_connection:
       if (message) printf("[control] control_reset_connection.\n");
       if (message) printf("Sending the SIGUSR1 signal to %d:  ",MyServerPid);
       r=kill(MyServerPid,SIGUSR1);
       if (message) printf("Result = %d\n",r);
+      if (Ox_protocol_1999) {
+	if (message) printf("[obsolete protocol of ox-rfc-100 in 1999] Sending the result packet to the control channel.\n",r);
+        oxSendResultOfControlInt32(fdControl,0); 
+      }
       fflush(NULL);
       /*      oxSendResultOfControlInt32(fdControl,0); */
       break;
     default:
       fprintf(stderr,"[control] Unknown control message.\n");
       fprintf(stderr,"Shutdown the server.");
-      myServerExit();
+      myServerExit(0);
       break;
     }
   }
 }
 
-void myServerExit() {
+void myServerExit(int m) {
   printf("Sending the kill signal to the child.\n");
   kill(MyServerPid,SIGKILL);
   exit(0);
@@ -383,6 +437,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);  
@@ -422,7 +477,17 @@ 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);
+  }
 
+  //  int sigint[]={SIGINT,-1};
+  //  if (IgnoreSIGINT) { block_signal(sigint); fprintf(stderr,"SIGING\n");}
+  if (IgnoreSIGINT) { mysignal(SIGINT,SIG_IGN); fprintf(stderr,"SIG_ING\n");}
+
   if (PacketMonitor) {
     if (execle(ServerName,ServerName,"-monitor",NULL,environ)) {
       fprintf(stderr,"%s cannot be executed with -monitor.\n",ServerName);
@@ -484,7 +549,7 @@ static void couldNotFind(char *s) {
 }
 
 
-static void mywait() {
+static void mywait(int m) {
   int status;
   int pid;
   int i,j;