diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-06-26 04:24:43 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-06-26 04:24:43 +0000 |
| commit | a09f0255aace0f20dee309e1616a9c41dcfabf50 (patch) | |
| tree | 5f7ce0a5d34c54969c324de9bb29a5ee554637ce /pkg/tcpip/stack/iptables.go | |
| parent | a532fd815a0f00e99b01380d1920782fec16ea3c (diff) | |
| parent | 7fb6cc286fffab2f408a5dbc228e0db706104682 (diff) | |
Merge release-20200622.1-23-g7fb6cc286 (automated)
Diffstat (limited to 'pkg/tcpip/stack/iptables.go')
| -rw-r--r-- | pkg/tcpip/stack/iptables.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkg/tcpip/stack/iptables.go b/pkg/tcpip/stack/iptables.go index 62d4eb1b6..974d77c36 100644 --- a/pkg/tcpip/stack/iptables.go +++ b/pkg/tcpip/stack/iptables.go @@ -111,9 +111,8 @@ func DefaultTables() *IPTables { Prerouting: []string{TablenameMangle, TablenameNat}, Output: []string{TablenameMangle, TablenameNat, TablenameFilter}, }, - connections: ConnTrackTable{ - CtMap: make(map[uint32]ConnTrackTupleHolder), - Seed: generateRandUint32(), + connections: ConnTrack{ + conns: make(map[tupleID]tuple), }, } } @@ -213,7 +212,7 @@ func (it *IPTables) Check(hook Hook, pkt *PacketBuffer, gso *GSO, r *Route, addr // Packets are manipulated only if connection and matching // NAT rule exists. - it.connections.HandlePacket(pkt, hook, gso, r) + it.connections.handlePacket(pkt, hook, gso, r) // Go through each table containing the hook. for _, tablename := range it.GetPriorities(hook) { |