From 818d87b312de5d56937381b551abe084bba72c9f Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Thu, 17 Nov 2016 22:53:39 +0000 Subject: z2_plus: Update IPACM from upstream * Tag LA.UM.5.5.r1-00100-8x96.0 Change-Id: Ia960f038ffcec1a7d93b1bd205b777d05c786cf3 --- data-ipa-cfg-mgr/ipacm/src/IPACM_Xml.cpp | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'data-ipa-cfg-mgr/ipacm/src/IPACM_Xml.cpp') diff --git a/data-ipa-cfg-mgr/ipacm/src/IPACM_Xml.cpp b/data-ipa-cfg-mgr/ipacm/src/IPACM_Xml.cpp index 073dc98..faae5b2 100644 --- a/data-ipa-cfg-mgr/ipacm/src/IPACM_Xml.cpp +++ b/data-ipa-cfg-mgr/ipacm/src/IPACM_Xml.cpp @@ -174,8 +174,7 @@ static int ipacm_cfg_xml_parse_tree IPACM_util_icmp_string((char*)xml_node->name, SUBNET_TAG) == 0 || IPACM_util_icmp_string((char*)xml_node->name, IPACMALG_TAG) == 0 || IPACM_util_icmp_string((char*)xml_node->name, ALG_TAG) == 0 || - IPACM_util_icmp_string((char*)xml_node->name, IPACMNat_TAG) == 0 || - IPACM_util_icmp_string((char*)xml_node->name, IP_PassthroughFlag_TAG) == 0) + IPACM_util_icmp_string((char*)xml_node->name, IPACMNat_TAG) == 0) { if (0 == IPACM_util_icmp_string((char*)xml_node->name, IFACE_TAG)) { @@ -197,27 +196,6 @@ static int ipacm_cfg_xml_parse_tree /* go to child */ ret_val = ipacm_cfg_xml_parse_tree(xml_node->children, config); } - else if (IPACM_util_icmp_string((char*)xml_node->name, IP_PassthroughMode_TAG) == 0) - { - IPACMDBG_H("inside IP Passthrough\n"); - content = IPACM_read_content_element(xml_node); - if (content) - { - str_size = strlen(content); - memset(content_buf, 0, sizeof(content_buf)); - memcpy(content_buf, (void *)content, str_size); - if (atoi(content_buf)) - { - config->ip_passthrough_mode = true; - IPACMDBG_H("Passthrough enable %d buf(%d)\n", config->ip_passthrough_mode, atoi(content_buf)); - } - else - { - config->ip_passthrough_mode = false; - IPACMDBG_H("Passthrough enable %d buf(%d)\n", config->ip_passthrough_mode, atoi(content_buf)); - } - } - } else if (IPACM_util_icmp_string((char*)xml_node->name, ODUMODE_TAG) == 0) { IPACMDBG_H("inside ODU-XML\n"); -- cgit v1.2.3