vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Typed errors for iptables chain raw command output. YAYYYYYY.

Browse source 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
This commit is contained in:
Jessica Frazelle 2014-11-20 16:07:55 -08:00
parent 4687dc48f6
commit 26f399ddf3
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
iptables/iptables.go
View file

@ -20,9 +20,9 @@ const (
) )
var ( var (
ErrIptablesNotFound = errors.New("Iptables not found")
nat = []string{"-t", "nat"} nat = []string{"-t", "nat"}
supportsXlock = false supportsXlock = false
ErrIptablesNotFound = errors.New("Iptables not found")
) )
type Chain struct { type Chain struct {
@ -30,6 +30,15 @@ type Chain struct {
Bridge string Bridge string
} }
type ChainError struct {
Chain string
Output []byte
}
func (e *ChainError) Error() string {
return fmt.Sprintf("Error iptables %s: %s", e.Chain, string(e.Output))
}
func init() { func init() {
supportsXlock = exec.Command("iptables", "--wait", "-L", "-n").Run() == nil supportsXlock = exec.Command("iptables", "--wait", "-L", "-n").Run() == nil
} }
@ -78,7 +87,7 @@ func (c *Chain) Forward(action Action, ip net.IP, port int, proto, dest_addr str
"--to-destination", net.JoinHostPort(dest_addr, strconv.Itoa(dest_port))); err != nil { "--to-destination", net.JoinHostPort(dest_addr, strconv.Itoa(dest_port))); err != nil {
return err return err
} else if len(output) != 0 { } else if len(output) != 0 {
return fmt.Errorf("Error iptables forward: %s", output) return &ChainError{Chain: "FORWARD", Output: output}
} }
fAction := action fAction := action
@ -94,7 +103,7 @@ func (c *Chain) Forward(action Action, ip net.IP, port int, proto, dest_addr str
"-j", "ACCEPT"); err != nil { "-j", "ACCEPT"); err != nil {
return err return err
} else if len(output) != 0 { } else if len(output) != 0 {
return fmt.Errorf("Error iptables forward: %s", output) return &ChainError{Chain: "FORWARD", Output: output}
} }
return nil return nil
@ -108,7 +117,7 @@ func (c *Chain) Prerouting(action Action, args ...string) error {
if output, err := Raw(append(a, "-j", c.Name)...); err != nil { if output, err := Raw(append(a, "-j", c.Name)...); err != nil {
return err return err
} else if len(output) != 0 { } else if len(output) != 0 {
return fmt.Errorf("Error iptables prerouting: %s", output) return &ChainError{Chain: "PREROUTING", Output: output}
} }
return nil return nil
} }
@ -121,7 +130,7 @@ func (c *Chain) Output(action Action, args ...string) error {
if output, err := Raw(append(a, "-j", c.Name)...); err != nil { if output, err := Raw(append(a, "-j", c.Name)...); err != nil {
return err return err
} else if len(output) != 0 { } else if len(output) != 0 {
return fmt.Errorf("Error iptables output: %s", output) return &ChainError{Chain: "OUTPUT", Output: output}
} }
return nil return nil
} }