From 1e50dd6c34222ac5a823a9064e0ba6cacbdbfa74 Mon Sep 17 00:00:00 2001 From: Jesse Gross Date: Sat, 5 Dec 2009 18:49:37 -0800 Subject: [PATCH] gre: Temporary workarounds for GRE on Xen. Two issues exist that prevent GRE tunnels from working properly on Xen: iptables rules and brcompatd. The first issue is that GRE traffic is not permitted by the default iptables rules. The second is that brcompatd removes ports from the configuration that it believes do not exist, which causes GRE ports to be deleted before they are created. This commit avoids these issues though not in the most optimal way. Better fixes will be forthcoming in the near future. --- vswitchd/ovs-brcompatd.c | 4 ++-- xenserver/etc_init.d_vswitch | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/vswitchd/ovs-brcompatd.c b/vswitchd/ovs-brcompatd.c index 99d08c5b..7944b8b0 100644 --- a/vswitchd/ovs-brcompatd.c +++ b/vswitchd/ovs-brcompatd.c @@ -1103,13 +1103,13 @@ main(int argc, char *argv[]) * 2) We periodically check all ports associated with bridges * to see if they no longer exist. */ - if (prune_timeout) { + /*if (prune_timeout) { rtnl_recv_update(); prune_ports(); nl_sock_wait(rtnl_sock, POLLIN); poll_timer_wait(prune_timeout); - } + }*/ nl_sock_wait(brc_sock, POLLIN); unixctl_server_wait(unixctl); diff --git a/xenserver/etc_init.d_vswitch b/xenserver/etc_init.d_vswitch index 7299430b..1b250dd8 100755 --- a/xenserver/etc_init.d_vswitch +++ b/xenserver/etc_init.d_vswitch @@ -261,6 +261,9 @@ function start { # ovs-vswitchd needs a few per bridge ulimit -n 4096 + # Allow GRE traffic. + iptables -I INPUT -p gre -j ACCEPT + if [ ! -e "$VSWITCHD_CONF" ]; then warning "$VSWITCHD_CONF does not exist" action "Creating empty $VSWITCHD_CONF" touch "$VSWITCHD_CONF" -- 2.30.2