Changeset f9fbc76

Timestamp:

Jul 24, 2018 4:26:40 PM (21 months ago)

Author:

meeh <meeh@…>

Branches:

master

Children:

7338282b

Parents:

2ee1a21

Message:

Code changes:

• Port check to see if i2p is already running.
• All buttons in the menu should work now.
• Rewrote some C++ to Objective-C, which fits better with the integration.
• Misc cleanup.
• Made the launch of router repeatable.

Location:

launchers/macosx/obj-cpp

Files:

• AppDelegate.h (modified) (8 diffs)
• Info.plist (modified) (1 diff)
• PidWatcher.h (modified) (2 diffs)
• RouterTask.h (modified) (5 diffs)
• RouterTask.mm (modified) (4 diffs)
• StatusItemButton.h (modified) (1 diff)
• main.mm (modified) (19 diffs)
• portcheck.h (added)

launchers/macosx/obj-cpp/AppDelegate.h

@@ -8 +8 @@
 #include <Cocoa/Cocoa.h>
 
+#include "RouterTask.h"
 #include "StatusItemButton.h"
 #include "JavaHelper.h"
-#include "RouterTask.h"
 #include "neither/maybe.hpp"
 #include "optional.hpp"
@@ -27 +27 @@
 using namespace neither;
 
-using maybeAnRouterRunner = std::experimental::optional<RouterTask*>;
+@class ExtractMetaInfo;
+using maybeAnRouterRunner = std::experimental::optional<I2PRouterTask*>;
 
+std::vector<std::string> buildClassPath(std::string basePath);
 
 extern JvmListSharedPtr gRawJvmList;
@@ -35 +37 @@
 static std::mutex globalRouterStatusMutex;
 static maybeAnRouterRunner globalRouterStatus = maybeAnRouterRunner{};
+static bool isRuterRunning = false;
 
 maybeAnRouterRunner getGlobalRouterObject();
-void setGlobalRouterObject(RouterTask* newRouter);
+void setGlobalRouterObject(I2PRouterTask* newRouter);
+bool getGlobalRouterIsRunning();
+void setGlobalRouterIsRunning(bool running);
 
-@class ExtractMetaInfo;
 @interface ExtractMetaInfo : NSObject
-@property (strong) NSString* i2pBase;
-@property (strong) NSString* javaBinary;
-@property (strong) NSString* zipFile;
-@property (strong) NSString* jarFile;
+@property (copy) NSString* i2pBase;
+@property (copy) NSString* javaBinary;
+@property (copy) NSString* zipFile;
+@property (copy) NSString* jarFile;
+@end
+
+@class I2PStatusMenu;
+@interface I2PStatusMenu : NSMenu
+- (BOOL)validateMenuItem:(NSMenuItem *)menuItem;
 @end
 
@@ -69 +78 @@
 }
 
+inline std::string getDefaultBaseDir()
+{
+  // Figure out base directory
+  const char* pathFromHome = "/Users/%s/Library/I2P";
+  auto username = getenv("USER");
+  char buffer[strlen(pathFromHome)+strlen(username)];
+  sprintf(buffer, pathFromHome, username);
+  std::string i2pBaseDir(buffer);
+  return i2pBaseDir;
+}
+
 @interface MenuBarCtrl : NSObject <StatusItemButtonDelegate, NSMenuDelegate>
 @property BOOL enableLogging;
 @property BOOL enableVerboseLogging;
-@property (strong) NSMenu *menu;
+@property (strong) I2PStatusMenu *menu;
 @property (strong) StatusItemButton* statusBarButton;
 @property (strong) NSUserDefaults *userPreferences;
@@ -82 +102 @@
 - (void) statusBarImageBtnClicked;
 - (void) btnPressedAction:(id)sender;
-- (void) menuWillOpen:(NSMenu *)menu;
+- (void) menuWillOpen:(I2PStatusMenu *)menu;
 
 - (void) openRouterConsoleBtnHandler: (NSMenuItem *) menuItem;
@@ -92 +112 @@
 - (MenuBarCtrl *) init;
 - (void) dealloc;
-- (NSMenu *) createStatusBarMenu;
+- (I2PStatusMenu *) createStatusBarMenu;
 @end
 
@@ -107 +127 @@
 @property BOOL enableLogging;
 @property BOOL enableVerboseLogging;
