diff options
| author | Sairam Venugopal <vsairam@vmware.com> | 2017-06-15 14:07:43 -0700 |
|---|---|---|
| committer | Gurucharan Shetty <guru@ovn.org> | 2017-06-20 10:31:13 -0700 |
| commit | 929aed9a3735204d2f07275e7b02331e174739ba (patch) | |
| tree | 9e95c992f1a14c1bfbc339504c34f1024d754014 /datapath-windows | |
| parent | f77ceea3b55c78d9a2b479cc4e8d440a1f59b179 (diff) | |
| download | openvswitch-929aed9a3735204d2f07275e7b02331e174739ba.tar.gz | |
datapath-windows: Zero initialize Conntrack-ICMP entry
Set conntrack-icmp entry to {0}. Add some compile time asserts to ensure
that conn_* struct's first member is OVS_CT_ENTRY.
Signed-off-by: Sairam Venugopal <vsairam@vmware.com>
Acked-by: Shashank Ram <rams@vmware.com>
Acked-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
Signed-off-by: Gurucharan Shetty <guru@ovn.org>
Diffstat (limited to 'datapath-windows')
| -rw-r--r-- | datapath-windows/ovsext/Conntrack-icmp.c | 3 | ||||
| -rw-r--r-- | datapath-windows/ovsext/Conntrack-other.c | 1 | ||||
| -rw-r--r-- | datapath-windows/ovsext/Conntrack-tcp.c | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/datapath-windows/ovsext/Conntrack-icmp.c b/datapath-windows/ovsext/Conntrack-icmp.c index b1b604377..4da06659e 100644 --- a/datapath-windows/ovsext/Conntrack-icmp.c +++ b/datapath-windows/ovsext/Conntrack-icmp.c @@ -27,6 +27,7 @@ struct conn_icmp { struct OVS_CT_ENTRY up; enum icmp_state state; }; +C_ASSERT(offsetof(struct conn_icmp, up) == 0); static const enum ct_timeout icmp_timeouts[] = { [ICMPS_FIRST] = 60 * CT_INTERVAL_SEC, @@ -78,7 +79,7 @@ OvsConntrackCreateIcmpEntry(UINT64 now) if (!conn) { return NULL; } - + conn->up = (OVS_CT_ENTRY) {0}; conn->state = ICMPS_FIRST; OvsConntrackUpdateExpiration(&conn->up, now, diff --git a/datapath-windows/ovsext/Conntrack-other.c b/datapath-windows/ovsext/Conntrack-other.c index 6c68ba8d0..962cc8ac6 100644 --- a/datapath-windows/ovsext/Conntrack-other.c +++ b/datapath-windows/ovsext/Conntrack-other.c @@ -27,6 +27,7 @@ struct conn_other { struct OVS_CT_ENTRY up; enum other_state state; }; +C_ASSERT(offsetof(struct conn_other, up) == 0); static const long long other_timeouts[] = { [OTHERS_FIRST] = 60 * CT_INTERVAL_SEC, diff --git a/datapath-windows/ovsext/Conntrack-tcp.c b/datapath-windows/ovsext/Conntrack-tcp.c index f533b935f..f8e85a283 100644 --- a/datapath-windows/ovsext/Conntrack-tcp.c +++ b/datapath-windows/ovsext/Conntrack-tcp.c @@ -51,6 +51,7 @@ struct conn_tcp { struct OVS_CT_ENTRY up; struct tcp_peer peer[2]; }; +C_ASSERT(offsetof(struct conn_tcp, up) == 0); enum { TCPOPT_EOL, |