Merge pull request #237 from eastebry/master

Adding [allow|deny]_addresses settings to yaml config file

pkg/smokescreen/config_loader.go

@@ -28,6 +28,8 @@ type yamlConfig struct {
 	Port                 *uint16
 	DenyRanges           []string `yaml:"deny_ranges"`
 	AllowRanges          []string `yaml:"allow_ranges"`
+	DenyAddresses        []string `yaml:"deny_addresses"`
+	AllowAddresses       []string `yaml:"allow_addresses"`
 	Resolvers            []string `yaml:"resolver_addresses"`
 	StatsdAddress        string   `yaml:"statsd_address"`
 	EgressAclFile        string   `yaml:"acl_file"`
@@ -81,6 +83,16 @@ func (c *Config) UnmarshalYAML(unmarshal func(interface{}) error) error {
 		return err
 	}
 
+	err = c.SetDenyAddresses(yc.DenyAddresses)
+	if err != nil {
+		return err
+	}
+
+	err = c.SetAllowAddresses(yc.AllowAddresses)
+	if err != nil {
+		return err
+	}
+
 	err = c.SetResolverAddresses(yc.Resolvers)
 	if err != nil {
 		return err