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

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

net: replace NIPQUAD() in net/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 673d57e7

net/netfilter/ipvs/ip_vs_core.c

+6 −6
Original line number Diff line number Diff line
@@ -730,9 +730,9 @@ static int ip_vs_out_icmp(struct sk_buff *skb, int *related) 
	if (ic == NULL)

		return NF_DROP;



	IP_VS_DBG(12, "Outgoing ICMP (%d,%d) %u.%u.%u.%u->%u.%u.%u.%u\n",

	IP_VS_DBG(12, "Outgoing ICMP (%d,%d) %pI4->%pI4\n",

		  ic->type, ntohs(icmp_id(ic)),

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

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



	/*

	 * Work through seeing if this is for us.
@@ -1070,9 +1070,9 @@ ip_vs_in_icmp(struct sk_buff *skb, int *related, unsigned int hooknum) 
	if (ic == NULL)

		return NF_DROP;



	IP_VS_DBG(12, "Incoming ICMP (%d,%d) %u.%u.%u.%u->%u.%u.%u.%u\n",

	IP_VS_DBG(12, "Incoming ICMP (%d,%d) %pI4->%pI4\n",

		  ic->type, ntohs(icmp_id(ic)),

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

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



	/*

	 * Work through seeing if this is for us.
@@ -1127,8 +1127,8 @@ ip_vs_in_icmp(struct sk_buff *skb, int *related, unsigned int hooknum) 
	/* Ensure the checksum is correct */

	if (!skb_csum_unnecessary(skb) && ip_vs_checksum_complete(skb, ihl)) {

		/* Failed checksum! */

		IP_VS_DBG(1, "Incoming ICMP: failed checksum from %d.%d.%d.%d!\n",

			  NIPQUAD(iph->saddr));

		IP_VS_DBG(1, "Incoming ICMP: failed checksum from %pI4!\n",

			  &iph->saddr);

		goto out;

	}

net/netfilter/ipvs/ip_vs_ctl.c

+2 −2
Original line number Diff line number Diff line
@@ -2141,8 +2141,8 @@ do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len) 


	/* Check for valid protocol: TCP or UDP, even for fwmark!=0 */

	if (usvc.protocol != IPPROTO_TCP && usvc.protocol != IPPROTO_UDP) {

		IP_VS_ERR("set_ctl: invalid protocol: %d %d.%d.%d.%d:%d %s\n",

			  usvc.protocol, NIPQUAD(usvc.addr.ip),

		IP_VS_ERR("set_ctl: invalid protocol: %d %pI4:%d %s\n",

			  usvc.protocol, &usvc.addr.ip,

			  ntohs(usvc.port), usvc.sched_name);

		ret = -EFAULT;

		goto out_unlock;

net/netfilter/ipvs/ip_vs_dh.c

+2 −5
Original line number Diff line number Diff line
@@ -215,11 +215,8 @@ ip_vs_dh_schedule(struct ip_vs_service *svc, const struct sk_buff *skb) 
		return NULL;

	}



	IP_VS_DBG(6, "DH: destination IP address %u.%u.%u.%u "

		  "--> server %u.%u.%u.%u:%d\n",

		  NIPQUAD(iph->daddr),

		  NIPQUAD(dest->addr.ip),

		  ntohs(dest->port));

	IP_VS_DBG(6, "DH: destination IP address %pI4 --> server %pI4:%d\n",

		  &iph->daddr, &dest->addr.ip, ntohs(dest->port));



	return dest;

}

net/netfilter/ipvs/ip_vs_ftp.c

+5 −8
Original line number Diff line number Diff line
@@ -178,10 +178,8 @@ static int ip_vs_ftp_out(struct ip_vs_app *app, struct ip_vs_conn *cp, 
					   &start, &end) != 1)

			return 1;



		IP_VS_DBG(7, "PASV response (%u.%u.%u.%u:%d) -> "

			  "%u.%u.%u.%u:%d detected\n",

			  NIPQUAD(from.ip), ntohs(port),

			  NIPQUAD(cp->caddr.ip), 0);

		IP_VS_DBG(7, "PASV response (%pI4:%d) -> %pI4:%d detected\n",

			  &from.ip, ntohs(port), &cp->caddr.ip, 0);



		/*

		 * Now update or create an connection entry for it
@@ -312,8 +310,7 @@ static int ip_vs_ftp_in(struct ip_vs_app *app, struct ip_vs_conn *cp, 
				   &start, &end) != 1)

		return 1;



	IP_VS_DBG(7, "PORT %u.%u.%u.%u:%d detected\n",

		  NIPQUAD(to.ip), ntohs(port));

	IP_VS_DBG(7, "PORT %pI4:%d detected\n", &to.ip, ntohs(port));



	/* Passive mode off */

	cp->app_data = NULL;
@@ -321,9 +318,9 @@ static int ip_vs_ftp_in(struct ip_vs_app *app, struct ip_vs_conn *cp, 
	/*

	 * Now update or create a connection entry for it

	 */

	IP_VS_DBG(7, "protocol %s %u.%u.%u.%u:%d %u.%u.%u.%u:%d\n",

	IP_VS_DBG(7, "protocol %s %pI4:%d %pI4:%d\n",

		  ip_vs_proto_name(iph->protocol),

		  NIPQUAD(to.ip), ntohs(port), NIPQUAD(cp->vaddr.ip), 0);

		  &to.ip, ntohs(port), &cp->vaddr.ip, 0);



	n_cp = ip_vs_conn_in_get(AF_INET, iph->protocol,

				 &to, port,

net/netfilter/ipvs/ip_vs_lblc.c

+4 −7
Original line number Diff line number Diff line
@@ -420,9 +420,9 @@ __ip_vs_lblc_schedule(struct ip_vs_service *svc, struct iphdr *iph) 
		}

	}



	IP_VS_DBG(6, "LBLC: server %d.%d.%d.%d:%d "

	IP_VS_DBG(6, "LBLC: server %pI4:%d "

		  "activeconns %d refcnt %d weight %d overhead %d\n",

		  NIPQUAD(least->addr.ip), ntohs(least->port),

		  &least->addr.ip, ntohs(least->port),

		  atomic_read(&least->activeconns),

		  atomic_read(&least->refcnt),

		  atomic_read(&least->weight), loh);
@@ -503,11 +503,8 @@ ip_vs_lblc_schedule(struct ip_vs_service *svc, const struct sk_buff *skb) 
	write_unlock(&svc->sched_lock);



out:

	IP_VS_DBG(6, "LBLC: destination IP address %u.%u.%u.%u "

		  "--> server %u.%u.%u.%u:%d\n",

		  NIPQUAD(iph->daddr),

		  NIPQUAD(dest->addr.ip),

		  ntohs(dest->port));

	IP_VS_DBG(6, "LBLC: destination IP address %pI4 --> server %pI4:%d\n",

		  &iph->daddr, &dest->addr.ip, ntohs(dest->port));



	return dest;

}