* reenable ipv6 and address record generation

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@44 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/iface.c b/iface.c
index 54a58803838307206e40ce00f06bf3d0a90c3832..dc990ac606b7261f38f3b5dd38739482e6207c76 100644 (file)
--- a/iface.c
+++ b/iface.c
@@ -23,9 +23,9 @@ static void update_address_rr(flxInterfaceMonitor *m, flxInterfaceAddress *a, in
         }
     } else {
         if (!a->entry_group) {
-/*             a->entry_group = flx_entry_group_new(m->server, NULL, NULL); */
-/*             flx_server_add_address(m->server, a->entry_group, a->interface->hardware->index, AF_UNSPEC, 0, NULL, &a->address); */
-/*             flx_entry_group_commit(a->entry_group); */
+            a->entry_group = flx_entry_group_new(m->server, NULL, NULL);
+            flx_server_add_address(m->server, a->entry_group, a->interface->hardware->index, AF_UNSPEC, 0, NULL, &a->address);
+            flx_entry_group_commit(a->entry_group);
         }
     }
 }

diff --git a/main.c b/main.c
index 987df2253758522dea68a47c7609234786589773..efb6172b14178e8b1a29f566d0ad4eb18a05481e 100644 (file)
--- a/main.c
+++ b/main.c
@@ -44,12 +44,12 @@ int main(int argc, char *argv[]) {
 
     flx = flx_server_new(NULL);
 
-    g = flx_entry_group_new(flx, entry_group_callback, NULL); 
+/*     g = flx_entry_group_new(flx, entry_group_callback, NULL);  */
     
 /*    flx_server_add_text(flx, g, 0, AF_UNSPEC, FLX_ENTRY_UNIQUE, NULL, "hallo", NULL); */
-     flx_server_add_service(flx, g, 0, AF_UNSPEC, "_http._tcp", "gurke", NULL, NULL, 80, "foo", NULL); 
+/*      flx_server_add_service(flx, g, 0, AF_UNSPEC, "_http._tcp", "gurke", NULL, NULL, 80, "foo", NULL);  */
     
-    flx_entry_group_commit(g); 
+/*     flx_entry_group_commit(g);  */
 
     flx_server_dump(flx, stdout);
     

diff --git a/server.c b/server.c
index 9e2b692391c800e897aab832dad2afeb16bafae0..5cdf56d9cc97de18020c927322b35aef30421e33 100644 (file)
--- a/server.c
+++ b/server.c
@@ -481,7 +481,7 @@ flxServer *flx_server_new(GMainContext *c) {
     s->need_entry_cleanup = s->need_group_cleanup = FALSE;
     
     s->fd_ipv4 = flx_open_socket_ipv4();
-    s->fd_ipv6 = -1 /*flx_open_socket_ipv6() */; 
+    s->fd_ipv6 = flx_open_socket_ipv6();
     
     if (s->fd_ipv6 < 0 && s->fd_ipv4 < 0) {
         g_critical("Failed to create IP sockets.\n");