Changeset 6c88eb5 for apps

Timestamp:

May 3, 2018 8:00:03 PM (2 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

c734b84

Parents:

7b2355a8

Message:

BOB: Register with port mapper

File:

• apps/BOB/src/net/i2p/BOB/BOB.java (modified) (7 diffs)

apps/BOB/src/net/i2p/BOB/BOB.java

@@ -39 +39 @@
 import net.i2p.client.I2PClient;
 import net.i2p.util.I2PAppThread;
+import net.i2p.util.PortMapper;
 import net.i2p.util.SimpleTimer2;
 
@@ -132 +133 @@
         // private static int maxConnections = 0;
 
+        private final I2PAppContext _context;
         private final Logger _log;
         private final ClientAppManager _mgr;
@@ -159 +161 @@
          */
         public BOB(I2PAppContext context, ClientAppManager mgr, String[] args) {
+                _context = context;
                 // If we were run from command line, log to stdout
                 boolean logToStdout = false;
@@ -219 +222 @@
                         File cfg = new File(configLocation);
                         if (!cfg.isAbsolute()) {
-                                cfg = new File(I2PAppContext.getGlobalContext().getConfigDir(), configLocation);
+                                cfg = new File(_context.getConfigDir(), configLocation);
                         }
                         FileInputStream fi = null;
@@ -276 +279 @@
                         File cfg = new File(configLocation);
                         if (!cfg.isAbsolute()) {
-                                cfg = new File(I2PAppContext.getGlobalContext().getConfigDir(), configLocation);
+                                cfg = new File(_context.getConfigDir(), configLocation);
                         }
                         FileOutputStream fo = null;
@@ -317 +320 @@
                 if (_mgr != null)
                         _mgr.register(this);
+                _context.portMapper().register(PortMapper.SVC_BOB, props.getProperty(PROP_BOB_HOST),
+                                               Integer.parseInt(props.getProperty(PROP_BOB_PORT)));
 
                 int i = 0;
@@ -354 +359 @@
                 } finally {
                         _log.info("BOB is now shutting down...");
+                        _context.portMapper().unregister(PortMapper.SVC_BOB);
                         // Clean up everything.
                         try {