[libnetfilter_conntrack] snprintf: fix missing port output in DCCP

[Pablo Neira]

Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=libnetfilter_conntrack.git;a=commit;h=0eaadff13bd26d148ed3e8119cf0367b940d8aec
commit 0eaadff13bd26d148ed3e8119cf0367b940d8aec
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Fri Apr 24 11:23:23 2009 +0200
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Fri Apr 24 11:23:23 2009 +0200

    snprintf: fix missing port output in DCCP
    
    This patch adds missing DCCP ports in the output:
    
    # conntrack -D -p dccp
    dccp     33 18 RESPOND src=1.1.1.1 dst=2.2.2.2 packets=0 bytes=0 [UNREPLIED] src=2.2.2.2 dst=1.1.1.1 packets=0 bytes=0 mark=0 secmark=0 use=2
    conntrack v0.9.12 (conntrack-tools): 1 flow entries have been deleted.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
       via  0eaadff13bd26d148ed3e8119cf0367b940d8aec (commit)
      from  9e14fc1e939bca84ead84140db12f757e336cc4b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0eaadff13bd26d148ed3e8119cf0367b940d8aec
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Fri Apr 24 11:23:23 2009 +0200

    snprintf: fix missing port output in DCCP
    
    This patch adds missing DCCP ports in the output:
    
    # conntrack -D -p dccp
    dccp     33 18 RESPOND src=1.1.1.1 dst=2.2.2.2 packets=0 bytes=0 [UNREPLIED] src=2.2.2.2 dst=1.1.1.1 packets=0 bytes=0 mark=0 secmark=0 use=2
    conntrack v0.9.12 (conntrack-tools): 1 flow entries have been deleted.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

-----------------------------------------------------------------------

 src/conntrack/snprintf_default.c |    1 +
 src/conntrack/snprintf_xml.c     |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)
This patch adds missing DCCP ports in the output:

# conntrack -D -p dccp
dccp     33 18 RESPOND src=1.1.1.1 dst=2.2.2.2 packets=0 bytes=0 [UNREPLIED] src=2.2.2.2 dst=1.1.1.1 packets=0 bytes=0 mark=0 secmark=0 use=2
conntrack v0.9.12 (conntrack-tools): 1 flow entries have been deleted.

Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

diff --git a/src/conntrack/snprintf_default.c b/src/conntrack/snprintf_default.c
index 5934306..6eda16c 100644
--- a/src/conntrack/snprintf_default.c
+++ b/src/conntrack/snprintf_default.c
@@ -126,6 +126,7 @@ int __snprintf_proto(char *buf,
 	case IPPROTO_UDP:
 	case IPPROTO_UDPLITE:
 	case IPPROTO_SCTP:
+	case IPPROTO_DCCP:
 		return snprintf(buf, len, "sport=%u dport=%u ",
 			        ntohs(tuple->l4src.tcp.port),
 			        ntohs(tuple->l4dst.tcp.port));
diff --git a/src/conntrack/snprintf_xml.c b/src/conntrack/snprintf_xml.c
index e103974..17e0cd4 100644
--- a/src/conntrack/snprintf_xml.c
+++ b/src/conntrack/snprintf_xml.c
@@ -152,6 +152,7 @@ static int __snprintf_proto_xml(char *buf,
 	case IPPROTO_UDP:
 	case IPPROTO_UDPLITE:
 	case IPPROTO_SCTP:
+	case IPPROTO_DCCP:
 		if (type == __ADDR_SRC) {
 			ret = snprintf(buf, len, "<sport>%u</sport>", 
 				       ntohs(tuple->l4src.tcp.port));