From cd458fa3aae1db3188fceeaf837a958d7b11ffe6 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Thu, 25 Oct 2001 23:36:06 +0000
Subject: [PATCH] Moved the default server port into the client where it is
 accessible by various entities rather than only server code.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@571 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 src/java/com/threerings/presents/client/Client.java        | 6 +++++-
 .../threerings/presents/server/net/ConnectionManager.java  | 7 ++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/java/com/threerings/presents/client/Client.java b/src/java/com/threerings/presents/client/Client.java
index ed813f853..d412d9878 100644
--- a/src/java/com/threerings/presents/client/Client.java
+++ b/src/java/com/threerings/presents/client/Client.java
@@ -1,5 +1,5 @@
 //
-// $Id: Client.java,v 1.18 2001/10/18 18:40:18 mdb Exp $
+// $Id: Client.java,v 1.19 2001/10/25 23:36:06 mdb Exp $
 
 package com.threerings.presents.client;
 
@@ -19,6 +19,10 @@ import com.threerings.presents.net.Credentials;
  */
 public class Client
 {
+    /** The default port on which the server listens for client
+     * connections. */
+    public static final int DEFAULT_SERVER_PORT = 4007;
+
     /**
      * This is used by the client to allow dobj event dispatching to take
      * place along side the activities of the rest of the application
diff --git a/src/java/com/threerings/presents/server/net/ConnectionManager.java b/src/java/com/threerings/presents/server/net/ConnectionManager.java
index b55239865..7cdb88bd6 100644
--- a/src/java/com/threerings/presents/server/net/ConnectionManager.java
+++ b/src/java/com/threerings/presents/server/net/ConnectionManager.java
@@ -1,5 +1,5 @@
 //
-// $Id: ConnectionManager.java,v 1.11 2001/10/11 04:07:53 mdb Exp $
+// $Id: ConnectionManager.java,v 1.12 2001/10/25 23:36:06 mdb Exp $
 
 package com.threerings.presents.server.net;
 
@@ -38,7 +38,7 @@ public class ConnectionManager extends LoopingThread
     public ConnectionManager (Config config, AuthManager authmgr)
         throws IOException
     {
-        _port = config.getValue(CM_PORT_KEY, DEFAULT_CM_PORT);
+        _port = config.getValue(CM_PORT_KEY, Client.DEFAULT_SERVER_PORT);
 
         // keep a handle on our authentication manager
         _authmgr = authmgr;
@@ -324,9 +324,6 @@ public class ConnectionManager extends LoopingThread
     protected static final String CM_PORT_KEY =
         PresentsServer.CONFIG_KEY + ".conmgr_port";
 
-    /** The default port on which we listen for connections. */
-    protected static final int DEFAULT_CM_PORT = 4007;
-
     /**
      * How long we wait for network events before checking our running
      * flag to see if we should still be running.