From 58a39342823a2bc3a040d9d3f0ba35f195c29e62 Mon Sep 17 00:00:00 2001 From: Arnaud Porterie Date: Wed, 4 Mar 2015 11:37:16 -0800 Subject: [PATCH] Add a diagnostic message to ip forwading code Signed-off-by: Arnaud Porterie --- libnetwork/drivers/bridge/setup_ip_forwarding.go | 7 ++++++- libnetwork/drivers/bridge/setup_ip_forwarding_test.go | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libnetwork/drivers/bridge/setup_ip_forwarding.go b/libnetwork/drivers/bridge/setup_ip_forwarding.go index a8e58e90cd..4e82868a96 100644 --- a/libnetwork/drivers/bridge/setup_ip_forwarding.go +++ b/libnetwork/drivers/bridge/setup_ip_forwarding.go @@ -15,6 +15,11 @@ func SetupIPForwarding(i *Interface) error { if i.Config.EnableIPForwarding == false { return fmt.Errorf("Unexpected request to enable IP Forwarding for: %v", *i) } + // Enable IPv4 forwarding - return ioutil.WriteFile(IPV4_FORW_CONF_FILE, []byte{'1', '\n'}, PERM) + if err := ioutil.WriteFile(IPV4_FORW_CONF_FILE, []byte{'1', '\n'}, PERM); err != nil { + return fmt.Errorf("Setup IP forwarding failed: %v", err) + } + + return nil } diff --git a/libnetwork/drivers/bridge/setup_ip_forwarding_test.go b/libnetwork/drivers/bridge/setup_ip_forwarding_test.go index a5b87befa1..8252f42d54 100644 --- a/libnetwork/drivers/bridge/setup_ip_forwarding_test.go +++ b/libnetwork/drivers/bridge/setup_ip_forwarding_test.go @@ -3,6 +3,7 @@ package bridge import ( "bytes" "io/ioutil" + "strings" "testing" ) @@ -51,7 +52,9 @@ func TestUnexpectedSetupIPForwarding(t *testing.T) { // Attempt Set IP Forwarding if err := SetupIPForwarding(br); err == nil { - t.Fatalf(err.Error()) + t.Fatal("Setup IP forwarding was expected to fail") + } else if !strings.Contains(err.Error(), "Unexpected request") { + t.Fatalf("Setup IP forwarding failed with unexpected error: %v", err) } }