git://git.onelab.eu
/
iptables.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to iptables-1.3.5
[iptables.git]
/
extensions
/
libipt_conntrack.c
diff --git
a/extensions/libipt_conntrack.c
b/extensions/libipt_conntrack.c
index
5521684
..
cdb86c4
100644
(file)
--- a/
extensions/libipt_conntrack.c
+++ b/
extensions/libipt_conntrack.c
@@
-414,8
+414,8
@@
print_addr(struct in_addr *addr, struct in_addr *mask, int inv, int numeric)
{
char buf[BUFSIZ];
{
char buf[BUFSIZ];
- if (inv)
-
fputc('!', stdout
);
+ if (inv)
+
printf("! "
);
if (mask->s_addr == 0L && !numeric)
printf("%s ", "anywhere");
if (mask->s_addr == 0L && !numeric)
printf("%s ", "anywhere");
@@
-442,6
+442,13
@@
matchinfo_print(const struct ipt_ip *ip, const struct ipt_entry_match *match, in
print_state(sinfo->statemask);
}
print_state(sinfo->statemask);
}
+ if(sinfo->flags & IPT_CONNTRACK_PROTO) {
+ printf("%sctproto ", optpfx);
+ if (sinfo->invflags & IPT_CONNTRACK_PROTO)
+ printf("! ");
+ printf("%u ", sinfo->tuple[IP_CT_DIR_ORIGINAL].dst.protonum);
+ }
+
if(sinfo->flags & IPT_CONNTRACK_ORIGSRC) {
printf("%sctorigsrc ", optpfx);
if(sinfo->flags & IPT_CONNTRACK_ORIGSRC) {
printf("%sctorigsrc ", optpfx);