Changeset 862 for branches/prototype-v0/zoo-project/zoo-kernel/sshapi.c

Timestamp:

Feb 1, 2018, 11:27:28 AM (6 years ago)

Author:

djay

Message:

Add the capability to publish heatmap or any templated mapfile using the epecific msInclude and msLayer keys for an output. For MapServer? published output, define 4096 as the default maxsize and use pixel width or height for raster files. use the correct MapServer? imagemode depending on GDALGetRasterDataType (MS_IMAGEMODE_BYTE for GDT_Byte, MS_IMAGEMODE_INT16 for GDT_Int16 and MS_IMAGEMODE_FLOAT32 for GDT_Float32). Create a text file (.maps) listing every mapfiles created for a MapServer? published output (or inputs) using saveMapNames function. Fixes in ulinet, use uuid for naming temporary files. Add dialect input to the ogr2ogr service. Use the .maps file for removing a file from the DeleteData? service

File:

• branches/prototype-v0/zoo-project/zoo-kernel/sshapi.c (modified) (11 diffs)

branches/prototype-v0/zoo-project/zoo-kernel/sshapi.c

@@ -205 +205 @@
     return NULL;
 
-  libssh2_session_set_blocking(result->session, 0);
+  libssh2_session_set_blocking(result->session, 1);
 
   while ((rc = libssh2_session_handshake(result->session, result->sock_id))
@@ -418 +418 @@
  */
 int ssh_fetch(maps* conf,const char* localPath,const char* targetPath,int cnt){
-  char mem[1024];
   size_t nread;
   size_t memuse=0;
@@ -436 +435 @@
     if (!sessions[cnt]->sftp_session &&
         (libssh2_session_last_errno(sessions[cnt]->session) != LIBSSH2_ERROR_EAGAIN)) {
-      
       fprintf(stderr, "Unable to init SFTP session\n");
       return -1;
@@ -452 +450 @@
       }
       else {
-        //non-blocking open
         waitsocket(sessions[cnt]->sock_id, sessions[cnt]->session); 
       }
     }
+    if(!sftp_handle)
+      zSleep(100);
   } while (!sftp_handle);
  
@@ -461 +460 @@
   do {
     do {
-      rc = libssh2_sftp_read(sftp_handle, mem, sizeof(mem));
-      /*fprintf(stderr, "libssh2_sftp_read returned %d\n",
-        rc);*/
+      char* mem=(char*)malloc(16*1024*1024);
+      rc = libssh2_sftp_read(sftp_handle, mem,16*1024*1024);
       if(rc > 0) {
-        //write(2, mem, rc);
         fwrite(mem, rc, 1, local);
       }
+      free(mem);
     } while (rc > 0);
     
@@ -585 +583 @@
  */
 bool ssh_close_session(maps* conf,SSHCON* con){
+  if(con==NULL)
+    return true;
   while (libssh2_session_disconnect(con->session, "Normal Shutdown, Thank you for using the ZOO-Project sshapi")
          == LIBSSH2_ERROR_EAGAIN);
@@ -593 +593 @@
 #endif
   libssh2_session_free(con->session);
+  con=NULL;
   return true;
 }
@@ -639 +640 @@
                      getMapArray(input->content,"targetPath",i)};
 
-        setMapArray(queueMaps->content,"input",queueIndex,input->name);
-        setMapArray(queueMaps->content,"localPath",queueIndex,tmp[0]->value);
-        setMapArray(queueMaps->content,"targetPath",queueIndex,tmp[1]->value);
-        queueIndex+=1;
+        setMapArray(queueMaps->content,"input",queueIndex+i,input->name);
+        setMapArray(queueMaps->content,"localPath",queueIndex+i,tmp[0]->value);
+        setMapArray(queueMaps->content,"targetPath",queueIndex+i,tmp[1]->value);
+
       }
     }
   }
-#ifdef SSH_DEBUG  
-  fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
-  fflush(stderr);
-  dumpMaps(queueMaps);
-  fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
-  fflush(stderr);
-  dumpMaps(*conf);
-  fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
-  fflush(stderr);
-#endif
   return true;
 }
@@ -664 +655 @@
     return false;
   }
-#ifdef SSH_DEBUG
-  fprintf(stderr,"*** %s %d\n",__FILE__,__LINE__);
-  fflush(stderr);
-  dumpMaps(getMaps(*conf,"uploadQueue"));
-  fprintf(stderr,"*** %s %d\n",__FILE__,__LINE__);
-  fflush(stderr);
-#endif
   map* queueLengthMap=getMapFromMaps(*conf,"uploadQueue","length");
   maps* queueMaps=getMaps(*conf,"uploadQueue");
@@ -682 +666 @@
         getMapArray(queueMaps->content,"targetPath",i)
       };
-#ifdef SSH_DEBUG      
-      fprintf(stderr,"*** %s %d %s %s\n",__FILE__,__LINE__,argv[1]->value,argv[2]->value);
-#endif      
       /**/zooLock* lck;
       if((lck=lockFile(*conf,argv[1]->value,'w'))!=NULL){/**/
@@ -703 +684 @@
     }    
   }
+  while (libssh2_session_disconnect(test->session, "Normal Shutdown, Thank you for using the ZOO-Project sshapi")
+         == LIBSSH2_ERROR_EAGAIN);
+#ifdef WIN32
+  closesocket(test->sock_id);
+#else
+  close(test->sock_id);
+#endif
+  libssh2_session_free(test->session);
+  free(test);
+  test=NULL;
+  sessions[ssh_get_cnt(*conf)-1]=NULL;
+  maps* tmp=getMaps(*conf,"lenv");
+  addIntToMap(tmp->content,"nb_sessions",ssh_get_cnt(*conf)-1);  
+
   return true; 
 }