Ticket #2125: command line options.patch

trunk/src/xpra/scripts/config.py

@@ -586 +586 @@
                     "swap-keys"         : bool,
                     "start-new-commands": bool,
                     "proxy-start-sessions": bool,
+                    "proxy-allow-register": bool,
                     "desktop-fullscreen": bool,
                     "global-menus"      : bool,
                     "forward-xdg-open"  : bool,
@@ -623 +624 @@
                     "bind-ssl"          : list,
                     "bind-ssh"          : list,
                     "bind-rfb"          : list,
+                    "register"          : list,
                     "auth"              : list,
                     "vsock-auth"        : list,
                     "tcp-auth"          : list,
@@ -651 +653 @@
     "start-on-connect", "start-child-on-connect",
     "start-on-last-client-exit", "start-child-on-last-client-exit",
     ]
-BIND_OPTIONS = ["bind", "bind-tcp", "bind-udp", "bind-ssl", "bind-ws", "bind-wss", "bind-vsock", "bind-rfb"]
+BIND_OPTIONS = ["bind", "bind-tcp", "bind-udp", "bind-ssl", "bind-ws", "bind-wss", "bind-vsock", "bind-rfb", "register"]
 
 #keep track of the options added since v1,
 #so we can generate command lines that work with older supported versions:
@@ -979 +981 @@
                     "exit-with-client"  : False,
                     "start-new-commands": False,
                     "proxy-start-sessions": True,
+                    "proxy-allow-register": False,
                     "av-sync"           : True,
                     "exit-ssh"          : True,
                     "dbus-control"      : not WIN32 and not OSX,
@@ -1013 +1016 @@
                     "bind-ssl"          : [],
                     "bind-ssh"          : [],
                     "bind-rfb"          : [],
+                    "register"          : [],
                     "auth"              : [],
                     "vsock-auth"        : [],
                     "tcp-auth"          : [],

trunk/src/xpra/scripts/parsing.py

@@ -327 +327 @@
                       dest="proxy_start_sessions", default=defaults.proxy_start_sessions,
                       help="Allows proxy servers to start new sessions on demand."
                       +" Default: %s." % enabled_str(defaults.proxy_start_sessions))
+    group.add_option("--proxy-allow-register", action="store", metavar="yes|no",
+                      dest="proxy_allow_register", default=defaults.proxy_allow_register,
+                      help="Allows proxy servers to register new sessions. Default: %s." % enabled_str(defaults.proxy_allow_register))
     group.add_option("--dbus-launch", action="store",
                       dest="dbus_launch", metavar="CMD", default=defaults.dbus_launch,
                       help="Start the session within a dbus-launch context,"
@@ -544 +547 @@
                           help="Listen for RFB connections."
                           + " Use --rfb-auth to secure it."
                           + " You may specify this option multiple times with different host and port combinations")
+        group.add_option("--register", action="append",
+                          dest="register", default=list(defaults.register or []),
+                          metavar="[HOST]:PORT",
+                          help="Registers at proxy")
     else:
         ignore({
             "bind"      : defaults.bind,
@@ -554 +561 @@
             "bind-ssl"  : defaults.bind_ssl,
             "bind-ssh"  : defaults.bind_ssh,
             "bind-rfb"  : defaults.bind_rfb,
+            "register"  : defaults.register,
             })
     try:
         from xpra.net import vsock

trunk/src/xpra/scripts/server.py

@@ -439 +439 @@
     bind_ws  = parse_bind_ip(opts.bind_ws)
     bind_wss = parse_bind_ip(opts.bind_wss)
     bind_rfb = parse_bind_ip(opts.bind_rfb, 5900)
+    register = parse_bind_ip(opts.register)
     bind_vsock = parse_bind_vsock(opts.bind_vsock)
 
     mdns_recs = {}
@@ -469 +470 @@
             raise InitException("cannot create SSL socket, check your certificate paths (%s): %s" % (cpaths, e))
 
     min_port = int(opts.min_port)
+    def register_at_proxy(host, port):
+        log.error("register at proxy: %s:%s", host, port)
+
+
+
+
     def add_tcp_socket(socktype, host_str, iport):
         if iport!=0 and iport<min_port:
             error_cb("invalid %s port number %i (minimum value is %i)" % (socktype, iport, min_port))
@@ -539 +546 @@
     for host, iport in bind_rfb:
         add_tcp_socket("rfb", host, iport)
         add_mdns(mdns_recs, "rfb", host, iport)
+    log("register: %s", csv(register))
+    for host, iport in register:
+        register_at_proxy(host, iport)
     log("setting up vsock sockets: %s", csv(bind_vsock))
     for cid, iport in bind_vsock:
         socket = setup_vsock_socket(cid, iport)

trunk/src/xpra/server/proxy/proxy_server.py

@@ -58 +58 @@
         ServerCore.__init__(self)
         self._max_connections = MAX_CONCURRENT_CONNECTIONS
         self._start_sessions = False
+        self._allow_register = False
         self.session_type = "proxy"
         self.main_loop = None
         #proxy servers may have to connect to remote servers,
@@ -80 +81 @@
         self.video_encoders = opts.proxy_video_encoders
         self.csc_modules = opts.csc_modules
         self._start_sessions = opts.proxy_start_sessions
+        self._allow_register = opts.proxy_allow_register
         ServerCore.init(self, opts)
         #ensure we cache the platform info before intercepting SIGCHLD
         #as this will cause a fork and SIGCHLD to be emitted: