diff options
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/vom/vom/gbp_bridge_domain.cpp | 18 | ||||
| -rw-r--r-- | extras/vom/vom/gbp_route_domain.cpp | 4 |
2 files changed, 8 insertions, 14 deletions
diff --git a/extras/vom/vom/gbp_bridge_domain.cpp b/extras/vom/vom/gbp_bridge_domain.cpp index 953c40c1c29..d9ea4876a65 100644 --- a/extras/vom/vom/gbp_bridge_domain.cpp +++ b/extras/vom/vom/gbp_bridge_domain.cpp @@ -136,12 +136,9 @@ void gbp_bridge_domain::replay() { if (rc_t::OK == m_id.rc()) { - if (m_bvi && m_uu_fwd) - HW::enqueue(new gbp_bridge_domain_cmds::create_cmd(m_id, m_bvi->handle(), - m_uu_fwd->handle())); - else - HW::enqueue(new gbp_bridge_domain_cmds::create_cmd( - m_id, handle_t::INVALID, handle_t::INVALID)); + HW::enqueue(new gbp_bridge_domain_cmds::create_cmd( + m_id, (m_bvi ? m_bvi->handle() : handle_t::INVALID), + (m_uu_fwd ? m_uu_fwd->handle() : handle_t::INVALID))); } } @@ -182,12 +179,9 @@ gbp_bridge_domain::update(const gbp_bridge_domain& desired) * the desired state is always that the interface should be created */ if (rc_t::OK != m_id.rc()) { - if (m_bvi && m_uu_fwd) - HW::enqueue(new gbp_bridge_domain_cmds::create_cmd(m_id, m_bvi->handle(), - m_uu_fwd->handle())); - else - HW::enqueue(new gbp_bridge_domain_cmds::create_cmd( - m_id, handle_t::INVALID, handle_t::INVALID)); + HW::enqueue(new gbp_bridge_domain_cmds::create_cmd( + m_id, (m_bvi ? m_bvi->handle() : handle_t::INVALID), + (m_uu_fwd ? m_uu_fwd->handle() : handle_t::INVALID))); } } diff --git a/extras/vom/vom/gbp_route_domain.cpp b/extras/vom/vom/gbp_route_domain.cpp index 46208b77bf3..873cea6f0e8 100644 --- a/extras/vom/vom/gbp_route_domain.cpp +++ b/extras/vom/vom/gbp_route_domain.cpp @@ -141,9 +141,9 @@ gbp_route_domain::to_string() const s << "gbp-route-domain:[" << m_rd->to_string(); if (m_ip4_uu_fwd) - s << " v4-uu:" << m_ip4_uu_fwd->to_string(); + s << " v4-uu:[" << m_ip4_uu_fwd->to_string() << "]"; if (m_ip6_uu_fwd) - s << " v6-uu:" << m_ip6_uu_fwd->to_string(); + s << " v6-uu:[" << m_ip6_uu_fwd->to_string() << "]"; s << "]"; |