Sfoglia il codice sorgente

Added bonjourName property

Pierre-Olivier Latour 11 anni fa
parent
commit
9392ddadb6
2 ha cambiato i file con 6 aggiunte e 1 eliminazioni
  1. 1 0
      CGDWebServer/GCDWebServer.h
  2. 5 1
      CGDWebServer/GCDWebServer.m

+ 1 - 0
CGDWebServer/GCDWebServer.h

@@ -41,6 +41,7 @@ typedef GCDWebServerResponse* (^GCDWebServerProcessBlock)(GCDWebServerRequest* r
 }
 @property(nonatomic, readonly, getter=isRunning) BOOL running;
 @property(nonatomic, readonly) NSUInteger port;
+@property(nonatomic, readonly) NSString* bonjourName;  // Only non-nil if Bonjour registration is active
 - (void)addHandlerWithMatchBlock:(GCDWebServerMatchBlock)matchBlock processBlock:(GCDWebServerProcessBlock)processBlock;
 - (void)removeAllHandlers;
 

+ 5 - 1
CGDWebServer/GCDWebServer.m

@@ -145,6 +145,10 @@ static void _SignalHandler(int signal) {
   ARC_DEALLOC(super);
 }
 
+- (NSString*)bonjourName {
+  return _service ? ARC_BRIDGE_RELEASE(CFStringCreateCopy(kCFAllocatorDefault, CFNetServiceGetName(_service))) : nil;
+}
+
 - (void)addHandlerWithMatchBlock:(GCDWebServerMatchBlock)matchBlock processBlock:(GCDWebServerProcessBlock)handlerBlock {
   DCHECK(_source == NULL);
   GCDWebServerHandler* handler = [[GCDWebServerHandler alloc] initWithMatchBlock:matchBlock processBlock:handlerBlock];
@@ -166,7 +170,7 @@ static void _NetServiceClientCallBack(CFNetServiceRef service, CFStreamError* er
     if (error->error) {
       LOG_ERROR(@"Bonjour error %i (domain %i)", error->error, (int)error->domain);
     } else {
-      LOG_VERBOSE(@"Registered Bonjour service \"%@\" with type '%@' on port %i", CFNetServiceGetName(service), CFNetServiceGetType(service), CFNetServiceGetPortNumber(service));
+      LOG_VERBOSE(@"Registered Bonjour service \"%@\" in domain \"%@\" with type '%@' on port %i", CFNetServiceGetName(service), CFNetServiceGetDomain(service), CFNetServiceGetType(service), CFNetServiceGetPortNumber(service));
     }
   }
 }