rpc: add a possibility to autoregister RPC service

Acked-By: Paul Millar

src/org/dcache/xdr/OncRpcSvc.java

@@ -29,12 +29,17 @@ import com.sun.grizzly.TCPSelectorHandler;
 import com.sun.grizzly.UDPSelectorHandler;
 import com.sun.grizzly.util.DefaultThreadPool;
 import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import org.dcache.xdr.portmap.GenericPortmapClient;
+import org.dcache.xdr.portmap.OncPortmapClient;
+import org.dcache.xdr.portmap.OncRpcPortmap;
 
 public class OncRpcSvc {
 
@@ -42,6 +47,7 @@ public class OncRpcSvc {
 
     private final Controller _controller = new Controller();
     private final CountDownLatch _serverReady = new CountDownLatch(1);
+    private final boolean _publish;
 
     /**
      * mapping of registered programs.
@@ -55,7 +61,17 @@ public class OncRpcSvc {
      * @param port TCP/UDP port to which service will he bound.
      */
     public OncRpcSvc(int port) {
-        this(port, IpProtocolType.TCP | IpProtocolType.UDP);
+        this(port, IpProtocolType.TCP | IpProtocolType.UDP, true);
+    }
+
+    /**
+     * Create a new server. Bind to all supported protocols.
+     *
+     * @param port TCP/UDP port to which service will he bound.
+     * @param publish if true, register service by portmap
+     */
+    public OncRpcSvc(int port, boolean publish) {
+        this(port, IpProtocolType.TCP | IpProtocolType.UDP, publish);
     }
 
      /**
@@ -64,8 +80,8 @@ public class OncRpcSvc {
      * @param port TCP/UDP port to which service will he bound.
      * @param protocol to bind (tcp or udp)
      */
-    public OncRpcSvc(int port, int protocol) {
-        this(new PortRange(port), protocol);
+    public OncRpcSvc(int port, int protocol, boolean publish) {
+        this(new PortRange(port), protocol, publish);
     }
 
     /**
@@ -74,7 +90,9 @@ public class OncRpcSvc {
      * @param {@link PortRange} of TCP/UDP ports to which service will he bound.
      * @param protocol to bind (tcp or udp).
      */
-    public OncRpcSvc(PortRange portRange, int protocol) {
+    public OncRpcSvc(PortRange portRange, int protocol, boolean publish) {
+
+        _publish = publish;
 
         if( (protocol & (IpProtocolType.TCP | IpProtocolType.UDP)) == 0 ) {
             throw new IllegalArgumentException("TCP or UDP protocol have to be defined");
@@ -156,6 +174,42 @@ public class OncRpcSvc {
         _controller.setProtocolChainInstanceHandler(pciHandler);
     }
 
+    /**
+     * Register services in portmap.
+     *
+     * @throws IOException
+     * @throws UnknownHostException
+     */
+    private void publishToPortmap() throws IOException, UnknownHostException {
+
+        OncRpcClient rpcClient = new OncRpcClient(InetAddress.getLocalHost(),
+                IpProtocolType.UDP, OncRpcPortmap.PORTMAP_PORT);
+        XdrTransport transport = rpcClient.connect();
+        OncPortmapClient portmapClient = new GenericPortmapClient(transport);
+
+        try {
+            TCPSelectorHandler tcp = (TCPSelectorHandler) _controller.getSelectorHandler(Controller.Protocol.TCP);
+            UDPSelectorHandler udp = (UDPSelectorHandler) _controller.getSelectorHandler(Controller.Protocol.UDP);
+            String username = System.getProperty("user.name");
+            for (OncRpcProgram program : _programs.keySet()) {
+                try {
+                    if (tcp != null) {
+                        portmapClient.setPort(program.getNumber(), program.getVersion(),
+                                "tcp", netid.toString(tcp.getPortLowLevel()), username);
+                    }
+                    if (udp != null) {
+                        portmapClient.setPort(program.getNumber(), program.getVersion(),
+                                "udp", netid.toString(udp.getPortLowLevel()), username);
+                    }
+                } catch (OncRpcException ex) {
+                    _log.log(Level.SEVERE, "Failed to register program", ex);
+                }
+            }
+        } finally {
+            rpcClient.close();
+        }
+    }
+
     /**
      * Start service.
      */
@@ -167,6 +221,10 @@ public class OncRpcSvc {
             _log.log(Level.SEVERE, "failed to start Controller", ex);
             throw new IOException(ex.getMessage());
         }
+
+        if(_publish) {
+            publishToPortmap();
+        }
     }
 
     /**

src/org/dcache/xdr/portmap/GenericPortmapClient.java

@@ -77,8 +77,8 @@ public class GenericPortmapClient implements OncPortmapClient {
              * check for V4
              */
             portmapClient.ping();
+            portmapClient.setPort(100003, 4, "tcp", "127.0.0.2.8.4", System.getProperty("user.name"));
             portmapClient.dump();
-            portmapClient.setPort(100003, 4, "tcp", "127.0.0.2.8.4", "3750");
 
         } finally {
             rpcClient.close();

src/org/dcache/xdr/portmap/OncRpcEmbeddedPortmap.java

@@ -64,7 +64,7 @@ public class OncRpcEmbeddedPortmap {
         }
 
         if(!localPortmapperRunning) {
-            OncRpcSvc rpcbindServer = new OncRpcSvc(OncRpcPortmap.PORTMAP_PORT, IpProtocolType.UDP | IpProtocolType.TCP);
+            OncRpcSvc rpcbindServer = new OncRpcSvc(OncRpcPortmap.PORTMAP_PORT, IpProtocolType.UDP | IpProtocolType.TCP, true);
             rpcbindServer.register(new OncRpcProgram( OncRpcPortmap.PORTMAP_PROGRAMM, OncRpcPortmap.PORTMAP_V2), new OncRpcbindServer());
             rpcbindServer.start();
         }