comparison libpurple/dnssrv.c @ 15712:4530f15fe5af

Patch from Graham Booker which ensures that a process forked by dnsserv cleans up afterwards, calling waitpid() to make sure no zombies are left over.

15711:7ac07c5fb1c2

#ifdef _WIN32
	GThread *resolver;
	char *query;
	char *error_message;
	GSList *results;
#endif
};

static gint
responsecompare(gconstpointer ar, gconstpointer br)

	GaimSrvQueryData *query_data = (GaimSrvQueryData*)data;
	GaimSrvResponse *res;
	GaimSrvResponse *tmp;
	int i;
	GaimSrvCallback cb = query_data->cb;

	read(source, &size, sizeof(int));
	gaim_debug_info("dnssrv","found %d SRV entries\n", size);
	tmp = res = g_new0(GaimSrvResponse, size);
	for (i = 0; i < size; i++) {
		read(source, tmp++, sizeof(GaimSrvResponse));
	}

	cb(res, size, query_data->extradata);

	gaim_srv_cancel(query_data);
}

#else /* _WIN32 */

		gaim_debug_error("dnssrv", "Could not write to SRV resolver\n");

	query_data = g_new0(GaimSrvQueryData, 1);
	query_data->cb = cb;
	query_data->extradata = extradata;
	query_data->handle = gaim_input_add(out[0], GAIM_INPUT_READ, resolved, query_data);

	g_free(query);

	return query_data;

15712:4530f15fe5af

#ifdef _WIN32
	GThread *resolver;
	char *query;
	char *error_message;
	GSList *results;
#else
	pid_t pid;
#endif
};

static gint
responsecompare(gconstpointer ar, gconstpointer br)

	GaimSrvQueryData *query_data = (GaimSrvQueryData*)data;
	GaimSrvResponse *res;
	GaimSrvResponse *tmp;
	int i;
	GaimSrvCallback cb = query_data->cb;
	int status;

	read(source, &size, sizeof(int));
	gaim_debug_info("dnssrv","found %d SRV entries\n", size);
	tmp = res = g_new0(GaimSrvResponse, size);
	for (i = 0; i < size; i++) {
		read(source, tmp++, sizeof(GaimSrvResponse));
	}

	cb(res, size, query_data->extradata);
	waitpid(query_data->pid, &status, 0);

	gaim_srv_cancel(query_data);
}

#else /* _WIN32 */

		gaim_debug_error("dnssrv", "Could not write to SRV resolver\n");

	query_data = g_new0(GaimSrvQueryData, 1);
	query_data->cb = cb;
	query_data->extradata = extradata;
	query_data->pid = pid;
	query_data->handle = gaim_input_add(out[0], GAIM_INPUT_READ, resolved, query_data);

	g_free(query);

	return query_data;