---
lib/cfm.c | 12 ++++++++++--
lib/cfm.h | 1 +
vswitchd/bridge.c | 2 ++
vswitchd/vswitch.xml | 7 +++++++
4 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/lib/cfm.c b/lib/cfm.c
index 0d79bee..8ba399c 100644
--- a/lib/cfm.c
+++ b/lib/cfm.c
@@ -93,6 +93,7 @@ struct cfm {
uint32_t seq; /* The sequence number of our last CCM. */
uint8_t ccm_interval; /* The CCM transmission interval. */
int ccm_interval_ms; /* 'ccm_interval' in milliseconds. */
+ uint16_t ccm_vlan; /* Vlan tag of CCM PDUs. */
uint8_t maid[CCM_MAID_LEN]; /* The MAID of this CFM. */
struct timer tx_timer; /* Send CCM when expired. */
@@ -345,8 +346,14 @@ cfm_compose_ccm(struct cfm *cfm, struct ofpbuf *packet,
struct ccm *ccm;
timer_set_duration(&cfm->tx_timer, cfm->ccm_interval_ms);
- ccm = eth_compose(packet, cfm_ccm_addr(cfm), eth_src, ETH_TYPE_CFM,
- sizeof *ccm);
+ packet->l3 = eth_compose(packet, cfm_ccm_addr(cfm), eth_src, ETH_TYPE_CFM,
+ sizeof *ccm);
+
+ if (cfm->ccm_vlan) {
+ eth_push_vlan(packet, htons(cfm->ccm_vlan));
+ }
+
+ ccm = packet->l3;
ccm->mdlevel_version = 0;
ccm->opcode = CCM_OPCODE;
ccm->tlv_offset = 70;
@@ -400,6 +407,7 @@ cfm_configure(struct cfm *cfm, const struct cfm_settings *s)
interval = ms_to_ccm_interval(s->interval);
interval_ms = ccm_interval_to_ms(interval);
+ cfm->ccm_vlan = s->ccm_vlan & VLAN_VID_MASK;
if (cfm->extended && interval_ms != s->interval) {
interval = 0;
interval_ms = MIN(s->interval, UINT16_MAX);
diff --git a/lib/cfm.h b/lib/cfm.h
index 1c46ffa..334b80c 100644
--- a/lib/cfm.h
+++ b/lib/cfm.h
@@ -29,6 +29,7 @@ struct cfm_settings {
int interval; /* The requested transmission interval. */
bool extended; /* Run in extended mode. */
bool opup; /* Operational State. */
+ uint16_t ccm_vlan; /* CCM Vlan tag. Zero if none. */
};
void cfm_init(void);
diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index 09696d5..5100b78 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -3005,6 +3005,8 @@ iface_configure_cfm(struct iface *iface)
s.mpid = *cfg->cfm_mpid;
s.interval = atoi(get_interface_other_config(iface->cfg, "cfm_interval",
"0"));
+ s.ccm_vlan = atoi(get_interface_other_config(iface->cfg, "cfm_ccm_vlan",
+ "0"));
if (s.interval <= 0) {
s.interval = 1000;
}
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index bcb6b6f..80d9cdc 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -1642,6 +1642,13 @@
OpenFlow action. This setting is ignored when CFM is not in extended
mode. Defaults to <code>up</code>.
</column>
+
+ <column name="other_config" key="cfm_ccm_vlan"
+ type='{"type": "integer", "minInteger": 1, "maxInteger": 4095}'>
+ When set, the CFM module will apply a VLAN tag to all CCMs it generates
+ with the given value.
+ </column>
+
</group>
<group title="Bonding Configuration">
--
1.7.7.1
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
