diff options
| author | An-Cheng Huang <ancheng@vyatta.com> | 2008-02-08 16:46:21 -0800 |
|---|---|---|
| committer | An-Cheng Huang <ancheng@vyatta.com> | 2008-02-08 16:46:21 -0800 |
| commit | e51bc73ce7b196e0bf02c41faa33237dc2dd138e (patch) | |
| tree | 65cee2ced5cf7bbd4283c51e9fe3aecf52e8a46c | |
| parent | 17fd3bf4548804e1442eb0f1d12932d1dfd37cb9 (diff) | |
| download | vyatta-op-firewall-e51bc73ce7b196e0bf02c41faa33237dc2dd138e.tar.gz vyatta-op-firewall-e51bc73ce7b196e0bf02c41faa33237dc2dd138e.zip | |
merge ports in show output
| -rw-r--r-- | src/xsl/show_firewall.xsl | 42 | ||||
| -rw-r--r-- | src/xsl/show_firewall_detail.xsl | 28 |
2 files changed, 10 insertions, 60 deletions
diff --git a/src/xsl/show_firewall.xsl b/src/xsl/show_firewall.xsl index d40f024..158d970 100644 --- a/src/xsl/show_firewall.xsl +++ b/src/xsl/show_firewall.xsl @@ -147,52 +147,22 @@ <xsl:text>&newln;</xsl:text> - <xsl:if test="src_port_num!='' or src_port_name!='' or src_port_start!=''"> + <xsl:if test="src_port!=''"> <xsl:value-of select="$pad6"/> <xsl:value-of select="$pad8"/> <xsl:text>src ports: </xsl:text> - <xsl:if test="src_port_num!=''"> - <xsl:value-of select="src_port_num"/> - <xsl:if test="src_port_name!='' or src_port_start!=''"> - <xsl:text>,</xsl:text> - </xsl:if> - </xsl:if> - <xsl:if test="src_port_name!=''"> - <xsl:value-of select="src_port_name"/> - <xsl:if test="src_port_start!=''"> - <xsl:text>,</xsl:text> - </xsl:if> - </xsl:if> - <xsl:if test="src_port_start!=''"> - <xsl:value-of select="src_port_start"/> - <xsl:text>-</xsl:text> - <xsl:value-of select="src_port_stop"/> - </xsl:if> + <xsl:value-of select="src_port"/> + <xsl:text>&newln;</xsl:text> </xsl:if> - <xsl:if test="dst_port_num!='' or dst_port_name!='' or dst_port_start!=''"> + <xsl:if test="dst_port!=''"> <xsl:value-of select="$pad6"/> <xsl:value-of select="$pad8"/> <xsl:value-of select="$pad20"/> <xsl:text>dst ports: </xsl:text> - <xsl:if test="dst_port_num!=''"> - <xsl:value-of select="dst_port_num"/> - <xsl:if test="dst_port_name!='' or dst_port_start!=''"> - <xsl:text>,</xsl:text> - </xsl:if> - </xsl:if> - <xsl:if test="dst_port_name!=''"> - <xsl:value-of select="dst_port_name"/> - <xsl:if test="dst_port_start!=''"> - <xsl:text>,</xsl:text> - </xsl:if> - </xsl:if> - <xsl:if test="dst_port_start!=''"> - <xsl:value-of select="dst_port_start"/> - <xsl:text>-</xsl:text> - <xsl:value-of select="dst_port_stop"/> - </xsl:if> + <xsl:value-of select="dst_port"/> + <xsl:text>&newln;</xsl:text> </xsl:if> diff --git a/src/xsl/show_firewall_detail.xsl b/src/xsl/show_firewall_detail.xsl index 6e970cb..bd817c8 100644 --- a/src/xsl/show_firewall_detail.xsl +++ b/src/xsl/show_firewall_detail.xsl @@ -135,18 +135,8 @@ <xsl:text> Ports: </xsl:text> <xsl:choose> - <xsl:when test="src_port_num!='0'"> - <xsl:value-of select="src_port_num"/> - </xsl:when> - - <xsl:when test="src_port_start!='0'"> - <xsl:value-of select="src_port_start"/> - <xsl:text>:</xsl:text> - <xsl:value-of select="src_port_stop"/> - </xsl:when> - - <xsl:when test="src_port_name!=''"> - <xsl:value-of select="src_port_name"/> + <xsl:when test="src_port!=''"> + <xsl:value-of select="src_port"/> </xsl:when> <xsl:otherwise> @@ -181,18 +171,8 @@ <xsl:text> Ports: </xsl:text> <xsl:choose> - <xsl:when test="dst_port_num!='0'"> - <xsl:value-of select="dst_port_num"/> - </xsl:when> - - <xsl:when test="dst_port_start!='0'"> - <xsl:value-of select="dst_port_start"/> - <xsl:text>:</xsl:text> - <xsl:value-of select="dst_port_stop"/> - </xsl:when> - - <xsl:when test="dst_port_name!=''"> - <xsl:value-of select="dst_port_name"/> + <xsl:when test="dst_port!=''"> + <xsl:value-of select="dst_port"/> </xsl:when> <xsl:otherwise> |