Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13fa745d authored by Joe Perches's avatar Joe Perches Committed by Pablo Neira Ayuso
Browse files

netfilter: Use pr_cont where appropriate 



Logging output was changed when simple printks without KERN_CONT
are now emitted on a new line and KERN_CONT is required to continue
lines so use pr_cont.

Miscellanea:

o realign arguments
o use print_hex_dump instead of a local variant

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 3206cade

net/bridge/netfilter/ebt_log.c

+17 −17
Original line number Original line Diff line number Diff line
@@ -62,10 +62,10 @@ print_ports(const struct sk_buff *skb, uint8_t protocol, int offset) 
		pptr = skb_header_pointer(skb, offset,

		pptr = skb_header_pointer(skb, offset,

					  sizeof(_ports), &_ports);

					  sizeof(_ports), &_ports);

		if (pptr == NULL) {

		if (pptr == NULL) {

			printk(" INCOMPLETE TCP/UDP header");

			pr_cont(" INCOMPLETE TCP/UDP header");

			return;

			return;

		}

		}

		printk(" SPT=%u DPT=%u", ntohs(pptr->src), ntohs(pptr->dst));

		pr_cont(" SPT=%u DPT=%u", ntohs(pptr->src), ntohs(pptr->dst));

	}

	}

}

}
@@ -100,10 +100,10 @@ ebt_log_packet(struct net *net, u_int8_t pf, unsigned int hooknum, 




		ih = skb_header_pointer(skb, 0, sizeof(_iph), &_iph);

		ih = skb_header_pointer(skb, 0, sizeof(_iph), &_iph);

		if (ih == NULL) {

		if (ih == NULL) {

			printk(" INCOMPLETE IP header");

			pr_cont(" INCOMPLETE IP header");

			goto out;

			goto out;

		}

		}

		printk(" IP SRC=%pI4 IP DST=%pI4, IP tos=0x%02X, IP proto=%d",

		pr_cont(" IP SRC=%pI4 IP DST=%pI4, IP tos=0x%02X, IP proto=%d",

			&ih->saddr, &ih->daddr, ih->tos, ih->protocol);

			&ih->saddr, &ih->daddr, ih->tos, ih->protocol);

		print_ports(skb, ih->protocol, ih->ihl*4);

		print_ports(skb, ih->protocol, ih->ihl*4);

		goto out;

		goto out;
@@ -120,10 +120,10 @@ ebt_log_packet(struct net *net, u_int8_t pf, unsigned int hooknum, 




		ih = skb_header_pointer(skb, 0, sizeof(_iph), &_iph);

		ih = skb_header_pointer(skb, 0, sizeof(_iph), &_iph);

		if (ih == NULL) {

		if (ih == NULL) {

			printk(" INCOMPLETE IPv6 header");

			pr_cont(" INCOMPLETE IPv6 header");

			goto out;

			goto out;

		}

		}

		printk(" IPv6 SRC=%pI6 IPv6 DST=%pI6, IPv6 priority=0x%01X, Next Header=%d",

		pr_cont(" IPv6 SRC=%pI6 IPv6 DST=%pI6, IPv6 priority=0x%01X, Next Header=%d",

			&ih->saddr, &ih->daddr, ih->priority, ih->nexthdr);

			&ih->saddr, &ih->daddr, ih->priority, ih->nexthdr);

		nexthdr = ih->nexthdr;

		nexthdr = ih->nexthdr;

		offset_ph = ipv6_skip_exthdr(skb, sizeof(_iph), &nexthdr, &frag_off);

		offset_ph = ipv6_skip_exthdr(skb, sizeof(_iph), &nexthdr, &frag_off);
@@ -142,10 +142,10 @@ ebt_log_packet(struct net *net, u_int8_t pf, unsigned int hooknum, 




		ah = skb_header_pointer(skb, 0, sizeof(_arph), &_arph);

		ah = skb_header_pointer(skb, 0, sizeof(_arph), &_arph);

		if (ah == NULL) {

		if (ah == NULL) {

			printk(" INCOMPLETE ARP header");

			pr_cont(" INCOMPLETE ARP header");

			goto out;

			goto out;

		}

		}

		printk(" ARP HTYPE=%d, PTYPE=0x%04x, OPCODE=%d",

		pr_cont(" ARP HTYPE=%d, PTYPE=0x%04x, OPCODE=%d",

			ntohs(ah->ar_hrd), ntohs(ah->ar_pro),

			ntohs(ah->ar_hrd), ntohs(ah->ar_pro),

			ntohs(ah->ar_op));

			ntohs(ah->ar_op));
@@ -161,17 +161,17 @@ ebt_log_packet(struct net *net, u_int8_t pf, unsigned int hooknum, 
			ap = skb_header_pointer(skb, sizeof(_arph),

			ap = skb_header_pointer(skb, sizeof(_arph),

						sizeof(_arpp), &_arpp);

						sizeof(_arpp), &_arpp);

			if (ap == NULL) {

			if (ap == NULL) {

				printk(" INCOMPLETE ARP payload");

				pr_cont(" INCOMPLETE ARP payload");

				goto out;

				goto out;

			}

			}

			printk(" ARP MAC SRC=%pM ARP IP SRC=%pI4 ARP MAC DST=%pM ARP IP DST=%pI4",

			pr_cont(" ARP MAC SRC=%pM ARP IP SRC=%pI4 ARP MAC DST=%pM ARP IP DST=%pI4",

					ap->mac_src, ap->ip_src, ap->mac_dst, ap->ip_dst);

				ap->mac_src, ap->ip_src,

				ap->mac_dst, ap->ip_dst);

		}

		}

	}

	}

out:

out:

	printk("\n");

	pr_cont("\n");

	spin_unlock_bh(&ebt_log_lock);

	spin_unlock_bh(&ebt_log_lock);



}

}





static unsigned int

static unsigned int

net/ipv4/netfilter/nf_nat_snmp_basic.c

+2 −13
Original line number Original line Diff line number Diff line
@@ -998,18 +998,6 @@ static unsigned char snmp_trap_decode(struct asn1_ctx *ctx, 
 *

 *

 *****************************************************************************/

 *****************************************************************************/





static void hex_dump(const unsigned char *buf, size_t len)

{

	size_t i;



	for (i = 0; i < len; i++) {

		if (i && !(i % 16))

			printk("\n");

		printk("%02x ", *(buf + i));

	}

	printk("\n");

}



/*

/*

 * Parse and mangle SNMP message according to mapping.

 * Parse and mangle SNMP message according to mapping.

 * (And this is the fucking 'basic' method).

 * (And this is the fucking 'basic' method).
@@ -1026,7 +1014,8 @@ static int snmp_parse_mangle(unsigned char *msg, 
	struct snmp_object *obj;

	struct snmp_object *obj;





	if (debug > 1)

	if (debug > 1)

		hex_dump(msg, len);

		print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_NONE, 16, 1,

			       msg, len, 0);





	asn1_open(&ctx, msg, len);

	asn1_open(&ctx, msg, len);