===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/oxmain.c,v
retrieving revision 1.27
retrieving revision 1.30
diff -u -p -r1.27 -r1.30
--- OpenXM/src/kxx/oxmain.c	2016/03/30 21:34:03	1.27
+++ OpenXM/src/kxx/oxmain.c	2020/10/07 07:47:23	1.30
@@ -1,4 +1,4 @@
-/*  $OpenXM: OpenXM/src/kxx/oxmain.c,v 1.26 2016/03/30 09:20:40 takayama Exp $  */
+/*  $OpenXM: OpenXM/src/kxx/oxmain.c,v 1.29 2016/09/26 11:43:38 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.
@@ -15,6 +15,7 @@
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/resource.h>
+#include <sys/wait.h>
 #include <netinet/in.h>
 #include <netdb.h>
 #include <signal.h>
@@ -26,6 +27,13 @@
 
 #define SERVERNAME "ox_sm1"
 
+void oxmainUsage();
+void parentServerMain(int fdControl, int fdStream);
+int childServerMain(int fdControl, int fdStream);
+void unlockCtrlCForOx();
+void restoreLockCtrlCForOx();
+
+
 extern char **environ;
 int OxCritical = 0;
 int OxInterruptFlag = 0;
@@ -43,6 +51,7 @@ 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);
@@ -53,7 +62,7 @@ void *sGC_malloc(int n) {
   return (void *)malloc(n);
 }
 
-main(int argc, char *argv[]) {
+void main(int argc, char *argv[]) {
   int fd;
   int size;
   char sname[1024];
@@ -146,6 +155,8 @@ main(int argc, char *argv[]) {
       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);
@@ -181,14 +192,14 @@ main(int argc, char *argv[]) {
 	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);
+	{char *rrr; rrr=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);
+	{char *rrr; rrr=fgets(stmp,127,fp);} passData = stmp; fclose(fp);
   }
 
   if (reverse) {
@@ -327,7 +338,7 @@ static void errorToStartEngine(void) {
   exit(-1);
 }
 
-oxmainUsage() {
+void 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]");
@@ -359,7 +370,7 @@ oxmainUsage() {
   fprintf(stderr,"\n");
 }
 
-parentServerMain(int fdControl, int fdStream) {
+void parentServerMain(int fdControl, int fdStream) {
   int id;
   int mtag;
   int size;
@@ -367,7 +378,7 @@ parentServerMain(int fdControl, int fdStream) {
   int r;
   int message = 1;
   int controlByteOrder;
-  extern OxTerminateMode;
+  extern int OxTerminateMode;
   extern void myServerExit(int m);
 
   int sigchld[]={SIGCHLD,-1};
@@ -387,9 +398,11 @@ parentServerMain(int fdControl, int fdStream) {
   /* Set the network byte order. */
   fprintf(stderr,"controlByteOrder=%x\n",controlByteOrder);
 
-  int sigint[]={SIGINT,-1};
+  /*  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 */
@@ -399,7 +412,7 @@ 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(0);
       break;
@@ -408,6 +421,10 @@ parentServerMain(int fdControl, int fdStream) {
       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. r=%d\n",r);
+        oxSendResultOfControlInt32(fdControl,0); 
+      }
       fflush(NULL);
       /*      oxSendResultOfControlInt32(fdControl,0); */
       break;
@@ -426,7 +443,7 @@ void myServerExit(int m) {
   exit(0);
 }
 
-childServerMain(int fdControl, int fdStream) {
+int childServerMain(int fdControl, int fdStream) {
   int i;
   struct rlimit res;
   close(fdControl);   /* close(0); dup(fdStream); */
@@ -475,8 +492,9 @@ childServerMain(int fdControl, int fdStream) {
 	setrlimit(RLIMIT_STACK,&res);
   }
 
-  int sigint[]={SIGINT,-1};
-  if (IgnoreSIGINT) { block_signal(sigint); fprintf(stderr,"SIGING\n");}
+  //  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)) {
@@ -496,8 +514,8 @@ childServerMain(int fdControl, int fdStream) {
 
 
 /* These are dummy.  It is defined in stackmachine.c */
-unlockCtrlCForOx() { ; }
-restoreLockCtrlCForOx() { ; }
+void unlockCtrlCForOx() { ; }
+void restoreLockCtrlCForOx() { ; }
 
 static int findOxServer(char *server) {
   char *p;