diff options
Diffstat (limited to 'ipacm/inc')
| -rw-r--r-- | ipacm/inc/IPACM_Config.h | 3 | ||||
| -rw-r--r-- | ipacm/inc/IPACM_Conntrack_NATApp.h | 5 | ||||
| -rw-r--r-- | ipacm/inc/IPACM_Defs.h | 1 | ||||
| -rw-r--r-- | ipacm/inc/IPACM_OffloadManager.h | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/ipacm/inc/IPACM_Config.h b/ipacm/inc/IPACM_Config.h index 1aeeec5..a9524f6 100644 --- a/ipacm/inc/IPACM_Config.h +++ b/ipacm/inc/IPACM_Config.h @@ -252,6 +252,8 @@ public: int DelExtProp(ipa_ip_type ip_type); + enum ipa_hw_type GetIPAVer(bool get = false); + int Init(void); inline bool isPrivateSubnet(uint32_t ip_addr) @@ -347,6 +349,7 @@ public: static const char *DEVICE_NAME_ODU; private: + enum ipa_hw_type ver; static IPACM_Config *pInstance; static const char *DEVICE_NAME; IPACM_Config(void); diff --git a/ipacm/inc/IPACM_Conntrack_NATApp.h b/ipacm/inc/IPACM_Conntrack_NATApp.h index e50b316..c3749e1 100644 --- a/ipacm/inc/IPACM_Conntrack_NATApp.h +++ b/ipacm/inc/IPACM_Conntrack_NATApp.h @@ -1,5 +1,5 @@ /* -Copyright (c) 2013-2016, The Linux Foundation. All rights reserved. +Copyright (c) 2013-2017, The Linux Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -102,11 +102,12 @@ private: bool isAlgPort(uint8_t, uint16_t); void Reset(); bool isPwrSaveIf(uint32_t); + uint32_t GenerateMetdata(uint8_t mux_id); public: static NatApp* GetInstance(); - int AddTable(uint32_t); + int AddTable(uint32_t, uint8_t mux_id); uint32_t GetTableHdl(uint32_t); int DeleteTable(uint32_t); diff --git a/ipacm/inc/IPACM_Defs.h b/ipacm/inc/IPACM_Defs.h index fe252c9..2031fc5 100644 --- a/ipacm/inc/IPACM_Defs.h +++ b/ipacm/inc/IPACM_Defs.h @@ -341,6 +341,7 @@ typedef struct _ipacm_event_iface_up uint32_t ipv6_prefix[2]; bool is_sta; uint8_t xlat_mux_id; + uint8_t mux_id; }ipacm_event_iface_up; typedef struct _ipacm_event_iface_up_tether diff --git a/ipacm/inc/IPACM_OffloadManager.h b/ipacm/inc/IPACM_OffloadManager.h index 72070dd..bade0aa 100644 --- a/ipacm/inc/IPACM_OffloadManager.h +++ b/ipacm/inc/IPACM_OffloadManager.h @@ -96,7 +96,7 @@ public: private: - std::list<const char *> valid_ifaces; + std::list<std::string> valid_ifaces; bool upstream_v4_up; |