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=0dd79e2723c32034df26c79583c83bdbe117a793;hp=5c389fa966af340ef277f5d51ebe992b2c6081ff;hb=304dec89fd7a13b42e821ca51b08bca93d7dc540;hpb=7f0272398ce3dab7ceddd998c7bb510df3b28838

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 5c389fa966..0dd79e2723 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
@@ -10,44 +10,98 @@ package org.opendaylight.controller.netconf.impl;
 
 import com.google.common.base.Optional;
 import io.netty.channel.Channel;
+import io.netty.channel.local.LocalAddress;
 import io.netty.util.Timer;
 import io.netty.util.concurrent.Promise;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.util.AbstractMap;
+import java.util.Map;
+import org.opendaylight.controller.netconf.api.NetconfDocumentedException;
 import org.opendaylight.controller.netconf.api.NetconfServerSessionPreferences;
-import org.opendaylight.controller.netconf.util.AbstractNetconfSessionNegotiator;
+import org.opendaylight.controller.netconf.nettyutil.AbstractNetconfSessionNegotiator;
 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;
-
-public class NetconfServerSessionNegotiator extends
+public class NetconfServerSessionNegotiator
+        extends
         AbstractNetconfSessionNegotiator<NetconfServerSessionPreferences, NetconfServerSession, NetconfServerSessionListener> {
 
-    static final Logger logger = LoggerFactory.getLogger(NetconfServerSessionNegotiator.class);
+    private static final Logger LOG = LoggerFactory.getLogger(NetconfServerSessionNegotiator.class);
 
-    protected NetconfServerSessionNegotiator(NetconfServerSessionPreferences sessionPreferences,
-            Promise<NetconfServerSession> promise, Channel channel, Timer timer, NetconfServerSessionListener sessionListener,
+    private static final String UNKNOWN = "unknown";
+
+    protected NetconfServerSessionNegotiator(
+            NetconfServerSessionPreferences sessionPreferences,
+            Promise<NetconfServerSession> promise, Channel channel,
+            Timer timer, NetconfServerSessionListener sessionListener,
             long connectionTimeoutMillis) {
-        super(sessionPreferences, promise, channel, timer, sessionListener, connectionTimeoutMillis);
+        super(sessionPreferences, promise, channel, timer, sessionListener,
+                connectionTimeoutMillis);
+    }
+
+    @Override
+    protected void handleMessage(NetconfHelloMessage netconfMessage)
+            throws NetconfDocumentedException {
+        NetconfServerSession session = getSessionForHelloMessage(netconfMessage);
+        replaceHelloMessageInboundHandler(session);
+        // Negotiation successful after all non hello messages were processed
+        negotiationSuccessful(session);
     }
 
     @Override
-    protected NetconfServerSession getSession(NetconfServerSessionListener sessionListener, Channel channel, NetconfHelloMessage message) {
-        Optional<NetconfHelloMessageAdditionalHeader> additionalHeader = message.getAdditionalHeader();
+    protected NetconfServerSession getSession(
+            NetconfServerSessionListener sessionListener, Channel channel,
+            NetconfHelloMessage message) {
+        Optional<NetconfHelloMessageAdditionalHeader> additionalHeader = message
+                .getAdditionalHeader();
 
         NetconfHelloMessageAdditionalHeader parsedHeader;
         if (additionalHeader.isPresent()) {
             parsedHeader = additionalHeader.get();
         } else {
-            InetSocketAddress inetSocketAddress = (InetSocketAddress) channel.localAddress();
-            parsedHeader = new NetconfHelloMessageAdditionalHeader("unknown", inetSocketAddress.getHostString(), Integer.toString(inetSocketAddress.getPort()),
-                    "tcp", "client");
+
+            parsedHeader = new NetconfHelloMessageAdditionalHeader(UNKNOWN,
+                    getHostName(channel.localAddress()).getValue(),
+                    getHostName(channel.localAddress()).getKey(), "tcp",
+                    "client");
+
         }
 
-        logger.debug("Additional header from hello parsed as {} from {}", parsedHeader, additionalHeader);
+        LOG.debug("Additional header from hello parsed as {} from {}",
+                parsedHeader, additionalHeader);
+
+        return new NetconfServerSession(sessionListener, channel,
+                getSessionPreferences().getSessionId(), parsedHeader);
+    }
+
+    /**
+     * @param socketAddress
+     *            type of socket address LocalAddress, or
+     *            InetSocketAddress, for others returns unknown
+     * @return Map<port, host > two values - port and host of socket address
+     */
+    protected static Map.Entry<String, String> getHostName(
+            SocketAddress socketAddress) {
+
+        if (socketAddress instanceof InetSocketAddress) {
+
+            InetSocketAddress inetSocketAddress = (InetSocketAddress) socketAddress;
+
+            return new AbstractMap.SimpleImmutableEntry<>(
+                    Integer.toString(inetSocketAddress.getPort()),
+                    inetSocketAddress.getHostString());
+
+        } else if (socketAddress instanceof LocalAddress) {
+
+            return new AbstractMap.SimpleImmutableEntry<>(UNKNOWN,
+                    ((LocalAddress) socketAddress).id());
+
+        }
+        return new AbstractMap.SimpleImmutableEntry<>(UNKNOWN, UNKNOWN);
 
-        return new NetconfServerSession(sessionListener, channel, getSessionPreferences().getSessionId(), parsedHeader);
     }
 
 }