+@property ExtractMetaInfo *metaInfo;
 @property (copy) NSImage *contentImage NS_AVAILABLE(10_9, NA);
-- (void)extractI2PBaseDir:(ExtractMetaInfo *)metaInfo completion:(void(^)(BOOL success, NSError *error))completion;
-- (void)startupI2PRouter:(ExtractMetaInfo *)metaInfo;
+- (void)extractI2PBaseDir:(void(^)(BOOL success, NSError *error))completion;
+- (void)startupI2PRouter;
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification;
 - (void)applicationWillTerminate:(NSNotification *)aNotification;
@@ -121 +142 @@
 
 
-/*
-
-
-@implementation CNSStatusBarCtrl
--(id)initWithSysTray:(I2PCtrlSysIcon *)sys
-{
-  self = [super init];
-  if (self) {
-    item = [[[NSStatusBar systemStatusBar] statusItemWithLength:NSSquareStatusItemLength] retain];
-    menu = 0;
-    systray = sys;
-    imageCell = [[NSImageView alloc] initWithParent:self];
-    [item setView: imageCell];
-    [item setHidden: NO];
-    CFShow(CFSTR("CNSStatusBarCtrl::initWithSysTray executed"));
-  }
-  return self;
-}
--(NSStatusItem*)item {
-    return item;
-}
--(void)dealloc {
-  [[NSStatusBar systemStatusBar] removeStatusItem:item];
-  [[NSNotificationCenter defaultCenter] removeObserver:imageCell];
-  [imageCell release];
-  [item release];
-  [super dealloc];
-}
-@end
-
-
-class CSystemTrayIcon
-{
-public:
-  CSystemTrayIcon(I2PCtrlSysIcon *sys)
-  {
-    item = [[CNSStatusBarCtrl alloc] initWithSysTray:sys];
-    [[NSUserNotificationCenter defaultUserNotificationCenter] setDelegate:item];
-    const int menuHeight = [[NSStatusBar systemStatusBar] thickness];
-    printf("menuHeight: %d\n", menuHeight);
-    [[[item item] view] setHidden: NO];
-  }
-  ~CSystemTrayIcon()
-  {
-    [[[item item] view] setHidden: YES];
-    [[NSUserNotificationCenter defaultUserNotificationCenter] setDelegate:nil];
-    [item release];
-  }
-  CNSStatusBarCtrl *item;
-};
-*/
-
-
 #endif

launchers/macosx/obj-cpp/Info.plist

@@ -12 +12 @@
         <string>0.9.35-experimental</string>
         <key>CFBundleIconFile</key>
-        <string>i2p</string>
+        <string>images/AppIcon.icns</string>
         <key>CFBundleIdentifier</key>
         <string>net.i2p.launcher</string>

launchers/macosx/obj-cpp/PidWatcher.h

@@ -4 +4 @@
 #include <unistd.h>
 #include <sys/event.h>
-#include <functional>
 
 #include "neither/either.hpp"
@@ -11 +10 @@
 using callbackType = void (CFFileDescriptorRef, CFOptionFlags, void *);
 using HandleFunction = std::function<void(int)>;
