Home | History | Annotate | Download | only in patches
      1  11510  padraig --- /usr/tmp/clean/avahi-0.6.12/avahi-core/server.c	2006-06-21 22:51:19.000000000 +0100
      2  11510  padraig +++ avahi-0.6.12/avahi-core/server.c	2006-08-21 10:49:46.941313000 +0100
      3  11510  padraig @@ -1330,6 +1334,10 @@
      4  11510  padraig      else
      5  11510  padraig          avahi_server_config_init(&s->config);
      6  11510  padraig  
      7  11510  padraig +#ifdef HAVE_BONJOUR
      8  11510  padraig +    s->need_service_cleanup = 0;
      9  11510  padraig +    s->cleanup_time_event = NULL;
     10  11510  padraig +#else
     11  11510  padraig      if ((e = setup_sockets(s)) < 0) {
     12  11510  padraig          if (error)
     13  11510  padraig              *error = e;
     14  11510  padraig @@ -1384,6 +1393,12 @@
     15  11510  padraig          s->local_service_cookie = (uint32_t) rand() * (uint32_t) rand();
     16  11510  padraig      } while (s->local_service_cookie == AVAHI_SERVICE_COOKIE_INVALID);
     17  11510  padraig  
     18  11510  padraig +#ifdef HAVE_BONJOUR
     19  11510  padraig +    AVAHI_LLIST_HEAD_INIT(AvahiService, s->services);
     20  11510  padraig +    s->wide_area_lookup_engine = NULL;
     21  11510  padraig +    s->multicast_lookup_engine = NULL;
     22  11510  padraig +    s->monitor = NULL;
     23  11510  padraig +#else
     24  11510  padraig      if (s->config.enable_wide_area) {
     25  11510  padraig          s->wide_area_lookup_engine = avahi_wide_area_engine_new(s);
     26  11510  padraig          avahi_wide_area_set_servers(s->wide_area_lookup_engine, s->config.wide_area_servers, s->config.n_wide_area_servers);
     27  11510  padraig @@ -1428,7 +1444,8 @@
     28  11510  padraig      while(s->entries)
     29  11510  padraig          avahi_entry_free(s, s->entries);
     30  11510  padraig  
     31  11510  padraig -    avahi_interface_monitor_free(s->monitor);
     32  11510  padraig +    if (s->monitor)
     33  11510  padraig +        avahi_interface_monitor_free(s->monitor);
     34  11510  padraig  
     35  11510  padraig      while (s->groups)
     36  11510  padraig          avahi_entry_group_free(s, s->groups);
     37  11510  padraig @@ -1477,6 +1495,11 @@
     38  11510  padraig  
     39  11510  padraig      avahi_server_config_free(&s->config);
     40  11510  padraig  
     41  11510  padraig +#ifdef HAVE_BONJOUR
     42  11510  padraig +    if (s->cleanup_time_event)
     43  11510  padraig +        avahi_time_event_free(s->cleanup_time_event);
     44  11510  padraig +#endif 
     45  11510  padraig +
     46  11510  padraig      avahi_free(s);
     47  11510  padraig  }
     48  11510  padraig  
     49  18960  padraig diff -ruN avahi-0.6.25.orig/avahi-core/server.c avahi-0.6.25/avahi-core/server.c
     50  18960  padraig --- avahi-0.6.25.orig/avahi-core/server.c	2009-07-28 13:57:19.200269501 +0100
     51  18960  padraig +++ avahi-0.6.25/avahi-core/server.c	2009-07-28 14:01:54.826596123 +0100
     52  18960  padraig @@ -1083,7 +1083,9 @@
     53  18960  padraig  
     54  18960  padraig      s->state = state;
     55  18960  padraig  
     56  18960  padraig +#ifndef HAVE_BONJOUR
     57  18960  padraig      avahi_interface_monitor_update_rrs(s->monitor, 0);
     58  18960  padraig +#endif
     59  18960  padraig  
     60  18960  padraig      if (s->callback)
     61  18960  padraig          s->callback(s, state, s->userdata);
     62  18960  padraig @@ -1220,9 +1222,11 @@
     63  18960  padraig      server_set_state(s, AVAHI_SERVER_REGISTERING);
     64  18960  padraig      s->n_host_rr_pending ++; /** Make sure that the state isn't changed tp AVAHI_SERVER_RUNNING too early */
     65  18960  padraig  
     66  18960  padraig +#ifndef HAVE_BONJOUR
     67  18960  padraig      register_hinfo(s);
     68  18960  padraig      register_browse_domain(s);
     69  18960  padraig      avahi_interface_monitor_update_rrs(s->monitor, 0);
     70  18960  padraig +#endif
     71  18960  padraig  
     72  18960  padraig      s->n_host_rr_pending --;
     73  18960  padraig  
     74  18960  padraig @@ -1393,7 +1397,7 @@
     75  18960  padraig  
     76  18960  padraig          return NULL;
     77  18960  padraig      }
     78  18960  padraig -
     79  18960  padraig +#endif
     80  18960  padraig      s->n_host_rr_pending = 0;
     81  18960  padraig      s->need_entry_cleanup = 0;
     82  18960  padraig      s->need_group_cleanup = 0;
     83  18960  padraig @@ -1454,6 +1458,7 @@
     84  18960  padraig  
     85  18960  padraig      s->monitor = avahi_interface_monitor_new(s);
     86  18960  padraig      avahi_interface_monitor_sync(s->monitor);
     87  18960  padraig +#endif
     88  18960  padraig  
     89  18960  padraig      register_localhost(s);
     90  18960  padraig      register_stuff(s);
     91  18960  padraig @@ -1502,7 +1507,8 @@
     92  18960  padraig  
     93  18960  padraig      if (s->wide_area_lookup_engine)
     94  18960  padraig          avahi_wide_area_engine_free(s->wide_area_lookup_engine);
     95  18960  padraig -    avahi_multicast_lookup_engine_free(s->multicast_lookup_engine);
     96  18960  padraig +    if (s->multicast_lookup_engine)
     97  18960  padraig +        avahi_multicast_lookup_engine_free(s->multicast_lookup_engine);
     98  18960  padraig  
     99  18960  padraig      avahi_time_event_queue_free(s->time_event_queue);
    100  18960  padraig  
    101