Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
WIP: remove conflict with linux uuid_t type
Since this change [1] compilation of vrouter module will fail with
message that uuid_t is already defined.
There is a corresponding change in contrail-common project.

[1]
torvalds/linux@f9727a1

Change-Id: I0d6449d9c81f04a1876d5d6b0a0bc3ff1da4e7e3
Partial-Bug: #1633387
  • Loading branch information
michalskalski committed Apr 26, 2018
1 parent e22cafd commit 9643e39
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/sandesh/common/flow.sandesh
Expand Up @@ -40,15 +40,15 @@ struct SessionFlowInfo {
2: optional i64 sampled_pkts;
3: optional i64 logged_bytes;
4: optional i64 logged_pkts;
5: optional uuid_t flow_uuid;
5: optional ct_uuid_t flow_uuid;
6: optional i16 tcp_flags;
7: optional i64 setup_time;
8: optional i64 teardown_time;
9: optional i64 teardown_bytes;
10: optional i64 teardown_pkts;
11: optional string action;
12: optional uuid_t sg_rule_uuid;
13: optional uuid_t nw_ace_uuid;
12: optional ct_uuid_t sg_rule_uuid;
13: optional ct_uuid_t nw_ace_uuid;
14: optional u16 underlay_source_port;
15: optional string drop_reason;
}
Expand Down

0 comments on commit 9643e39

Please sign in to comment.