[BACK]Return to tcpf.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / io

Diff for /OpenXM_contrib2/asir2000/io/tcpf.c between version 1.10 and 1.13

version 1.10, 2000/08/21 08:31:39 version 1.13, 2000/09/25 04:33:37
Line 23 
Line 23 
  * shall be made on your publication or presentation in any form of the   * shall be made on your publication or presentation in any form of the
  * results obtained by use of the SOFTWARE.   * results obtained by use of the SOFTWARE.
  * (4) In the event that you modify the SOFTWARE, you shall notify FLL by   * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
  * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification   * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
  * for such modification or the source code of the modified part of the   * for such modification or the source code of the modified part of the
  * SOFTWARE.   * SOFTWARE.
  *   *
Line 44 
Line 44 
  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY   * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.9 2000/07/14 08:26:40 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.12 2000/09/23 00:57:44 noro Exp $
 */  */
 #if INET  #if INET
 #include "ca.h"  #include "ca.h"
Line 352  Q *rp;
Line 352  Q *rp;
         /* client mode */          /* client mode */
         cn = get_iofp(cs,cport_str,0);          cn = get_iofp(cs,cport_str,0);
         sn = get_iofp(ss,sport_str,0);          sn = get_iofp(ss,sport_str,0);
           /* get_iofp returns -1 if the laucher could not spawn the server */
           if ( sn < 0 ) {
                   /* we should terminate the launcher */
                   ox_send_cmd(cn,SM_shutdown); ox_flush_stream_force(cn);
                   STOQ(-1,*rp);
                   return;
           }
   
         /* register server to the server list */          /* register server to the server list */
         ind = register_server(use_unix,cn,sn);          ind = register_server(use_unix,cn,sn);
Line 441  Q *rp;
Line 448  Q *rp;
         /* client mode */          /* client mode */
         cn = get_iofp(cs,control_port_str,0);          cn = get_iofp(cs,control_port_str,0);
         sn = get_iofp(ss,server_port_str,0);          sn = get_iofp(ss,server_port_str,0);
           /* get_iofp returns -1 if the laucher could not spawn the server */
           if ( sn < 0 ) {
                   /* we should terminate the launcher */
                   ox_send_cmd(cn,SM_shutdown); ox_flush_stream_force(cn);
                   STOQ(-1,*rp);
                   return;
           }
   
         /* register server to the server list */          /* register server to the server list */
         ind = register_server(use_unix,cn,sn);          ind = register_server(use_unix,cn,sn);
Line 472  char *control_port_str,*server_port_str;
Line 486  char *control_port_str,*server_port_str;
         char cmd[BUFSIZ];          char cmd[BUFSIZ];
         char localhost[BUFSIZ];          char localhost[BUFSIZ];
         char *dname,*conn_str,*rsh;          char *dname,*conn_str,*rsh;
           char dname_str[BUFSIZ];
   
         dname = use_x ? (char *)getenv("DISPLAY") : 0;          dname = use_x ? (char *)getenv("DISPLAY") : 0;
         conn_str = conn_to_serv ? "1" : "0";          conn_str = conn_to_serv ? "1" : "0";
         rsh = use_ssh ? "ssh" : RSH;          rsh = getenv("ASIR_RSH");
           if ( !rsh )
                   rsh = use_ssh ? "ssh" : RSH;
           if ( !use_unix && dname && strstr(rsh,"ssh") ) {
                   /*
                    * if "ssh" is used to invoke a remote server,
                    * we should not specify "-display".
                    */
                   use_ssh = 1;
           }
         gethostname(localhost,BUFSIZ);          gethostname(localhost,BUFSIZ);
 #if !defined(VISUAL)  #if !defined(VISUAL)
         if ( use_unix ) {          if ( use_unix ) {
                 if ( !fork() ) {                  if ( !fork() ) {
                         setpgid(0,getpid());                          setpgid(0,getpid());
                         if ( dname )                          if ( dname )
                                 execlp("xterm","xterm","-name",OX_XTERM,"-display",dname,                                  execlp("xterm","xterm","-name",OX_XTERM,"-T","ox_launch:local","-display",dname,
                                         "-geometry","60x10","-e",launcher,".",conn_str,                                          "-geometry","60x10","-e",launcher,".",conn_str,
                                         control_port_str,server_port_str,server,dname,0);                                          control_port_str,server_port_str,server,dname,0);
                         else                          else
Line 493  char *control_port_str,*server_port_str;
Line 517  char *control_port_str,*server_port_str;
                 /* special support for java */                  /* special support for java */
                 if ( dname )                  if ( dname )
                         sprintf(cmd,                          sprintf(cmd,
                                 "%s -n %s \"(cd %s; xterm -name %s -display %s -geometry 60x10 -e java %s -host %s -control %s -data %s)>&/dev/null&\">/dev/null",                                  "%s -n %s \"(cd %s; xterm -name %s %s -geometry 60x10 -e java %s -host %s -control %s -data %s)>&/dev/null&\">/dev/null",
                                 rsh,host,launcher,OX_XTERM,dname,server,localhost,control_port_str,server_port_str);                                  rsh,host,launcher,OX_XTERM,dname,server,localhost,control_port_str,server_port_str);
                 else                  else
                         sprintf(cmd,                          sprintf(cmd,
Line 507  char *control_port_str,*server_port_str;
Line 531  char *control_port_str,*server_port_str;
 #endif /* VISUAL */  #endif /* VISUAL */
         {          {
                 if ( dname )                  if ( dname )
                           if ( use_ssh )
                         sprintf(cmd,                          sprintf(cmd,
                                 "%s -n %s \"xterm -name %s -display %s -geometry 60x10 -e %s %s %s %s %s %s %s>&/dev/null&\">/dev/null",  "%s -f -n %s \"xterm -name %s -title ox_launch:%s -geometry 60x10 -e %s %s %s %s %s %s %s>&/dev/null\">/dev/null",
                                 rsh,host,OX_XTERM,dname,launcher,localhost,conn_str,                                  rsh,host,OX_XTERM,host,launcher,localhost,conn_str,
                                   control_port_str,server_port_str,server,"1");
                           else
                           sprintf(cmd,
   "%s -n %s \"xterm -name %s -title ox_launch:%s -display %s -geometry 60x10 -e %s %s %s %s %s %s %s>&/dev/null&\">/dev/null",
                                   rsh,host,OX_XTERM,host,dname,launcher,localhost,conn_str,
                                 control_port_str,server_port_str,server,dname);                                  control_port_str,server_port_str,server,dname);
                 else                  else
                         sprintf(cmd,                          sprintf(cmd,
                                 "%s -n %s \"%s %s %s %s %s %s %s>&/dev/null&\">/dev/null",  "%s -n %s \"%s %s %s %s %s %s %s>&/dev/null&\">/dev/null",
                                 rsh,host,launcher,localhost,conn_str,                                  rsh,host,launcher,localhost,conn_str,
                                 control_port_str,server_port_str,server,"0");                                  control_port_str,server_port_str,server,"0");
                 system(cmd);                  system(cmd);
Legend:
Removed from v.1.10  
changed lines
  Added in v.1.13
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>