-/*
-class CallbackWrapper
-{
-    CallbackWrapper(HandleFunction func) : mCallback(func);
-    void operator(CFFileDescriptorRef fdref, CFOptionFlags callBackTypes, void *info) {
-        struct kevent kev;
-        int fd = CFFileDescriptorGetNativeDescriptor(fdref);
-        kevent(fd, NULL, 0, &kev, 1, NULL);
-        // take action on death of process here
-        NSLog(@"process with pid '%u' died\n", (unsigned int)kev.ident);
-
-        mCallback(0);
-        CFFileDescriptorInvalidate(fdref);
-        CFRelease(fdref);
-    }
-
-private:
-    HandleFunction mCallback;
-};
-*/
 
 static void noteProcDeath(CFFileDescriptorRef fdref, CFOptionFlags callBackTypes, void *info) {

launchers/macosx/obj-cpp/RouterTask.h

@@ -15 +15 @@
 
 @class RTaskOptions;
-
 @interface RTaskOptions : NSObject
 @property (strong) NSString* binPath;
@@ -22 +21 @@
 @end
 
-@class RouterTask;
-
-@interface RouterTask : NSObject
+@class I2PRouterTask;
+@interface I2PRouterTask : NSObject
 @property (strong) NSTask* routerTask;
 @property (strong) NSUserDefaults *userPreferences;
@@ -31 +29 @@
 @property (strong) NSPipe *processPipe;
 @property (strong) NSFileHandle *input;
+@property (atomic) BOOL isRouterRunning;
 @property (atomic) BOOL userRequestedRestart;
 - (instancetype) initWithOptions : (RTaskOptions*) options;
@@ -38 +37 @@
 - (BOOL) isRunning;
 - (int) getPID;
+- (void)routerStdoutData:(NSNotification *)notification;
 @end
 
@@ -48 +48 @@
 typedef std::function<void(void)> fp_t;
 typedef std::function<void(JavaRunner *ptr)> fp_proc_t;
+
+
 
 /**

launchers/macosx/obj-cpp/RouterTask.mm

@@ -14 +14 @@
 @end
 
-@implementation RouterTask
+@implementation I2PRouterTask
 
+
+- (void)routerStdoutData:(NSNotification *)notification
+{
+    NSLog(@"%@", [[NSString alloc] initWithData:[notification.object availableData] encoding:NSUTF8StringEncoding]);
+    [notification.object waitForDataInBackgroundAndNotify];
+}
 
 - (instancetype) initWithOptions : (RTaskOptions*) options
 {
-    self.userRequestedRestart = FALSE;
+    self.userRequestedRestart = NO;
+    self.isRouterRunning = NO;
     self.input = [NSFileHandle fileHandleWithStandardInput];
     self.routerTask = [NSTask new];
@@ -31 +38 @@
     [self.routerTask setStandardOutput:self.processPipe];
         [self.routerTask setStandardError:self.processPipe];
+
+    NSFileHandle *stdoutFileHandle = [self.processPipe fileHandleForReading];
+    [[NSNotificationCenter defaultCenter] addObserver:self
+        selector:@selector(routerStdoutData:)
+        name:NSFileHandleDataAvailableNotification
+        object:stdoutFileHandle];
+
+    [stdoutFileHandle waitForDataInBackgroundAndNotify];
+
     [self.routerTask setTerminationHandler:^(NSTask* task) {
         NSLog(@"termHandler triggered!");
+        NSBundle *launcherBundle = [NSBundle mainBundle];
+        auto iconImage = [launcherBundle pathForResource:@"ItoopieTransparent" ofType:@"png"];
+        sendUserNotification(APP_IDSTR, @"I2P Router has stopped", [NSImage imageNamed:iconImage]);
+        // Cleanup
+        self.isRouterRunning = NO;
     }];
 /*
@@ -54 +75 @@
 - (void) requestRestart
 {
-    self.userRequestedRestart = TRUE;
+    self.userRequestedRestart = YES;
+    kill([self.routerTask processIdentifier], SIGHUP);
 }
 
@@ -64 +86 @@
 - (int) execute
 {
-    //@try {
+    @try {
         [self.routerTask launch];
         watchPid([self.routerTask processIdentifier]);
-        [self.input waitForDataInBackgroundAndNotify];
-        [[self.processPipe fileHandleForReading] waitForDataInBackgroundAndNotify];
-        [[NSNotificationCenter defaultCenter] addObserverForName:NSFileHandleDataAvailableNotification
-                                                          object:[self.processPipe fileHandleForReading] queue:nil
-                                                      usingBlock:^(NSNotification *note)
-         {
-             // Read from shell output
-             NSData *outData = [[self.processPipe fileHandleForReading] availableData];
-             NSString *outStr = [[NSString alloc] initWithData:outData encoding:NSUTF8StringEncoding];
-             if ([outStr length] > 1) {
-                 NSLog(@"output: %@", outStr);
-             }
-
-             // Continue waiting for shell output.
-             [[self.processPipe fileHandleForReading] waitForDataInBackgroundAndNotify];
-         }];
-         //[self.routerTask waitUntilExit];
-        //NSThread *thr = [[NSThread alloc] initWithTarget:self.routerTask selector:@selector(launch) object:nil];
-        //[self.routerTask waitUntilExit];
+        self.isRouterRunning = YES;
         return 1;
-    /*}
+    }
     @catch (NSException *e)
         {
                 NSLog(@"Expection occurred %@", [e reason]);
         return 0;
-        }*/
+        }
 }
 

