improve netconf connection (#596)

* improve netconf connection --------- Co-authored-by: Christoph Schneider | GIP <[email protected]>
Xyna-Factory · Dec 4, 2023 · d3c2dde · d3c2dde
1 parent 2a92378
commit d3c2dde
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/modules/xact/connection/ssh/application.xml b/modules/xact/connection/ssh/application.xml
@@ -16,7 +16,7 @@
  * limitations under the License.
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 -->
-<Application applicationName="SSH" comment="" factoryVersion="" versionName="2.0.25" xmlVersion="1.1">
+<Application applicationName="SSH" comment="" factoryVersion="" versionName="2.0.26" xmlVersion="1.1">
   <ApplicationInfo>
     <Description Lang="DE">SSH Connections (NETCONF, Shell), Management, SFTP, SharedLibs, SFTPTrigger</Description>
     <Description Lang="EN">SSH connections (NETCONF, Shell), management, SFTP, sharedLibs, SFTPTrigger</Description>

diff --git a/...n/ssh/mdmimpl/SSHConnectionImpl/src/xact/ssh/impl/SSHConnectionInstanceOperationImpl.java b/...n/ssh/mdmimpl/SSHConnectionImpl/src/xact/ssh/impl/SSHConnectionInstanceOperationImpl.java
@@ -283,6 +283,7 @@ public Socket createSocket() throws IOException {
           s = new Socket();
         }
         s.setKeepAlive(true);
+        s.setTcpNoDelay(true);
         return s;
       }
 
@@ -346,6 +347,7 @@ public Socket createSocket(InetAddress address, int port, InetAddress localAddre
       // Client uses only socketFactory.createSocket(), sub-method will not have an effect!
       private void connectSocket(Socket s, InetSocketAddress host) throws IOException {
         s.setKeepAlive(true);
+        s.setTcpNoDelay(true);
         if (connectionTimeout > 0) {
           s.connect(host, connectionTimeout);
         } else {

diff --git a/...SSHNETCONFConnectionImpl/src/xact/ssh/impl/SSHNETCONFConnectionInstanceOperationImpl.java b/...SSHNETCONFConnectionImpl/src/xact/ssh/impl/SSHNETCONFConnectionInstanceOperationImpl.java
@@ -40,6 +40,7 @@
 import xact.connection.ManagedConnection;
 import xact.connection.ReadTimeout;
 import xact.connection.SendParameter;
+import xact.ssh.SSHMessagePayload;
 import xact.ssh.SSHNETCONFConnection;
 import xact.ssh.SSHNETCONFConnectionInstanceOperation;
 import xact.ssh.SSHNETCONFConnectionSuperProxy;
@@ -164,11 +165,20 @@ private void readObject(java.io.ObjectInputStream s) throws java.io.IOException,
     s.defaultReadObject();
   }
 
-
+  @Override
   protected ProtocolMessage createPartialProtocolMessage(String content) {
-    return null;
+    ProtocolMessage msg = new ProtocolMessage();
+    msg.setPayload(new SSHMessagePayload(content));
+    msg.setProtocolAdapterName("SSHNETCONFConnection");
+    msg.setProtocolName("NETCONF");
+    return msg;
   }
 
+  @Override
+  protected void write(byte[] bytes) throws IOException {
+      getOutputStream().write(bytes);
+      getOutputStream().flush();
+  }
 
   @Override
   public List<? extends Capability> getAllCapabilities() {

diff --git a/modules/xact/ssh/file/application.xml b/modules/xact/ssh/file/application.xml
@@ -24,7 +24,7 @@
     <RuntimeContextRequirements>
       <RuntimeContextRequirement>
         <ApplicationName>SSH</ApplicationName>
-        <VersionName>2.0.25</VersionName>
+        <VersionName>2.0.26</VersionName>
       </RuntimeContextRequirement>
      <RuntimeContextRequirement>
         <ApplicationName>FileMgmt</ApplicationName>