test_mesh_local_2.c		test_mesh_local_2.c
	skipping to change at line 57		skipping to change at line 57
	* Shutdown nicely		* Shutdown nicely
	*/		*/
	static void		static void
	do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)		do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
	{		{
	GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: shutdown\n");		GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: shutdown\n");
	if (0 != abort_task)		if (0 != abort_task)
	{		{
	GNUNET_SCHEDULER_cancel (abort_task);		GNUNET_SCHEDULER_cancel (abort_task);
	}		}
			if (NULL != t)
			{
			GNUNET_MESH_tunnel_destroy(t);
			}
	GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: D1\n");		GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: D1\n");
	if (NULL != mesh_peer_1)		if (NULL != mesh_peer_1)
	{		{
	GNUNET_MESH_disconnect (mesh_peer_1);		GNUNET_MESH_disconnect (mesh_peer_1);
	}		}
	GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: D2\n");		GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: D2\n");
	if (NULL != mesh_peer_2)		if (NULL != mesh_peer_2)
	{		{
	GNUNET_MESH_disconnect (mesh_peer_2);		GNUNET_MESH_disconnect (mesh_peer_2);
	}		}
	skipping to change at line 280		skipping to change at line 284
	const struct GNUNET_CONFIGURATION_Handle *cfg)		const struct GNUNET_CONFIGURATION_Handle *cfg)
	{		{
	GNUNET_log_setup ("test_mesh_local",		GNUNET_log_setup ("test_mesh_local",
	#if VERBOSE		#if VERBOSE
	"DEBUG",		"DEBUG",
	#else		#else
	"WARNING",		"WARNING",
	#endif		#endif
	NULL);		NULL);
	arm_pid =		arm_pid =
	GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",		GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm" ,
	"gnunet-service-arm",		"gnunet-service-arm",
	#if VERBOSE_ARM		#if VERBOSE_ARM
	"-L", "DEBUG",		"-L", "DEBUG",
	#endif		#endif
	"-c", "test_mesh.conf", NULL);		"-c", "test_mesh.conf", NULL);
	abort_task =		abort_task =
	GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply		GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
	(GNUNET_TIME_UNIT_SECONDS, 20), &do_abo rt,		(GNUNET_TIME_UNIT_SECONDS, 20), &do_abo rt,
	NULL);		NULL);
End of changes. 2 change blocks.
	1 lines changed or deleted		5 lines changed or added
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/