summaryrefslogtreecommitdiff
path: root/src/xsl/show_firewall.xsl
diff options
context:
space:
mode:
authorAn-Cheng Huang <ancheng@vyatta.com>2008-02-08 16:46:21 -0800
committerAn-Cheng Huang <ancheng@vyatta.com>2008-02-08 16:46:21 -0800
commite51bc73ce7b196e0bf02c41faa33237dc2dd138e (patch)
tree65cee2ced5cf7bbd4283c51e9fe3aecf52e8a46c /src/xsl/show_firewall.xsl
parent17fd3bf4548804e1442eb0f1d12932d1dfd37cb9 (diff)
downloadvyatta-op-firewall-e51bc73ce7b196e0bf02c41faa33237dc2dd138e.tar.gz
vyatta-op-firewall-e51bc73ce7b196e0bf02c41faa33237dc2dd138e.zip
merge ports in show output
Diffstat (limited to 'src/xsl/show_firewall.xsl')
-rw-r--r--src/xsl/show_firewall.xsl42
1 files changed, 6 insertions, 36 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>