search

CESNET / ipfixcol

IPFIXcol is an implementation of an IPFIX (RFC 7011) collector
Other
64 stars 37 forks source link

IPFIX file input: fixed XML config file parsing bug #84

Closed ghost closed 9 years ago

ghost commented 9 years ago

This commit fixes a bug that causes the following startup configuration not to be parsed correctly:

<?xml version="1.0" encoding="UTF-8"?>
<ipfix xmlns="urn:ietf:params:xml:ns:yang:ietf-ipfix-psamp">
    <collectingProcess>
        <name>TCP collector</name>
        <fileReader>
            <!-- Some comment -->
            <file>file:./ipfixcol/base/tests/ipfixcol_test/tests/ipfix_data/01-odid0.ipfix</file>
        </fileReader>
        <exportingProcess>File viewer</exportingProcess>
    </collectingProcess>

    <exportingProcess>
        <name>File viewer</name>
        <destination>
            <name>File viewer</name>
            <fileWriter>
                <fileFormat>ipfix</fileFormat>
                <file>file:./out.ipfix</file>
            </fileWriter>
        </destination>
    </exportingProcess>
</ipfix>

Before, XML configuration file parsing would stop after the first child node within <fileReader>, which may be a comment, as in the provided example.