launchers/macosx/obj-cpp/StatusItemButton.h

@@ -3 +3 @@
 #import <Cocoa/Cocoa.h>
 
+/**
+ *
+ * This is a class representing the "image" in the systray.
+ *
+ *
+ * **/
 @class StatusItemButton;
 

launchers/macosx/obj-cpp/main.mm

@@ -31 +31 @@
 #include "fn.h"
 #include "optional.hpp"
+#include "portcheck.h"
 
 #define debug(format, ...) CFShow([NSString stringWithFormat:format, ## __VA_ARGS__]);
@@ -43 +44 @@
 @end
 
+std::vector<std::string> buildClassPath(std::string basePath)
+{
+    return globVector(basePath+std::string("/lib/*.jar"));
+}
 
 maybeAnRouterRunner getGlobalRouterObject()
@@ -50 +55 @@
 }
 
-void setGlobalRouterObject(RouterTask* newRouter)
+void setGlobalRouterObject(I2PRouterTask* newRouter)
 {
     std::lock_guard<std::mutex> lock(globalRouterStatusMutex);
@@ -56 +61 @@
 }
 
+
+pthread_mutex_t mutex;
+
+bool getGlobalRouterIsRunning()
+{
+    pthread_mutex_lock(&mutex);
+    bool current = isRuterRunning;
+    pthread_mutex_unlock(&mutex);
+    return current;
+}
+void setGlobalRouterIsRunning(bool running)
+{
+    pthread_mutex_lock(&mutex);
+    isRuterRunning = running;
+    pthread_mutex_unlock(&mutex);
+}
+
 std::future<int> startupRouter(NSString* javaBin, NSArray<NSString*>* arguments, NSString* i2pBaseDir) {
-/*
-  NSLog(@"Arguments: %@", [NSString stringWithUTF8String:arguments.c_str()]);
-  auto launchLambda = [](JavaRunner *javaRun) {
-    javaRun->javaProcess->start_process();
-    auto pid = javaRun->javaProcess->pid();
-    std::cout << "I2P Router process id = " << pid << std::endl;
-
-    // Blocking
-    javaRun->javaProcess->wait();
-  };
-  auto callbackAfterExit = [](){
-    printf("Callback after exit\n");
-  };
-  NSLog(@"Still fine!");
-
-  setGlobalRouterObject(new JavaRunner{ javaBin, arguments, i2pBaseDir, std::move(launchLambda), std::move(callbackAfterExit) });
-
-  NSLog(@"Still fine!");
-  return std::async(std::launch::async, [&]{
-      getGlobalRouterObject().value()->execute();
-      return 0;
-    });
-*/
-    //CFShow(arguments);
-
     @try {
         RTaskOptions* options = [RTaskOptions alloc];
@@ -87 +84 @@
         options.arguments = arguments;
         options.i2pBaseDir = i2pBaseDir;
-        auto instance = [[[RouterTask alloc] initWithOptions: options] autorelease];
+        auto instance = [[[I2PRouterTask alloc] initWithOptions: options] autorelease];
         setGlobalRouterObject(instance);
         //NSThread *thr = [[NSThread alloc] initWithTarget:instance selector:@selector(execute) object:nil];
@@ -113 +110 @@
 }
 
+@implementation I2PStatusMenu
+
+- (BOOL)validateMenuItem:(NSMenuItem *)item
+{
+  NSLog(@"item is: %@",item);
+  return YES;
+}
+
+@end
 
 @implementation MenuBarCtrl
@@ -149 +155 @@
 {
   NSLog(@"Clicked startJavaRouterBtnHandler");
+  AppDelegate *appDelegate = (AppDelegate *)[[NSApplication sharedApplication] delegate];
+  [appDelegate startupI2PRouter];
 }
 
@@ -211 +219 @@
 }
 
