Changeset 0f4cea in git

Timestamp:

Aug 17, 2010, 7:44:14 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

87288e357199d0d1b82ea6991972478b3f85a989

Parents:

2a9ae7e3188ddde0e95b07d8b479d8b54333e214

Message:

ssi:connect

git-svn-id: file:///usr/local/Singular/svn/trunk@13124 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/ssiLink.cc (modified) (7 diffs)

Singular/ssiLink.cc

@@ -19 +19 @@
 #include <ctype.h>   /*for isdigit*/
 #include <unistd.h>
+#include <netdb.h>
 
 
@@ -476 +477 @@
   else if (strcmp(l->mode, "fork") == 0) mode = "fork";
   else if (strcmp(l->mode, "tcp") == 0) mode = "tcp";
+  else if (strcmp(l->mode, "connect") == 0) mode = "connect";
   else mode = "a";
 
@@ -531 +533 @@
       }
     }
-    // stdin or stdout
-    else if (flag == SI_LINK_READ)
-    {
-      d->f_read = stdin;
-      mode = "r";
-    }
-    else
-    {
-      d->f_write = stdout;
-      mode = "a";
-    }
-  }
-  else
-  {
-    // tcp mode
-    if(strcmp(mode,"tcp")==0)
+    else if (strcmp(mode,"tcp")==0)
     {
       int sockfd, newsockfd, portno, clilen;
@@ -574 +561 @@
       Print("waiting on port %d\n", portno);mflush();
       listen(sockfd,5);
-      char* cli_host = (char*)omAlloc(256);
-      char* path = (char*)omAlloc(1024);
-      int r = sscanf(l->name,"%255[^:]:%s",cli_host,path);
-      if(r == 0)
-      {
-        WerrorS("ERROR: no host specified");
-        return TRUE;
-      }
-      else if(r == 1)
-      {
-        path = "Singular";
-      }
-      Print("host: %s\n",cli_host);
-      Print("path: %s\n",path);
-      Print("%d\n",r);
-      char* ssh_command = (char*)omAlloc(256);
-      char* ser_host = (char*)omAlloc(64);
-      gethostname(ser_host,64);
-      sprintf(ssh_command,"ssh %s %s --batch --link=ssi--MPhost=%s --MPport=%d &",cli_host,path,ser_host,portno);
-      system(ssh_command);
-      clilen = sizeof(cli_addr);
       newsockfd = accept(sockfd, (struct sockaddr *) &cli_addr, (socklen_t *)&clilen);
       if(newsockfd < 0)
@@ -601 +567 @@
         return TRUE;
       }
+      PrintS("client accepted\n");
       d->fd_read = newsockfd;
       d->fd_write = newsockfd;
@@ -607 +574 @@
       SI_LINK_SET_RW_OPEN_P(l);
       close(sockfd);
-      myynest=0;
-      fe_fgets_stdin=fe_fgets_dummy;
-      loop
-      {
-        leftv h=ssiRead1(l); /*contains an exit.... */
-        if (feErrors != NULL && *feErrors != '\0')
+    }
+    // stdin or stdout
+    else if (flag == SI_LINK_READ)
+    {
+      d->f_read = stdin;
+      mode = "r";
+    }
+    else
+    {
+      d->f_write = stdout;
+      mode = "a";
+    }
+  }
+  else
+  {
+    // tcp mode
+    if(strcmp(mode,"tcp")==0)
+    {
+      int sockfd, newsockfd, portno, clilen;
+      struct sockaddr_in serv_addr, cli_addr;
+      int n;
+      sockfd = socket(AF_INET, SOCK_STREAM, 0);
+      if(sockfd < 0)
+      {
+        WerrorS("ERROR opening socket");
+        return TRUE;
+      }
+      memset((char *) &serv_addr,0, sizeof(serv_addr));
+      portno = 1024;
+      serv_addr.sin_family = AF_INET;
+      serv_addr.sin_addr.s_addr = INADDR_ANY;
+      do
+      {
+        portno++;
+        serv_addr.sin_port = htons(portno);
+        if(portno > 50000)
         {
-          // handle errors:
-          PrintS(feErrors); /* currently quite simple */
-          *feErrors = '\0';
+          WerrorS("ERROR on binding (no free port available?)");
+          return TRUE;
         }
-        ssiWrite(l,h);
-        h->CleanUp();
-        omFreeBin(h, sleftv_bin);
-      }
-      /* never reached*/
+      }
+      while(bind(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0);
+      Print("waiting on port %d\n", portno);mflush();
+      listen(sockfd,5);
+      char* cli_host = (char*)omAlloc(256);
+      char* path = (char*)omAlloc(1024);
+      int r = sscanf(l->name,"%255[^:]:%s",cli_host,path);
+      if(r == 0)
+      {
+        WerrorS("ERROR: no host specified");
+        return TRUE;
+      }
+      else if(r == 1)
+      {
+        path = "Singular";
+      }
+      char* ssh_command = (char*)omAlloc(256);
+      char* ser_host = (char*)omAlloc(64);
+      gethostname(ser_host,64);
+      sprintf(ssh_command,"ssh %s %s -q --batch --link=ssi --MPhost=%s --MPport=%d &",cli_host,path,ser_host,portno);
+      system(ssh_command);
+      Print("client on %s started:%s\n",cli_host,path);
+      clilen = sizeof(cli_addr);
+      newsockfd = accept(sockfd, (struct sockaddr *) &cli_addr, (socklen_t *)&clilen);
+      if(newsockfd < 0)
+      {
+        WerrorS("ERROR on accept");
+        return TRUE;
+      }
+      PrintS("client accepted\n");
+      d->fd_read = newsockfd;
+      d->fd_write = newsockfd;
+      d->f_read = fdopen(newsockfd, "r");
+      d->f_write = fdopen(newsockfd, "w");
+      SI_LINK_SET_RW_OPEN_P(l);
+      close(sockfd);
+    }
+    else if(strcmp(mode,"connect")==0)
+    {
+      char* host = (char*)omAlloc(256);
+      int sockfd, portno, n;
+      struct sockaddr_in serv_addr;
+      struct hostent *server;
+  
+      sscanf(l->name,"%255[^:]:%d",host,&portno);
+      Print("connect to host %s, port %d\n",host,portno);mflush();
+      if (portno!=0)
+      {
+        sockfd = socket(AF_INET, SOCK_STREAM, 0);
+        if (sockfd < 0) { WerrorS("ERROR opening socket"); return TRUE; }
+        server = gethostbyname(host);
+        if (server == NULL) {  WerrorS("ERROR, no such host");  return TRUE; }
+        memset((char *) &serv_addr, 0, sizeof(serv_addr));
+        serv_addr.sin_family = AF_INET;
+        bcopy((char *)server->h_addr,
+              (char *)&serv_addr.sin_addr.s_addr,
+              server->h_length);
+        serv_addr.sin_port = htons(portno);
+        if (connect(sockfd,(sockaddr*)&serv_addr,sizeof(serv_addr)) < 0)
+        { WerrorS("ERROR connecting"); return TRUE; }
+        PrintS("connected\n");mflush();
+        d->f_read=fdopen(sockfd,"r");
+        d->fd_read=sockfd;
+        d->f_write=fdopen(sockfd,"w");
+        d->fd_write=sockfd;
+        l->data=d;
+        SI_LINK_SET_RW_OPEN_P(l);
+        omFree(host);
+      }
+      else return TRUE;
     }
     else
@@ -931 +992 @@
 /* return 0 on success, >0 else*/
 {
-  printf(host);
-  printf(port);
-  mflush();
-  return(0);
+  int sockfd, portno, n;
+  struct sockaddr_in serv_addr;
+  struct hostent *server;
+  
+  portno = atoi(port);
+  if (portno!=0)
+  {
+    sockfd = socket(AF_INET, SOCK_STREAM, 0);
+    if (sockfd < 0) { WerrorS("ERROR opening socket"); exit(0); }
+    server = gethostbyname(host);
+    if (server == NULL) {  WerrorS("ERROR, no such host");  exit(0); }
+    memset((char *) &serv_addr, 0, sizeof(serv_addr));
+    serv_addr.sin_family = AF_INET;
+    memcpy((char *)&serv_addr.sin_addr.s_addr,
+          (char *)server->h_addr,
+          server->h_length);
+    serv_addr.sin_port = htons(portno);
+    if (connect(sockfd,(sockaddr*)&serv_addr,sizeof(serv_addr)) < 0)
+    { WerrorS("ERROR connecting"); exit(0); }
+    si_link l;
+    if (slInit(l,"ssi:tcp")) WerrorS("error slInit");
+    ssiInfo *d=(ssiInfo*)omAlloc0(sizeof(ssiInfo));
+    d->f_read=fdopen(sockfd,"r");
+    d->fd_read=sockfd;
+    d->f_write=fdopen(sockfd,"w");
+    d->fd_write=sockfd;
+    l->data=d;
+    SI_LINK_SET_RW_OPEN_P(l);
+    loop
+    {
+      PrintS("start read\n");
+      leftv h=ssiRead1(l); /*contains an exit.... */
+      if (feErrors != NULL && *feErrors != '\0')
+      {
+        // handle errors:
+        PrintS(feErrors); /* currently quite simple */
+        *feErrors = '\0';
+      }
+      PrintS("start write\n");
+      ssiWrite(l,h);
+      h->CleanUp();
+      omFreeBin(h, sleftv_bin);
+    }
+    /* never reached*/
+    exit(0);
+  }
+  exit(0);
 }