return
def getnextfilename(self,type,chain):
- dir = sfatables_config + chain;
+ dir = sfatables_config + "/"+chain;
last_rule_number = 1
for (root, dirs, files) in os.walk(dir):
return "sfatables-%d-%s"%(last_rule_number+1,type)
- def call_gen(self, dir, options):
+ def call_gen(self, chain, type, dir, options):
filename = dir + "/"+options.name+".xml"
xmldoc = libxml2.parseFile(filename)
valueNode.addContent(option_value)
context[0].addChild(valueNode)
- chain = command_options.args[0]
- filename = self.getnextfilename('match',chain)
+ filename = self.getnextfilename(type,chain)
file_path = sfatables_config + '/' + chain + '/' + filename
xmldoc.saveFile(file_path)
p.xpathFreeContext()
return True
def call(self, command_options, match_options, target_options):
- ret = self.call_gen(match_dir, match_options)
+ chain = command_options.args[0]
+ ret = self.call_gen(chain, 'match',match_dir, match_options)
if (ret):
- ret = self.call_gen(target_dir, target_options)
+ ret = self.call_gen(chain, 'target',target_dir, target_options)
return ret
target_dict = load_xml_extensions("sfatables.targets",target_dir,targets.all)
target_parser = create_parser_xml_ext(target_dict)
targets_str = ",".join(target_dict.keys())
- target_parser.add_option('-j','--jump',dest='target_name',help='Target name (one of %s)'%targets, metavar = 'TARGET')
+ target_parser.add_option('-j','--jump',dest='name',help='Target name (one of %s)'%targets, metavar = 'TARGET')
(target_options, args) = target_parser.parse_args(pargs[2])
try:
- target_name = target_options.target_name
+ name = target_options.name
except Exception:
print "Must specify target name with -m"
- if (target_dict.has_key(target_name)):
- setattr(target_options, 'arguments', target_dict[target_name].arguments)
+ if (target_dict.has_key(name)):
+ setattr(target_options, 'arguments', target_dict[name].arguments)
else:
- raise Exception('Target %s not found'%target_name)
+ raise Exception('Target %s not found'%name)
else:
target_options = None
if __name__=='__main__':
main()
-if __name__=='__main__':
- main()