Index: /source/ariba/utility/addressing/endpoint_set.hpp
===================================================================
--- /source/ariba/utility/addressing/endpoint_set.hpp	(revision 6828)
+++ /source/ariba/utility/addressing/endpoint_set.hpp	(revision 6829)
@@ -161,5 +161,5 @@
 	enum layers {
 		Layer1 = 1, Layer2 = 2,	Layer3 = 4, Layer4 = 8, Layer5 = 16,
-		Layer6 = 32, Layer7 = 64, Layer8 = 128, AllLayers = ~0,
+		Layer6 = 32, Layer7 = 64, Layer8 = 128, NoLoopback = 256,AllLayers = ~0,
 		Layer1_3 = Layer1|Layer2|Layer3,
 		Layer1_4 = Layer1|Layer2|Layer3|Layer4,
@@ -192,5 +192,6 @@
 		if ( address->instanceof<ip_address>() ) {
 			const ip_address& addr = *address;
-			if (layers & Layer3) ip.insert( addr );
+			if ((layers & Layer3) && !(layers & NoLoopback) && addr.is_loopback())
+				ip.insert( addr );
 		} else
 		if (address->instanceof<rfcomm_endpoint>() ) {