mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-11-07 05:49:59 +00:00
5c7c755f50
With this patch I want to enable hex number inputs in the filter XML. A number that was entered as hex is also printed as hex unless a string representing the meaning can be found. I am also extending the schema and adding a test case. A problem with the DSCP value is fixed on the way as well. Changes from V1 to V2: - using asHex boolean in all printf type of functions to select the output format in hex or decimal format
130 lines
2.9 KiB
C
130 lines
2.9 KiB
C
#include <config.h>
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <string.h>
|
|
|
|
#include <sys/types.h>
|
|
#include <fcntl.h>
|
|
|
|
#include "internal.h"
|
|
#include "testutils.h"
|
|
#include "xml.h"
|
|
#include "threads.h"
|
|
#include "nwfilter_params.h"
|
|
#include "nwfilter_conf.h"
|
|
#include "testutilsqemu.h"
|
|
|
|
static char *progname;
|
|
static char *abs_srcdir;
|
|
|
|
#define MAX_FILE 4096
|
|
|
|
|
|
static int testCompareXMLToXMLFiles(const char *inxml, const char *outxml) {
|
|
char inXmlData[MAX_FILE];
|
|
char *inXmlPtr = &(inXmlData[0]);
|
|
char outXmlData[MAX_FILE];
|
|
char *outXmlPtr = &(outXmlData[0]);
|
|
char *actual = NULL;
|
|
int ret = -1;
|
|
virNWFilterDefPtr dev = NULL;
|
|
|
|
if (virtTestLoadFile(inxml, &inXmlPtr, MAX_FILE) < 0)
|
|
goto fail;
|
|
if (virtTestLoadFile(outxml, &outXmlPtr, MAX_FILE) < 0)
|
|
goto fail;
|
|
|
|
if (!(dev = virNWFilterDefParseString(NULL, inXmlData)))
|
|
goto fail;
|
|
|
|
if (!(actual = virNWFilterDefFormat(dev)))
|
|
goto fail;
|
|
|
|
if (STRNEQ(outXmlData, actual)) {
|
|
virtTestDifference(stderr, outXmlData, actual);
|
|
goto fail;
|
|
}
|
|
|
|
ret = 0;
|
|
|
|
fail:
|
|
free(actual);
|
|
virNWFilterDefFree(dev);
|
|
return ret;
|
|
}
|
|
|
|
static int testCompareXMLToXMLHelper(const void *data) {
|
|
char inxml[PATH_MAX];
|
|
char outxml[PATH_MAX];
|
|
snprintf(inxml, PATH_MAX, "%s/nwfilterxml2xmlin/%s.xml",
|
|
abs_srcdir, (const char*)data);
|
|
snprintf(outxml, PATH_MAX, "%s/nwfilterxml2xmlout/%s.xml",
|
|
abs_srcdir, (const char*)data);
|
|
return testCompareXMLToXMLFiles(inxml, outxml);
|
|
}
|
|
|
|
|
|
static int
|
|
mymain(int argc, char **argv)
|
|
{
|
|
int ret = 0;
|
|
char cwd[PATH_MAX];
|
|
|
|
progname = argv[0];
|
|
|
|
if (argc > 1) {
|
|
fprintf(stderr, "Usage: %s\n", progname);
|
|
return (EXIT_FAILURE);
|
|
}
|
|
|
|
abs_srcdir = getenv("abs_srcdir");
|
|
if (!abs_srcdir)
|
|
abs_srcdir = getcwd(cwd, sizeof(cwd));
|
|
|
|
#define DO_TEST(name) \
|
|
if (virtTestRun("NWFilter XML-2-XML " name, \
|
|
1, testCompareXMLToXMLHelper, (name)) < 0) \
|
|
ret = -1
|
|
|
|
DO_TEST("mac-test");
|
|
DO_TEST("arp-test");
|
|
DO_TEST("ip-test");
|
|
DO_TEST("ipv6-test");
|
|
|
|
DO_TEST("tcp-test");
|
|
DO_TEST("udp-test");
|
|
DO_TEST("icmp-test");
|
|
DO_TEST("igmp-test");
|
|
DO_TEST("sctp-test");
|
|
DO_TEST("udplite-test");
|
|
DO_TEST("esp-test");
|
|
DO_TEST("ah-test");
|
|
DO_TEST("all-test");
|
|
|
|
DO_TEST("tcp-ipv6-test");
|
|
DO_TEST("udp-ipv6-test");
|
|
DO_TEST("icmpv6-test");
|
|
DO_TEST("sctp-ipv6-test");
|
|
DO_TEST("udplite-ipv6-test");
|
|
DO_TEST("esp-ipv6-test");
|
|
DO_TEST("ah-ipv6-test");
|
|
DO_TEST("all-ipv6-test");
|
|
|
|
DO_TEST("ref-test");
|
|
DO_TEST("ref-rule-test");
|
|
DO_TEST("ipt-no-macspoof-test");
|
|
DO_TEST("icmp-direction-test");
|
|
DO_TEST("icmp-direction2-test");
|
|
DO_TEST("icmp-direction3-test");
|
|
|
|
DO_TEST("conntrack-test");
|
|
|
|
DO_TEST("hex-data-test");
|
|
|
|
return (ret==0 ? EXIT_SUCCESS : EXIT_FAILURE);
|
|
}
|
|
|
|
VIRT_TEST_MAIN(mymain)
|