Index: /source/ariba/SideportListener.cpp
===================================================================
--- /source/ariba/SideportListener.cpp	(revision 5785)
+++ /source/ariba/SideportListener.cpp	(revision 5786)
@@ -122,17 +122,14 @@
 
 	if( locator->instanceof<tcpip_endpoint>() ){
-
 		tcpip_endpoint tcpip = *locator;
-		ret |= SideportListener::tcp;
 
 		if( tcpip.address().is_v4() || tcpip.address().is_v4_mapped() ){
-			ret |= SideportListener::ipv4;
+			ret = SideportListener::ipv4;
 		}else if( tcpip.address().is_v6() ){
-			ret |= SideportListener::ipv6;
-			cout << "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXx is v6" << std::endl;
+			ret = SideportListener::ipv6;
 		}
 
 	}else if( locator->instanceof<rfcomm_endpoint>() ){
-		ret |= SideportListener::rfcomm;
+		ret = SideportListener::rfcomm;
 	}
 
Index: /source/ariba/SideportListener.h
===================================================================
--- /source/ariba/SideportListener.h	(revision 5785)
+++ /source/ariba/SideportListener.h	(revision 5786)
@@ -166,7 +166,5 @@
 		rfcomm = 0x1,
 		ipv4 = 0x2,
-		ipv6 = 0x4,
-		udp = 0x8,
-		tcp = 0x16,
+		ipv6 = 0x3
 	};