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

Commit cffee385 authored by Harvey Harrison's avatar Harvey Harrison Committed by David S. Miller
Browse files

net: replace NIPQUAD() in net/ipv4/netfilter/ 



Using NIPQUAD() with NIPQUAD_FMT, %d.%d.%d.%d or %u.%u.%u.%u
can be replaced with %pI4

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 77be155c

net/ipv4/netfilter/arp_tables.c

+8 −8
Original line number Diff line number Diff line
@@ -142,15 +142,15 @@ static inline int arp_packet_match(const struct arphdr *arphdr, 
		  ARPT_INV_TGTIP)) {

		dprintf("Source or target IP address mismatch.\n");



		dprintf("SRC: %u.%u.%u.%u. Mask: %u.%u.%u.%u. Target: %u.%u.%u.%u.%s\n",

			NIPQUAD(src_ipaddr),

			NIPQUAD(arpinfo->smsk.s_addr),

			NIPQUAD(arpinfo->src.s_addr),

		dprintf("SRC: %pI4. Mask: %pI4. Target: %pI4.%s\n",

			&src_ipaddr,

			&arpinfo->smsk.s_addr,

			&arpinfo->src.s_addr,

			arpinfo->invflags & ARPT_INV_SRCIP ? " (INV)" : "");

		dprintf("TGT: %u.%u.%u.%u Mask: %u.%u.%u.%u Target: %u.%u.%u.%u.%s\n",

			NIPQUAD(tgt_ipaddr),

			NIPQUAD(arpinfo->tmsk.s_addr),

			NIPQUAD(arpinfo->tgt.s_addr),

		dprintf("TGT: %pI4 Mask: %pI4 Target: %pI4.%s\n",

			&tgt_ipaddr,

			&arpinfo->tmsk.s_addr,

			&arpinfo->tgt.s_addr,

			arpinfo->invflags & ARPT_INV_TGTIP ? " (INV)" : "");

		return 0;

	}

net/ipv4/netfilter/ip_tables.c

+4 −8
Original line number Diff line number Diff line
@@ -94,15 +94,11 @@ ip_packet_match(const struct iphdr *ip, 
		     IPT_INV_DSTIP)) {

		dprintf("Source or dest mismatch.\n");



		dprintf("SRC: %u.%u.%u.%u. Mask: %u.%u.%u.%u. Target: %u.%u.%u.%u.%s\n",

			NIPQUAD(ip->saddr),

			NIPQUAD(ipinfo->smsk.s_addr),

			NIPQUAD(ipinfo->src.s_addr),

		dprintf("SRC: %pI4. Mask: %pI4. Target: %pI4.%s\n",

			&ip->saddr, &ipinfo->smsk.s_addr, &ipinfo->src.s_addr,

			ipinfo->invflags & IPT_INV_SRCIP ? " (INV)" : "");

		dprintf("DST: %u.%u.%u.%u Mask: %u.%u.%u.%u Target: %u.%u.%u.%u.%s\n",

			NIPQUAD(ip->daddr),

			NIPQUAD(ipinfo->dmsk.s_addr),

			NIPQUAD(ipinfo->dst.s_addr),

		dprintf("DST: %pI4 Mask: %pI4 Target: %pI4.%s\n",

			&ip->daddr, &ipinfo->dmsk.s_addr, &ipinfo->dst.s_addr,

			ipinfo->invflags & IPT_INV_DSTIP ? " (INV)" : "");

		return false;

	}

net/ipv4/netfilter/ipt_CLUSTERIP.c

+4 −5
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ clusterip_config_init(const struct ipt_clusterip_tgt_info *i, __be32 ip, 
		char buffer[16];



		/* create proc dir entry */

		sprintf(buffer, "%u.%u.%u.%u", NIPQUAD(ip));

		sprintf(buffer, "%pI4", &ip);

		c->pde = proc_create_data(buffer, S_IWUSR|S_IRUSR,

					  clusterip_procdir,

					  &clusterip_proc_fops, c);
@@ -373,7 +373,7 @@ static bool clusterip_tg_check(const struct xt_tgchk_param *par) 
	config = clusterip_config_find_get(e->ip.dst.s_addr, 1);

	if (!config) {

		if (!(cipinfo->flags & CLUSTERIP_FLAG_NEW)) {

			printk(KERN_WARNING "CLUSTERIP: no config found for %u.%u.%u.%u, need 'new'\n", NIPQUAD(e->ip.dst.s_addr));

			printk(KERN_WARNING "CLUSTERIP: no config found for %pI4, need 'new'\n", &e->ip.dst.s_addr);

			return false;

		} else {

			struct net_device *dev;
@@ -478,9 +478,8 @@ static void arp_print(struct arp_payload *payload) 
	}

	hbuffer[--k]='\0';



	printk("src %u.%u.%u.%u@%s, dst %u.%u.%u.%u\n",

		NIPQUAD(payload->src_ip), hbuffer,

		NIPQUAD(payload->dst_ip));

	printk("src %pI4@%s, dst %pI4\n",

		&payload->src_ip, hbuffer, &payload->dst_ip);

}

#endif

net/ipv4/netfilter/ipt_LOG.c

+3 −4
Original line number Diff line number Diff line
@@ -54,8 +54,8 @@ static void dump_packet(const struct nf_loginfo *info, 
	/* Important fields:

	 * TOS, len, DF/MF, fragment offset, TTL, src, dst, options. */

	/* Max length: 40 "SRC=255.255.255.255 DST=255.255.255.255 " */

	printk("SRC=%u.%u.%u.%u DST=%u.%u.%u.%u ",

	       NIPQUAD(ih->saddr), NIPQUAD(ih->daddr));

	printk("SRC=%pI4 DST=%pI4 ",

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



	/* Max length: 46 "LEN=65535 TOS=0xFF PREC=0xFF TTL=255 ID=65535 " */

	printk("LEN=%u TOS=0x%02X PREC=0x%02X TTL=%u ID=%u ",
@@ -262,8 +262,7 @@ static void dump_packet(const struct nf_loginfo *info, 
			break;

		case ICMP_REDIRECT:

			/* Max length: 24 "GATEWAY=255.255.255.255 " */

			printk("GATEWAY=%u.%u.%u.%u ",

			       NIPQUAD(ich->un.gateway));

			printk("GATEWAY=%pI4 ", &ich->un.gateway);

			/* Fall through */

		case ICMP_DEST_UNREACH:

		case ICMP_SOURCE_QUENCH:

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c

+7 −8
Original line number Diff line number Diff line
@@ -60,9 +60,8 @@ static bool ipv4_invert_tuple(struct nf_conntrack_tuple *tuple, 
static int ipv4_print_tuple(struct seq_file *s,

			    const struct nf_conntrack_tuple *tuple)

{

	return seq_printf(s, "src=%u.%u.%u.%u dst=%u.%u.%u.%u ",

			  NIPQUAD(tuple->src.u3.ip),

			  NIPQUAD(tuple->dst.u3.ip));

	return seq_printf(s, "src=%pI4 dst=%pI4 ",

			  &tuple->src.u3.ip, &tuple->dst.u3.ip);

}



static int ipv4_get_l4proto(const struct sk_buff *skb, unsigned int nhoff,
@@ -284,17 +283,17 @@ getorigdst(struct sock *sk, int optval, void __user *user, int *len) 
			.tuple.dst.u3.ip;

		memset(sin.sin_zero, 0, sizeof(sin.sin_zero));



		pr_debug("SO_ORIGINAL_DST: %u.%u.%u.%u %u\n",

			 NIPQUAD(sin.sin_addr.s_addr), ntohs(sin.sin_port));

		pr_debug("SO_ORIGINAL_DST: %pI4 %u\n",

			 &sin.sin_addr.s_addr, ntohs(sin.sin_port));

		nf_ct_put(ct);

		if (copy_to_user(user, &sin, sizeof(sin)) != 0)

			return -EFAULT;

		else

			return 0;

	}

	pr_debug("SO_ORIGINAL_DST: Can't find %u.%u.%u.%u/%u-%u.%u.%u.%u/%u.\n",

		 NIPQUAD(tuple.src.u3.ip), ntohs(tuple.src.u.tcp.port),

		 NIPQUAD(tuple.dst.u3.ip), ntohs(tuple.dst.u.tcp.port));

	pr_debug("SO_ORIGINAL_DST: Can't find %pI4/%u-%pI4/%u.\n",

		 &tuple.src.u3.ip, ntohs(tuple.src.u.tcp.port),

		 &tuple.dst.u3.ip, ntohs(tuple.dst.u.tcp.port));

	return -ENOENT;

}