-- (NSMenu *)createStatusBarMenu
-{
-  NSMenu *menu = [[NSMenu alloc] init];
+- (I2PStatusMenu *)createStatusBarMenu
+{
+  I2PStatusMenu *menu = [[I2PStatusMenu alloc] init];
   [menu setAutoenablesItems:NO];
 
@@ -272 +280 @@
 @implementation AppDelegate
 
-- (void)extractI2PBaseDir:(ExtractMetaInfo *)metaInfo completion:(void(^)(BOOL success, NSError *error))completion
-{
-  std::string basePath([metaInfo.i2pBase UTF8String]);
-  NSParameterAssert(metaInfo.i2pBase);
+- (void)extractI2PBaseDir:(void(^)(BOOL success, NSError *error))completion
+{
+  std::string basePath([self.metaInfo.i2pBase UTF8String]);
+  NSParameterAssert(self.metaInfo.i2pBase);
   NSError *error = NULL;
   BOOL success;
@@ -287 +295 @@
 
     std::string zippath("-Di2p.base.zip=");
-    zippath += [metaInfo.zipFile UTF8String];
+    zippath += [self.metaInfo.zipFile UTF8String];
 
     std::string jarfile("-cp ");
-    jarfile += [metaInfo.jarFile UTF8String];
+    jarfile += [self.metaInfo.jarFile UTF8String];
 
     // Create directory
@@ -306 +314 @@
 
     //auto charCli = map(cli, [](std::string str){ return str.c_str(); });
-    std::string execStr = [metaInfo.javaBinary UTF8String];
+    std::string execStr = [self.metaInfo.javaBinary UTF8String];
     for_each(cli, [&execStr](std::string str){ execStr += std::string(" ") + str; });
 
@@ -338 +346 @@
 }
 
-- (void)startupI2PRouter:(ExtractMetaInfo *)metaInfo
-{
-  std::string basePath([metaInfo.i2pBase UTF8String]);
-  auto buildClassPath = [](std::string basePath) -> std::vector<std::string> {
-      return globVector(basePath+std::string("/lib/*.jar"));
-  };
-    // Expect base to be extracted by now.
-
-    // Get paths
-    NSBundle *launcherBundle = [NSBundle mainBundle];
+- (void)startupI2PRouter
+{
+  std::string basePath([self.metaInfo.i2pBase UTF8String]);
+
+  // Get paths
+  NSBundle *launcherBundle = [NSBundle mainBundle];
   auto jarList = buildClassPath(basePath);
   std::string classpathStrHead = "-classpath";
@@ -372 +376 @@
     argList.push_back([NSString stringWithUTF8String:classpathStr.c_str()]);
     argList.push_back(@"net.i2p.router.Router");
-    auto javaBin = std::string([metaInfo.javaBinary UTF8String]);
+    auto javaBin = std::string([self.metaInfo.javaBinary UTF8String]);
 
 
     sendUserNotification(APP_IDSTR, @"I2P Router is starting up!", self.contentImage);
-    auto nsJavaBin = metaInfo.javaBinary;
-    auto nsBasePath = metaInfo.i2pBase;
+    auto nsJavaBin = self.metaInfo.javaBinary;
+    auto nsBasePath = self.metaInfo.i2pBase;
     NSArray* arrArguments = [NSArray arrayWithObjects:&argList[0] count:argList.size()];
     startupRouter(nsJavaBin, arrArguments, nsBasePath);
@@ -435 +439 @@
     @"enableLogging": @true,
     @"enableVerboseLogging": @true,
-    @"autoStartRouter": @true
+    @"autoStartRouter": @true,
+    @"i2pBaseDirectory": (NSString *)CFStringCreateWithCString(NULL, const_cast<const char *>(getDefaultBaseDir().c_str()), kCFStringEncodingUTF8)
   }];
   if (self.enableVerboseLogging) NSLog(@"Default JVM home preference set to: %@", (NSString *)cfDefaultHome);
@@ -469 +474 @@
   [NSApp setActivationPolicy:NSApplicationActivationPolicyAccessory];
   [NSApp activateIgnoringOtherApps:YES];
-  //auto prefArray = CFPreferencesCopyKeyList(CFAPPDOMAIN, kCFPreferencesCurrentUser, kCFPreferencesCurrentHost);
-  //CFShow(prefArray);
   auto javaHomePref = [self.userPreferences stringForKey:@"javaHome"];
   if (self.enableVerboseLogging) NSLog(@"Java home from preferences: %@", javaHomePref);
 
-
   // This is the only GUI the user experience on a regular basis.
   self.menuBarCtrl = [[MenuBarCtrl alloc] init];
@@ -483 +485 @@
   NSLog(@"We should have started the statusbar object by now...");
 
-  // Figure out base directory
-  const char* pathFromHome = "/Users/%s/Library/I2P";
-  auto username = getenv("USER");
-  char buffer[strlen(pathFromHome)+strlen(username)];
-  sprintf(buffer, pathFromHome, username);
-  std::string i2pBaseDir(buffer);
-  if (self.enableVerboseLogging) printf("Home directory is: %s\n", buffer);
+  std::string i2pBaseDir(getDefaultBaseDir());
+  //if (self.enableVerboseLogging) printf("Home directory is: %s\n", buffer);
 
 
@@ -500 +497 @@
   self.menuBarCtrl.enableVerboseLogging = self.enableVerboseLogging;
 
+
+
+  if (port_check() != 0)
+  {
+    NSLog(@"Seems i2p is already running - I will not start the router (port 7657 is in use..)");
+    return;
+  }
+
   if (self.enableVerboseLogging) NSLog(@"processinfo %@", [[NSProcessInfo processInfo] arguments]);
 
-  auto getJavaHomeLambda = [&pref,&self]() -> std::string {
-      NSString* val = @"";
-      val = [pref stringForKey:@"javaHome"];
-      if (val == NULL) val = @"";
-      if (self.enableVerboseLogging) NSLog(@"Javahome: %@", val);
-      return std::string([val UTF8String]);;
-  };
-
-  auto getJavaBin = [&getJavaHomeLambda]() -> std::string {
-      // Get Java home
-    auto javaHome = getJavaHomeLambda();
+  auto getJavaBin = [&pref,&self]() -> std::string {
+    // Get Java home
+    NSString* val = @"";
+    val = [pref stringForKey:@"javaHome"];
+    if (val == NULL) val = @"";
+    if (self.enableVerboseLogging) NSLog(@"Javahome: %@", val);
+    auto javaHome = std::string([val UTF8String]);
     trim(javaHome); // Trim to remove endline
     auto javaBin = std::string(javaHome);
@@ -519 +520 @@
   };
 
-  auto buildClassPath = [](std::string basePath) -> std::vector<std::string> {
-      return globVector(basePath+std::string("/lib/*.jar"));
-  };
-
-
-  auto metaInfo = [ExtractMetaInfo alloc];
-  metaInfo.i2pBase = [NSString stringWithUTF8String:buffer];
-  metaInfo.javaBinary = [NSString stringWithUTF8String:getJavaBin().c_str()];
-  metaInfo.jarFile = [launcherBundle pathForResource:@"launcher" ofType:@"jar"];
-  metaInfo.zipFile = [launcherBundle pathForResource:@"base" ofType:@"zip"];
+
+  self.metaInfo = [[ExtractMetaInfo alloc] init];
+  self.metaInfo.i2pBase = [NSString stringWithUTF8String:i2pBaseDir.c_str()];
+  self.metaInfo.javaBinary = [NSString stringWithUTF8String:getJavaBin().c_str()];
+  self.metaInfo.jarFile = [launcherBundle pathForResource:@"launcher" ofType:@"jar"];
+  self.metaInfo.zipFile = [launcherBundle pathForResource:@"base" ofType:@"zip"];
 
   std::string basearg("-Di2p.dir.base=");
@@ -534 +531 @@
 
   std::string jarfile("-cp ");
-  jarfile += [metaInfo.zipFile UTF8String];
+  jarfile += [self.metaInfo.zipFile UTF8String];
 
   struct stat sb;
-  if ( !(stat(buffer, &sb) == 0 && S_ISDIR(sb.st_mode)) )
+  if ( !(stat(i2pBaseDir.c_str(), &sb) == 0 && S_ISDIR(sb.st_mode)) )
   {
     // I2P is not extracted.
     if (self.enableVerboseLogging) NSLog(@"I2P Directory don't exists!");
 
-    [self extractI2PBaseDir: metaInfo completion:^(BOOL success, NSError *error) {
+    [self extractI2PBaseDir:^(BOOL success, NSError *error) {
         //__typeof__(self) strongSelf = weakSelf;
         //if (strongSelf == nil) return;
-        [self startupI2PRouter:metaInfo];
+        [self startupI2PRouter];
     }];
 
   } else {
       if (self.enableVerboseLogging) NSLog(@"I2P directory found!");
-      [self startupI2PRouter:metaInfo];
+      [self startupI2PRouter];
   }