diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-25 08:08:20 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-25 08:08:20 -0700 |
| commit | 8242bfad9255ce26b0e417d2e8d87b5c61327024 (patch) | |
| tree | 548404aabd30454768bc80d7282680b745c30b2e /ipacm/inc | |
| parent | d485dd9ea8a77c112784a18b0e45e018cdcf5a09 (diff) | |
| parent | 18ed683bd3b16c7a5e411500f48cfc9eeb2ea720 (diff) | |
| download | ipacfg-mgr-8242bfad9255ce26b0e417d2e8d87b5c61327024.tar.gz | |
Merge "ipacm: changes related to IP Passhthrough"
Diffstat (limited to 'ipacm/inc')
| -rw-r--r-- | ipacm/inc/IPACM_Config.h | 2 | ||||
| -rw-r--r-- | ipacm/inc/IPACM_Wan.h | 6 | ||||
| -rw-r--r-- | ipacm/inc/IPACM_Xml.h | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/ipacm/inc/IPACM_Config.h b/ipacm/inc/IPACM_Config.h index 8d054a0..5bcb4eb 100644 --- a/ipacm/inc/IPACM_Config.h +++ b/ipacm/inc/IPACM_Config.h @@ -115,6 +115,8 @@ public: bool ipacm_odu_embms_enable; + bool ipacm_ip_passthrough_mode; + int ipa_nat_iface_entries; /* Store the total number of wlan guest ap configured */ diff --git a/ipacm/inc/IPACM_Wan.h b/ipacm/inc/IPACM_Wan.h index b4bf50e..e42358f 100644 --- a/ipacm/inc/IPACM_Wan.h +++ b/ipacm/inc/IPACM_Wan.h @@ -97,6 +97,7 @@ public: static uint8_t xlat_mux_id; /* IPACM interface name */ static char wan_up_dev_name[IF_NAME_LEN]; + static uint32_t curr_wan_ip; IPACM_Wan(int, ipacm_wan_iface_type, uint8_t *); virtual ~IPACM_Wan(); @@ -140,6 +141,11 @@ public: #endif } + static uint32_t getWANIP() + { + return curr_wan_ip; + } + static bool getXlat_Mux_Id() { return xlat_mux_id; diff --git a/ipacm/inc/IPACM_Xml.h b/ipacm/inc/IPACM_Xml.h index f645ae1..64c00ed 100644 --- a/ipacm/inc/IPACM_Xml.h +++ b/ipacm/inc/IPACM_Xml.h @@ -178,6 +178,9 @@ if (!(a)) { \ #define IPACMNat_TAG "IPACMNAT" #define NAT_MaxEntries_TAG "MaxNatEntries" +#define IP_PassthroughFlag_TAG "IPPassthroughFlag" +#define IP_PassthroughMode_TAG "IPPassthroughMode" + /*--------------------------------------------------------------------------- IP protocol numbers - use in dss_socket() to identify protocols. Also contains the extension header types for IPv6. @@ -276,6 +279,7 @@ typedef struct _IPACM_conf_t bool router_mode_enable; bool odu_embms_enable; int num_wlan_guest_ap; + bool ip_passthrough_mode; } IPACM_conf_t; /* This function read IPACM XML configuration*/ |