Remove unused attributes use_IPx_to_send (#264)

examples/C++/HelloWorldExample/HelloWorldPublisher.cpp

@@ -41,7 +41,6 @@ bool HelloWorldPublisher::init()
     m_Hello.message("HelloWorld");
     ParticipantAttributes PParam;
     PParam.rtps.defaultSendPort = 11511;
-    PParam.rtps.use_IP6_to_send = true;
     PParam.rtps.builtin.use_SIMPLE_RTPSParticipantDiscoveryProtocol = true;
     PParam.rtps.builtin.use_SIMPLE_EndpointDiscoveryProtocol = true;
     PParam.rtps.builtin.m_simpleEDP.use_PublicationReaderANDSubscriptionWriter = true;

include/fastrtps/rtps/attributes/RTPSParticipantAttributes.h

@@ -214,8 +214,6 @@ class RTPSParticipantAttributes
             setName("RTPSParticipant");
             sendSocketBufferSize = 0;
             listenSocketBufferSize = 0;
-            use_IP4_to_send = true;
-            use_IP6_to_send = false;
             participantID = -1;
             useBuiltinTransports = true;
         }
@@ -266,10 +264,6 @@ class RTPSParticipantAttributes
         std::vector<octet> userData;
         //!Participant ID
         int32_t participantID;
-        //!Use IP4 to send messages.
-        bool use_IP4_to_send;
-        //!Use IP6 to send messages.
-        bool use_IP6_to_send;
         //!Set the name of the participant.
         inline void setName(const char* nam){name = nam;}
         //!Get the name of the participant.

src/cpp/rtps/RTPSDomain.cpp

@@ -67,11 +67,6 @@ RTPSParticipant* RTPSDomain::createParticipant(RTPSParticipantAttributes& PParam
         logError(RTPS_PARTICIPANT,"RTPSParticipant Attributes: LeaseDuration should be >= leaseDuration announcement period");
         return nullptr;
     }
-    if(PParam.use_IP4_to_send == false && PParam.use_IP6_to_send == false)
-    {
-        logError(RTPS_PARTICIPANT,"Use IP4 OR User IP6 to send must be set to true");
-        return nullptr;
-    }
     uint32_t ID;
     if(PParam.participantID < 0)
     {

src/cpp/xmlparser/XMLParser.cpp

@@ -299,8 +299,6 @@ XMLP_ret XMLParser::fillDataNode(tinyxml2::XMLElement* p_profile, DataNode<Parti
         <xs:element name="port" type="portType"/>
         <xs:element name="userData" type="octetVectorType"/>
         <xs:element name="participantID" type="int32Type"/>
-        <xs:element name="use_IP4_to_send" type="boolType"/>
-        <xs:element name="use_IP6_to_send" type="boolType"/>
         <xs:element name="throughputController" type="throughputControllerType"/>
         <!-- <xs:element name="userTransports" type="XXX"/> -->
         <xs:element name="useBuiltinTransports" type="boolType"/>
@@ -394,18 +392,6 @@ XMLP_ret XMLParser::fillDataNode(tinyxml2::XMLElement* p_profile, DataNode<Parti
         if (XMLP_ret::XML_OK != getXMLInt(p_aux, &participant_node.get()->rtps.participantID, ident))
             return XMLP_ret::XML_ERROR;
     }
-    // use_IP4_to_send - boolType
-    if (nullptr != (p_aux = p_element->FirstChildElement(IP4_TO_SEND)))
-    {
-        if (XMLP_ret::XML_OK != getXMLBool(p_aux, &participant_node.get()->rtps.use_IP4_to_send, ident))
-            return XMLP_ret::XML_ERROR;
-    }
-    // use_IP6_to_send - boolType
-    if (nullptr != (p_aux = p_element->FirstChildElement(IP6_TO_SEND)))
-    {
-        if (XMLP_ret::XML_OK != getXMLBool(p_aux, &participant_node.get()->rtps.use_IP6_to_send, ident))
-            return XMLP_ret::XML_ERROR;
-    }
     // throughputController
     if (nullptr != (p_aux = p_element->FirstChildElement(THROUGHPUT_CONT)))
     {

src/cpp/xmlparser/XMLParserCommon.cpp

@@ -47,8 +47,6 @@ const char* BUILTIN = "builtin";
 const char* PORT = "port";
 const char* USER_DATA = "userData";
 const char* PART_ID = "participantID";
-const char* IP4_TO_SEND = "use_IP4_to_send";
-const char* IP6_TO_SEND = "use_IP6_to_send";
 const char* THROUGHPUT_CONT = "throughputController";
 const char* USER_TRANS = "userTransports";
 const char* USE_BUILTIN_TRANS = "useBuiltinTransports";

test/unittest/xmlparser/XMLParserTests.cpp

@@ -419,8 +419,6 @@ TEST_F(XMLParserTests, Data)
     EXPECT_EQ(port.offsetd2, 123);
     EXPECT_EQ(port.offsetd3, 456);
     EXPECT_EQ(rtps_atts.participantID, 9898);
-    EXPECT_EQ(rtps_atts.use_IP4_to_send, true);
-    EXPECT_EQ(rtps_atts.use_IP6_to_send, false);
     EXPECT_EQ(rtps_atts.throughputController.bytesPerPeriod, 2048);
     EXPECT_EQ(rtps_atts.throughputController.periodMillisecs, 45);
     EXPECT_EQ(rtps_atts.useBuiltinTransports, true);
@@ -507,8 +505,6 @@ TEST_F(XMLParserTests, DataBuffer)
     EXPECT_EQ(port.offsetd2, 123);
     EXPECT_EQ(port.offsetd3, 456);
     EXPECT_EQ(rtps_atts.participantID, 9898);
-    EXPECT_EQ(rtps_atts.use_IP4_to_send, true);
-    EXPECT_EQ(rtps_atts.use_IP6_to_send, false);
     EXPECT_EQ(rtps_atts.throughputController.bytesPerPeriod, 2048);
     EXPECT_EQ(rtps_atts.throughputController.periodMillisecs, 45);
     EXPECT_EQ(rtps_atts.useBuiltinTransports, true);

test/unittest/xmlparser/XMLProfileParserTests.cpp

@@ -114,8 +114,6 @@ TEST_F(XMLProfileParserTests, XMLParserParcipant)
     EXPECT_EQ(port.offsetd2, 123);
     EXPECT_EQ(port.offsetd3, 456);
     EXPECT_EQ(rtps_atts.participantID, 9898);
-    EXPECT_EQ(rtps_atts.use_IP4_to_send, true);
-    EXPECT_EQ(rtps_atts.use_IP6_to_send, false);
     EXPECT_EQ(rtps_atts.throughputController.bytesPerPeriod, 2048);
     EXPECT_EQ(rtps_atts.throughputController.periodMillisecs, 45);
     EXPECT_EQ(rtps_atts.useBuiltinTransports, true);
@@ -184,8 +182,6 @@ TEST_F(XMLProfileParserTests, XMLParserDefaultParcipantProfile)
     EXPECT_EQ(port.offsetd2, 123);
     EXPECT_EQ(port.offsetd3, 456);
     EXPECT_EQ(rtps_atts.participantID, 9898);
-    EXPECT_EQ(rtps_atts.use_IP4_to_send, true);
-    EXPECT_EQ(rtps_atts.use_IP6_to_send, false);
     EXPECT_EQ(rtps_atts.throughputController.bytesPerPeriod, 2048);
     EXPECT_EQ(rtps_atts.throughputController.periodMillisecs, 45);
     EXPECT_EQ(rtps_atts.useBuiltinTransports, true);