+ if (!g->dead) {
+ avahi_announce_group(g->server, g);
+ avahi_s_entry_group_check_probed(g, 0);
+ }
+}
+
+static void entry_group_register_time_event_callback(AvahiTimeEvent *e, void* userdata) {
+ AvahiSEntryGroup *g = userdata;
+ assert(g);
+
+/* avahi_log_debug("Holdoff passed, waking up and going on."); */
+
+ avahi_time_event_free(g->register_time_event);
+ g->register_time_event = NULL;
+
+ /* Holdoff time passed, so let's start probing */
+ entry_group_commit_real(g);
+}
+
+int avahi_s_entry_group_commit(AvahiSEntryGroup *g) {
+ struct timeval now;
+
+ assert(g);
+ assert(!g->dead);
+
+ if (g->state != AVAHI_ENTRY_GROUP_UNCOMMITED && g->state != AVAHI_ENTRY_GROUP_COLLISION)
+ return avahi_server_set_errno(g->server, AVAHI_ERR_BAD_STATE);
+
+ g->n_register_try++;
+
+ avahi_timeval_add(&g->register_time,
+ 1000*(g->n_register_try >= AVAHI_RR_RATE_LIMIT_COUNT ?
+ AVAHI_RR_HOLDOFF_MSEC_RATE_LIMIT :
+ AVAHI_RR_HOLDOFF_MSEC));
+
+ gettimeofday(&now, NULL);
+
+ if (avahi_timeval_compare(&g->register_time, &now) <= 0) {
+ /* Holdoff time passed, so let's start probing */
+/* avahi_log_debug("Holdoff passed, directly going on."); */
+
+ entry_group_commit_real(g);
+ } else {
+/* avahi_log_debug("Holdoff not passed, sleeping."); */
+
+ /* Holdoff time has not yet passed, so let's wait */
+ assert(!g->register_time_event);
+ g->register_time_event = avahi_time_event_new(g->server->time_event_queue, &g->register_time, entry_group_register_time_event_callback, g);
+
+ avahi_s_entry_group_change_state(g, AVAHI_ENTRY_GROUP_REGISTERING);
+ }
+
+ return AVAHI_OK;
+}
+
+void avahi_s_entry_group_reset(AvahiSEntryGroup *g) {
+ AvahiEntry *e;
+ assert(g);
+
+ if (g->register_time_event) {
+ avahi_time_event_free(g->register_time_event);
+ g->register_time_event = NULL;
+ }
+
+ for (e = g->entries; e; e = e->by_group_next) {
+ if (!e->dead) {
+ avahi_goodbye_entry(g->server, e, 1);
+ e->dead = 1;
+ }
+ }
+
+ if (g->register_time_event) {
+ avahi_time_event_free(g->register_time_event);
+ g->register_time_event = NULL;
+ }
+
+ g->server->need_entry_cleanup = 1;
+ g->n_probing = 0;
+
+ avahi_s_entry_group_change_state(g, AVAHI_ENTRY_GROUP_UNCOMMITED);