diff options
| author | Amir Levy <alevy@codeaurora.org> | 2017-10-29 13:55:38 +0200 |
|---|---|---|
| committer | Amir Levy <alevy@codeaurora.org> | 2017-10-29 13:55:38 +0200 |
| commit | 7b3d0bc8b500d16c290891bbbbfed74e435b32fd (patch) | |
| tree | 26afd869cfa4895d514fc646035de9c3b04459e5 /ipacm/src/IPACM_Conntrack_NATApp.cpp | |
| parent | 0fe2143973276c0f20cc09888c0218849358c79e (diff) | |
| download | ipacfg-mgr-7b3d0bc8b500d16c290891bbbbfed74e435b32fd.tar.gz | |
IPACM: Use Metadata replacement feature
Enable Metadata replacement bit in modem uplink filtering rules.
NAT block will replace the metadata of the packets to metadata
that contains the appropriate MUX ID according to the PDN being used.
This Mechanism overrides the MUX ID which is set with
IPA_IOC_WRITE_QMAPID.
Change-Id: If67f21d3e8cc51a7ff11b9e4192e522d2a16c90d
Diffstat (limited to 'ipacm/src/IPACM_Conntrack_NATApp.cpp')
| -rw-r--r-- | ipacm/src/IPACM_Conntrack_NATApp.cpp | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/ipacm/src/IPACM_Conntrack_NATApp.cpp b/ipacm/src/IPACM_Conntrack_NATApp.cpp index c13c48e..27bf95a 100644 --- a/ipacm/src/IPACM_Conntrack_NATApp.cpp +++ b/ipacm/src/IPACM_Conntrack_NATApp.cpp @@ -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 @@ -31,9 +31,13 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifdef FEATURE_IPACM_HAL #include "IPACM_OffloadManager.h" #endif +#include "IPACM_Iface.h" #define INVALID_IP_ADDR 0x0 +#define HDR_METADATA_MUX_ID_BMASK 0x00FF0000 +#define HDR_METADATA_MUX_ID_SHFT 0x10 + /* NatApp class Implementation */ NatApp *NatApp::pInstance = NULL; NatApp::NatApp() @@ -127,9 +131,14 @@ NatApp* NatApp::GetInstance() return pInstance; } +uint32_t NatApp::GenerateMetdata(uint8_t mux_id) +{ + return (mux_id << HDR_METADATA_MUX_ID_SHFT) & HDR_METADATA_MUX_ID_BMASK; +} + /* NAT APP related object function definitions */ -int NatApp::AddTable(uint32_t pub_ip) +int NatApp::AddTable(uint32_t pub_ip, uint8_t mux_id) { int ret; int cnt = 0; @@ -151,6 +160,19 @@ int NatApp::AddTable(uint32_t pub_ip) IPACMERR("unable to create nat table Error:%d\n", ret); return ret; } + if(IPACM_Iface::ipacmcfg->GetIPAVer() >= IPA_HW_v4_0) { + /* modify PDN 0 so it will hold the mux ID in the src metadata field */ + ipa_nat_pdn_entry entry; + + entry.dst_metadata = 0; + entry.src_metadata = GenerateMetdata(mux_id); + entry.public_ip = pub_ip; + ret = ipa_nat_modify_pdn(nat_table_hdl, 0, &entry); + if(ret) + { + IPACMERR("unable to modify PDN 0 entry Error:%d INIT_HDR_METADATA register values will be used!\n", ret); + } + } /* Add back the cached NAT-entry */ if (pub_ip == pub_ip_addr_pre) |