diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-14 03:50:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-14 03:50:43 -0700 |
| commit | 334f8b2afd9652e20f67ddee4fec483ed860425b (patch) | |
| tree | 35d4fb46a9dc145e831fe5da026f2bfd9ee6657c /net/ipv6/netfilter/ip6t_LOG.c | |
| parent | 7477fd2e6b676fcd15861c2a96a7172f71afe0a5 (diff) | |
| parent | ef1a5a50bbd509b8697dcd4d13017e9e0053867b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.26
Diffstat (limited to 'net/ipv6/netfilter/ip6t_LOG.c')
| -rw-r--r-- | net/ipv6/netfilter/ip6t_LOG.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/ipv6/netfilter/ip6t_LOG.c b/net/ipv6/netfilter/ip6t_LOG.c index 86a613810b6..3a2316974f8 100644 --- a/net/ipv6/netfilter/ip6t_LOG.c +++ b/net/ipv6/netfilter/ip6t_LOG.c @@ -363,11 +363,15 @@ static void dump_packet(const struct nf_loginfo *info, if ((logflags & IP6T_LOG_UID) && recurse && skb->sk) { read_lock_bh(&skb->sk->sk_callback_lock); if (skb->sk->sk_socket && skb->sk->sk_socket->file) - printk("UID=%u GID=%u", + printk("UID=%u GID=%u ", skb->sk->sk_socket->file->f_uid, skb->sk->sk_socket->file->f_gid); read_unlock_bh(&skb->sk->sk_callback_lock); } + + /* Max length: 16 "MARK=0xFFFFFFFF " */ + if (!recurse && skb->mark) + printk("MARK=0x%x ", skb->mark); } static struct nf_loginfo default_loginfo = { |