Changeset 4842

Timestamp:

06/18/07 05:08:14 (1 year ago)

Author:

morris

Message:

Split out dns-sd registration

Files:

• wired/trunk/wired/server.c (modified) (4 diffs)
• wired/trunk/wired/server.h (modified) (1 diff)

wired/trunk/wired/server.c

@@ -48 +48 @@
-#include "version.h"
-
+#ifdef HAVE_DNS_SD_H
+
+static void                                                     wd_server_register_dnssd(void);
+static void                                                     wd_server_register_dnssd_reply(DNSServiceRef, DNSServiceFlags, DNSServiceErrorType, const char *, const char *, const char *, void *);
+#endif
+
-static void                                                     wd_control_listen_thread(wi_runtime_instance_t *);
-static void                                                     wd_transfer_listen_thread(wi_runtime_instance_t *);
@@ -62 +68 @@
-
-void wd_server_init(void) {
-#ifdef HAVE_DNS_SD_H
-        DNSServiceRef                   service;
-        DNSServiceErrorType             err;
-#endif
-        wi_enumerator_t                 *enumerator;
-        wi_array_t                              *array, *addresses;
@@ -154 +156 @@
-        
-#ifdef HAVE_DNS_SD_H
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-#endif
-}
@@ -279 +267 @@
-#pragma mark -
-
+#ifdef HAVE_DNS_SD_H
+
+static void wd_server_register_dnssd(void) {
+        DNSServiceRef                   service;
+        DNSServiceErrorType             err;
+
+        err = DNSServiceRegister(&service,
+                                                         0,
+                                                         kDNSServiceInterfaceIndexAny,
+                                                         wi_string_cstring(wd_settings.name),
+                                                         WD_DNSSD_NAME,
+                                                         NULL,
+                                                         NULL,
+                                                         htons(wd_settings.port),
+                                                         0,
+                                                         NULL,
+                                                         wd_server_register_dnssd_reply,
+                                                         NULL);
+        
+        if(err != kDNSServiceErr_NoError)
+                wi_log_warn(WI_STR("Could not register for DNS service discovery: %d"), err);
+}
+
+
+
+static void wd_server_register_dnssd_reply(DNSServiceRef client, DNSServiceFlags flags, DNSServiceErrorType error, const char *name, const char *regtype, const char *domain, void *context) {
+        wi_log_info(WI_STR("DNS service discovery reply for %s.%s%s: %d"), name, regtype, domain, error);
+}
+
+#endif
+
+
+
+#pragma mark -
+
-static void wd_control_listen_thread(wi_runtime_instance_t *argument) {
-        wi_pool_t                       *pool;

wired/trunk/wired/server.h

@@ -34 +34 @@
-#include "chats.h"
-
-ZEROCONF_NAME
+DNSSD_NAME  
-#define WD_SERVER_PORT                          2000
-#define WD_TRACKER_PORT                         2002