X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fnetconf-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fimpl%2FNetconfServerSessionNegotiator.java;h=1b4dfff42baeb0423597af3c90168592db146724;hp=91555861dc4aaaa51fdfd69dd24ae9bb834f02e7;hb=aeabf761ca043e41eeca6333bc9deb94b1de9ed0;hpb=aa186fdb5e8950f06824cf907aaad96e8cbed93e

diff --git a/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/NetconfServerSessionNegotiator.java b/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/NetconfServerSessionNegotiator.java
index 91555861dc..1b4dfff42b 100644
--- a/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/NetconfServerSessionNegotiator.java
+++ b/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/NetconfServerSessionNegotiator.java
@@ -8,86 +8,48 @@
 
 package org.opendaylight.controller.netconf.impl;
 
-import com.google.common.base.Optional;
-import io.netty.channel.Channel;
-import io.netty.util.Timer;
-import io.netty.util.concurrent.Promise;
-import org.opendaylight.controller.netconf.api.NetconfMessage;
+import java.net.InetSocketAddress;
+
 import org.opendaylight.controller.netconf.api.NetconfServerSessionPreferences;
-import org.opendaylight.controller.netconf.impl.util.AdditionalHeaderUtil;
 import org.opendaylight.controller.netconf.util.AbstractNetconfSessionNegotiator;
-import org.opendaylight.protocol.framework.SessionListener;
+import org.opendaylight.controller.netconf.util.messages.NetconfHelloMessage;
+import org.opendaylight.controller.netconf.util.messages.NetconfHelloMessageAdditionalHeader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.net.InetSocketAddress;
+import com.google.common.base.Optional;
+
+import io.netty.channel.Channel;
+import io.netty.util.Timer;
+import io.netty.util.concurrent.Promise;
 
 public class NetconfServerSessionNegotiator extends
-        AbstractNetconfSessionNegotiator<NetconfServerSessionPreferences, NetconfServerSession> {
+        AbstractNetconfSessionNegotiator<NetconfServerSessionPreferences, NetconfServerSession, NetconfServerSessionListener> {
 
     static final Logger logger = LoggerFactory.getLogger(NetconfServerSessionNegotiator.class);
 
     protected NetconfServerSessionNegotiator(NetconfServerSessionPreferences sessionPreferences,
-            Promise<NetconfServerSession> promise, Channel channel, Timer timer, SessionListener sessionListener,
+            Promise<NetconfServerSession> promise, Channel channel, Timer timer, NetconfServerSessionListener sessionListener,
             long connectionTimeoutMillis) {
         super(sessionPreferences, promise, channel, timer, sessionListener, connectionTimeoutMillis);
     }
 
     @Override
-    protected NetconfServerSession getSession(SessionListener sessionListener, Channel channel, NetconfMessage message) {
-        Optional<String> additionalHeader = message.getAdditionalHeader();
+    protected NetconfServerSession getSession(NetconfServerSessionListener sessionListener, Channel channel, NetconfHelloMessage message) {
+        Optional<NetconfHelloMessageAdditionalHeader> additionalHeader = message.getAdditionalHeader();
 
-        AdditionalHeader parsedHeader;
+        NetconfHelloMessageAdditionalHeader parsedHeader;
         if (additionalHeader.isPresent()) {
-            parsedHeader = AdditionalHeaderUtil.fromString(additionalHeader.get());
+            parsedHeader = additionalHeader.get();
         } else {
-            parsedHeader = new AdditionalHeader("unknown", ((InetSocketAddress)channel.localAddress()).getHostString(),
+            InetSocketAddress inetSocketAddress = (InetSocketAddress) channel.localAddress();
+            parsedHeader = new NetconfHelloMessageAdditionalHeader("unknown", inetSocketAddress.getHostString(), Integer.toString(inetSocketAddress.getPort()),
                     "tcp", "client");
         }
+
         logger.debug("Additional header from hello parsed as {} from {}", parsedHeader, additionalHeader);
 
         return new NetconfServerSession(sessionListener, channel, sessionPreferences.getSessionId(), parsedHeader);
     }
 
-    public static class AdditionalHeader {
-
-        private final String username;
-        private final String address;
-        private final String transport;
-        private final String sessionIdentifier;
-
-        public AdditionalHeader(String userName, String hostAddress, String transport, String sessionIdentifier) {
-            this.address = hostAddress;
-            this.username = userName;
-            this.transport = transport;
-            this.sessionIdentifier = sessionIdentifier;
-        }
-
-        String getUsername() {
-            return username;
-        }
-
-        String getAddress() {
-            return address;
-        }
-
-        String getTransport() {
-            return transport;
-        }
-
-        String getSessionType() {
-            return sessionIdentifier;
-        }
-
-        @Override
-        public String toString() {
-            final StringBuffer sb = new StringBuffer("AdditionalHeader{");
-            sb.append("username='").append(username).append('\'');
-            sb.append(", address='").append(address).append('\'');
-            sb.append(", transport='").append(transport).append('\'');
-            sb.append('}');
-            return sb.toString();
-        }
-    }
-
-}
+   }