Commit 8cb2a7d5 authored by Liping Zhang's avatar Liping Zhang Committed by Pablo Neira Ayuso

netfilter: nf_log: get rid of XT_LOG_* macros

nf_log is used by both nftables and iptables, so use XT_LOG_XXX macros
here is not appropriate. Replace them with NF_LOG_XXX.
Signed-off-by: default avatarLiping Zhang <liping.zhang@spreadtrum.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent ff107d27
...@@ -76,7 +76,7 @@ static void dump_ipv4_packet(struct nf_log_buf *m, ...@@ -76,7 +76,7 @@ static void dump_ipv4_packet(struct nf_log_buf *m,
if (ntohs(ih->frag_off) & IP_OFFSET) if (ntohs(ih->frag_off) & IP_OFFSET)
nf_log_buf_add(m, "FRAG:%u ", ntohs(ih->frag_off) & IP_OFFSET); nf_log_buf_add(m, "FRAG:%u ", ntohs(ih->frag_off) & IP_OFFSET);
if ((logflags & XT_LOG_IPOPT) && if ((logflags & NF_LOG_IPOPT) &&
ih->ihl * 4 > sizeof(struct iphdr)) { ih->ihl * 4 > sizeof(struct iphdr)) {
const unsigned char *op; const unsigned char *op;
unsigned char _opt[4 * 15 - sizeof(struct iphdr)]; unsigned char _opt[4 * 15 - sizeof(struct iphdr)];
...@@ -250,7 +250,7 @@ static void dump_ipv4_packet(struct nf_log_buf *m, ...@@ -250,7 +250,7 @@ static void dump_ipv4_packet(struct nf_log_buf *m,
} }
/* Max length: 15 "UID=4294967295 " */ /* Max length: 15 "UID=4294967295 " */
if ((logflags & XT_LOG_UID) && !iphoff) if ((logflags & NF_LOG_UID) && !iphoff)
nf_log_dump_sk_uid_gid(m, skb->sk); nf_log_dump_sk_uid_gid(m, skb->sk);
/* Max length: 16 "MARK=0xFFFFFFFF " */ /* Max length: 16 "MARK=0xFFFFFFFF " */
...@@ -282,7 +282,7 @@ static void dump_ipv4_mac_header(struct nf_log_buf *m, ...@@ -282,7 +282,7 @@ static void dump_ipv4_mac_header(struct nf_log_buf *m,
if (info->type == NF_LOG_TYPE_LOG) if (info->type == NF_LOG_TYPE_LOG)
logflags = info->u.log.logflags; logflags = info->u.log.logflags;
if (!(logflags & XT_LOG_MACDECODE)) if (!(logflags & NF_LOG_MACDECODE))
goto fallback; goto fallback;
switch (dev->type) { switch (dev->type) {
......
...@@ -84,7 +84,7 @@ static void dump_ipv6_packet(struct nf_log_buf *m, ...@@ -84,7 +84,7 @@ static void dump_ipv6_packet(struct nf_log_buf *m,
} }
/* Max length: 48 "OPT (...) " */ /* Max length: 48 "OPT (...) " */
if (logflags & XT_LOG_IPOPT) if (logflags & NF_LOG_IPOPT)
nf_log_buf_add(m, "OPT ( "); nf_log_buf_add(m, "OPT ( ");
switch (currenthdr) { switch (currenthdr) {
...@@ -121,7 +121,7 @@ static void dump_ipv6_packet(struct nf_log_buf *m, ...@@ -121,7 +121,7 @@ static void dump_ipv6_packet(struct nf_log_buf *m,
case IPPROTO_ROUTING: case IPPROTO_ROUTING:
case IPPROTO_HOPOPTS: case IPPROTO_HOPOPTS:
if (fragment) { if (fragment) {
if (logflags & XT_LOG_IPOPT) if (logflags & NF_LOG_IPOPT)
nf_log_buf_add(m, ")"); nf_log_buf_add(m, ")");
return; return;
} }
...@@ -129,7 +129,7 @@ static void dump_ipv6_packet(struct nf_log_buf *m, ...@@ -129,7 +129,7 @@ static void dump_ipv6_packet(struct nf_log_buf *m,
break; break;
/* Max Length */ /* Max Length */
case IPPROTO_AH: case IPPROTO_AH:
if (logflags & XT_LOG_IPOPT) { if (logflags & NF_LOG_IPOPT) {
struct ip_auth_hdr _ahdr; struct ip_auth_hdr _ahdr;
const struct ip_auth_hdr *ah; const struct ip_auth_hdr *ah;
...@@ -161,7 +161,7 @@ static void dump_ipv6_packet(struct nf_log_buf *m, ...@@ -161,7 +161,7 @@ static void dump_ipv6_packet(struct nf_log_buf *m,
hdrlen = (hp->hdrlen+2)<<2; hdrlen = (hp->hdrlen+2)<<2;
break; break;
case IPPROTO_ESP: case IPPROTO_ESP:
if (logflags & XT_LOG_IPOPT) { if (logflags & NF_LOG_IPOPT) {
struct ip_esp_hdr _esph; struct ip_esp_hdr _esph;
const struct ip_esp_hdr *eh; const struct ip_esp_hdr *eh;
...@@ -194,7 +194,7 @@ static void dump_ipv6_packet(struct nf_log_buf *m, ...@@ -194,7 +194,7 @@ static void dump_ipv6_packet(struct nf_log_buf *m,
nf_log_buf_add(m, "Unknown Ext Hdr %u", currenthdr); nf_log_buf_add(m, "Unknown Ext Hdr %u", currenthdr);
return; return;
} }
if (logflags & XT_LOG_IPOPT) if (logflags & NF_LOG_IPOPT)
nf_log_buf_add(m, ") "); nf_log_buf_add(m, ") ");
currenthdr = hp->nexthdr; currenthdr = hp->nexthdr;
...@@ -277,7 +277,7 @@ static void dump_ipv6_packet(struct nf_log_buf *m, ...@@ -277,7 +277,7 @@ static void dump_ipv6_packet(struct nf_log_buf *m,
} }
/* Max length: 15 "UID=4294967295 " */ /* Max length: 15 "UID=4294967295 " */
if ((logflags & XT_LOG_UID) && recurse) if ((logflags & NF_LOG_UID) && recurse)
nf_log_dump_sk_uid_gid(m, skb->sk); nf_log_dump_sk_uid_gid(m, skb->sk);
/* Max length: 16 "MARK=0xFFFFFFFF " */ /* Max length: 16 "MARK=0xFFFFFFFF " */
...@@ -295,7 +295,7 @@ static void dump_ipv6_mac_header(struct nf_log_buf *m, ...@@ -295,7 +295,7 @@ static void dump_ipv6_mac_header(struct nf_log_buf *m,
if (info->type == NF_LOG_TYPE_LOG) if (info->type == NF_LOG_TYPE_LOG)
logflags = info->u.log.logflags; logflags = info->u.log.logflags;
if (!(logflags & XT_LOG_MACDECODE)) if (!(logflags & NF_LOG_MACDECODE))
goto fallback; goto fallback;
switch (dev->type) { switch (dev->type) {
......
...@@ -77,7 +77,7 @@ int nf_log_dump_tcp_header(struct nf_log_buf *m, const struct sk_buff *skb, ...@@ -77,7 +77,7 @@ int nf_log_dump_tcp_header(struct nf_log_buf *m, const struct sk_buff *skb,
nf_log_buf_add(m, "SPT=%u DPT=%u ", nf_log_buf_add(m, "SPT=%u DPT=%u ",
ntohs(th->source), ntohs(th->dest)); ntohs(th->source), ntohs(th->dest));
/* Max length: 30 "SEQ=4294967295 ACK=4294967295 " */ /* Max length: 30 "SEQ=4294967295 ACK=4294967295 " */
if (logflags & XT_LOG_TCPSEQ) { if (logflags & NF_LOG_TCPSEQ) {
nf_log_buf_add(m, "SEQ=%u ACK=%u ", nf_log_buf_add(m, "SEQ=%u ACK=%u ",
ntohl(th->seq), ntohl(th->ack_seq)); ntohl(th->seq), ntohl(th->ack_seq));
} }
...@@ -107,7 +107,7 @@ int nf_log_dump_tcp_header(struct nf_log_buf *m, const struct sk_buff *skb, ...@@ -107,7 +107,7 @@ int nf_log_dump_tcp_header(struct nf_log_buf *m, const struct sk_buff *skb,
/* Max length: 11 "URGP=65535 " */ /* Max length: 11 "URGP=65535 " */
nf_log_buf_add(m, "URGP=%u ", ntohs(th->urg_ptr)); nf_log_buf_add(m, "URGP=%u ", ntohs(th->urg_ptr));
if ((logflags & XT_LOG_TCPOPT) && th->doff*4 > sizeof(struct tcphdr)) { if ((logflags & NF_LOG_TCPOPT) && th->doff*4 > sizeof(struct tcphdr)) {
u_int8_t _opt[60 - sizeof(struct tcphdr)]; u_int8_t _opt[60 - sizeof(struct tcphdr)];
const u_int8_t *op; const u_int8_t *op;
unsigned int i; unsigned int i;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment