aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-10-31 03:54:29 -0400
committerDavid S. Miller <davem@davemloft.net>2008-10-31 03:54:29 -0400
commit14d5e834f6b36667c7da56374645f99b6cf30814 (patch)
tree14bfecb3f5b7eaeec508e8d069265a0583d6be9f
parent673d57e72398edfedc93fb50ff58048077c9d587 (diff)
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: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat
-rw-r--r--net/netfilter/ipvs/ip_vs_core.c12
-rw-r--r--net/netfilter/ipvs/ip_vs_ctl.c4
-rw-r--r--net/netfilter/ipvs/ip_vs_dh.c7
-rw-r--r--net/netfilter/ipvs/ip_vs_ftp.c13
-rw-r--r--net/netfilter/ipvs/ip_vs_lblc.c11
-rw-r--r--net/netfilter/ipvs/ip_vs_lblcr.c19
-rw-r--r--net/netfilter/ipvs/ip_vs_proto.c19
-rw-r--r--net/netfilter/ipvs/ip_vs_proto_ah_esp.c5
-rw-r--r--net/netfilter/ipvs/ip_vs_sh.c7
-rw-r--r--net/netfilter/ipvs/ip_vs_sync.c4
-rw-r--r--net/netfilter/ipvs/ip_vs_xmit.c17
-rw-r--r--net/netfilter/nf_conntrack_ftp.c7
-rw-r--r--net/netfilter/nf_conntrack_irc.c13
-rw-r--r--net/netfilter/xt_hashlimit.c7
-rw-r--r--net/netfilter/xt_iprange.c36
-rw-r--r--net/netfilter/xt_recent.c5
16 files changed, 78 insertions, 108 deletions
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
index c3c68443b5b1..cb3e031335eb 100644
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -730,9 +730,9 @@ static int ip_vs_out_icmp(struct sk_buff *skb, int *related)
730 if (ic == NULL) 730 if (ic == NULL)
731 return NF_DROP; 731 return NF_DROP;
732 732
733 IP_VS_DBG(12, "Outgoing ICMP (%d,%d) %u.%u.%u.%u->%u.%u.%u.%u\n", 733 IP_VS_DBG(12, "Outgoing ICMP (%d,%d) %pI4->%pI4\n",
734 ic->type, ntohs(icmp_id(ic)), 734 ic->type, ntohs(icmp_id(ic)),
735 NIPQUAD(iph->saddr), NIPQUAD(iph->daddr)); 735 &iph->saddr, &iph->daddr);
736 736
737 /* 737 /*
738 * Work through seeing if this is for us. 738 * 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)
1070 if (ic == NULL) 1070 if (ic == NULL)
1071 return NF_DROP; 1071 return NF_DROP;
1072 1072
1073 IP_VS_DBG(12, "Incoming ICMP (%d,%d) %u.%u.%u.%u->%u.%u.%u.%u\n", 1073 IP_VS_DBG(12, "Incoming ICMP (%d,%d) %pI4->%pI4\n",
1074 ic->type, ntohs(icmp_id(ic)), 1074 ic->type, ntohs(icmp_id(ic)),
1075 NIPQUAD(iph->saddr), NIPQUAD(iph->daddr)); 1075 &iph->saddr, &iph->daddr);
1076 1076
1077 /* 1077 /*
1078 * Work through seeing if this is for us. 1078 * 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)
1127 /* Ensure the checksum is correct */ 1127 /* Ensure the checksum is correct */
1128 if (!skb_csum_unnecessary(skb) && ip_vs_checksum_complete(skb, ihl)) { 1128 if (!skb_csum_unnecessary(skb) && ip_vs_checksum_complete(skb, ihl)) {
1129 /* Failed checksum! */ 1129 /* Failed checksum! */
1130 IP_VS_DBG(1, "Incoming ICMP: failed checksum from %d.%d.%d.%d!\n", 1130 IP_VS_DBG(1, "Incoming ICMP: failed checksum from %pI4!\n",
1131 NIPQUAD(iph->saddr)); 1131 &iph->saddr);
1132 goto out; 1132 goto out;
1133 } 1133 }
1134 1134
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index 76db27ec9633..98e0a65646a1 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -2141,8 +2141,8 @@ do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len)
2141 2141
2142 /* Check for valid protocol: TCP or UDP, even for fwmark!=0 */ 2142 /* Check for valid protocol: TCP or UDP, even for fwmark!=0 */
2143 if (usvc.protocol != IPPROTO_TCP && usvc.protocol != IPPROTO_UDP) { 2143 if (usvc.protocol != IPPROTO_TCP && usvc.protocol != IPPROTO_UDP) {
2144 IP_VS_ERR("set_ctl: invalid protocol: %d %d.%d.%d.%d:%d %s\n", 2144 IP_VS_ERR("set_ctl: invalid protocol: %d %pI4:%d %s\n",
2145 usvc.protocol, NIPQUAD(usvc.addr.ip), 2145 usvc.protocol, &usvc.addr.ip,
2146 ntohs(usvc.port), usvc.sched_name); 2146 ntohs(usvc.port), usvc.sched_name);
2147 ret = -EFAULT; 2147 ret = -EFAULT;
2148 goto out_unlock; 2148 goto out_unlock;
diff --git a/net/netfilter/ipvs/ip_vs_dh.c b/net/netfilter/ipvs/ip_vs_dh.c
index a16943fd72f1..77179b913be0 100644
--- a/net/netfilter/ipvs/ip_vs_dh.c
+++ b/net/netfilter/ipvs/ip_vs_dh.c
@@ -215,11 +215,8 @@ ip_vs_dh_schedule(struct ip_vs_service *svc, const struct sk_buff *skb)
215 return NULL; 215 return NULL;
216 } 216 }
217 217
218 IP_VS_DBG(6, "DH: destination IP address %u.%u.%u.%u " 218 IP_VS_DBG(6, "DH: destination IP address %pI4 --> server %pI4:%d\n",
219 "--> server %u.%u.%u.%u:%d\n", 219 &iph->daddr, &dest->addr.ip, ntohs(dest->port));
220 NIPQUAD(iph->daddr),
221 NIPQUAD(dest->addr.ip),
222 ntohs(dest->port));
223 220
224 return dest; 221 return dest;
225} 222}
diff --git a/net/netfilter/ipvs/ip_vs_ftp.c b/net/netfilter/ipvs/ip_vs_ftp.c
index 2e7dbd8b73a4..428edbf481cc 100644
--- a/net/netfilter/ipvs/ip_vs_ftp.c
+++ b/net/netfilter/ipvs/ip_vs_ftp.c
@@ -178,10 +178,8 @@ static int ip_vs_ftp_out(struct ip_vs_app *app, struct ip_vs_conn *cp,
178 &start, &end) != 1) 178 &start, &end) != 1)
179 return 1; 179 return 1;
180 180
181 IP_VS_DBG(7, "PASV response (%u.%u.%u.%u:%d) -> " 181 IP_VS_DBG(7, "PASV response (%pI4:%d) -> %pI4:%d detected\n",
182 "%u.%u.%u.%u:%d detected\n", 182 &from.ip, ntohs(port), &cp->caddr.ip, 0);
183 NIPQUAD(from.ip), ntohs(port),
184 NIPQUAD(cp->caddr.ip), 0);
185 183
186 /* 184 /*
187 * Now update or create an connection entry for it 185 * 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,
312 &start, &end) != 1) 310 &start, &end) != 1)
313 return 1; 311 return 1;
314 312
315 IP_VS_DBG(7, "PORT %u.%u.%u.%u:%d detected\n", 313 IP_VS_DBG(7, "PORT %pI4:%d detected\n", &to.ip, ntohs(port));
316 NIPQUAD(to.ip), ntohs(port));
317 314
318 /* Passive mode off */ 315 /* Passive mode off */
319 cp->app_data = NULL; 316 cp->app_data = NULL;
@@ -321,9 +318,9 @@ static int ip_vs_ftp_in(struct ip_vs_app *app, struct ip_vs_conn *cp,
321 /* 318 /*
322 * Now update or create a connection entry for it 319 * Now update or create a connection entry for it
323 */ 320 */
324 IP_VS_DBG(7, "protocol %s %u.%u.%u.%u:%d %u.%u.%u.%u:%d\n", 321 IP_VS_DBG(7, "protocol %s %pI4:%d %pI4:%d\n",
325 ip_vs_proto_name(iph->protocol), 322 ip_vs_proto_name(iph->protocol),
326 NIPQUAD(to.ip), ntohs(port), NIPQUAD(cp->vaddr.ip), 0); 323 &to.ip, ntohs(port), &cp->vaddr.ip, 0);
327 324
328 n_cp = ip_vs_conn_in_get(AF_INET, iph->protocol, 325 n_cp = ip_vs_conn_in_get(AF_INET, iph->protocol,
329 &to, port, 326 &to, port,
diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
index 6ecef3518cac..035d4c3e8646 100644
--- a/net/netfilter/ipvs/ip_vs_lblc.c
+++ b/net/netfilter/ipvs/ip_vs_lblc.c
@@ -420,9 +420,9 @@ __ip_vs_lblc_schedule(struct ip_vs_service *svc, struct iphdr *iph)
420 } 420 }
421 } 421 }
422 422
423 IP_VS_DBG(6, "LBLC: server %d.%d.%d.%d:%d " 423 IP_VS_DBG(6, "LBLC: server %pI4:%d "
424 "activeconns %d refcnt %d weight %d overhead %d\n", 424 "activeconns %d refcnt %d weight %d overhead %d\n",
425 NIPQUAD(least->addr.ip), ntohs(least->port), 425 &least->addr.ip, ntohs(least->port),
426 atomic_read(&least->activeconns), 426 atomic_read(&least->activeconns),
427 atomic_read(&least->refcnt), 427 atomic_read(&least->refcnt),
428 atomic_read(&least->weight), loh); 428 atomic_read(&least->weight), loh);
@@ -503,11 +503,8 @@ ip_vs_lblc_schedule(struct ip_vs_service *svc, const struct sk_buff *skb)
503 write_unlock(&svc->sched_lock); 503 write_unlock(&svc->sched_lock);
504 504
505out: 505out:
506 IP_VS_DBG(6, "LBLC: destination IP address %u.%u.%u.%u " 506 IP_VS_DBG(6, "LBLC: destination IP address %pI4 --> server %pI4:%d\n",
507 "--> server %u.%u.%u.%u:%d\n", 507 &iph->daddr, &dest->addr.ip, ntohs(dest->port));
508 NIPQUAD(iph->daddr),
509 NIPQUAD(dest->addr.ip),
510 ntohs(dest->port));
511 508
512 return dest; 509 return dest;
513} 510}
diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
index 1f75ea83bcf8..cceeff6a9f74 100644
--- a/net/netfilter/ipvs/ip_vs_lblcr.c
+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
@@ -202,9 +202,9 @@ static inline struct ip_vs_dest *ip_vs_dest_set_min(struct ip_vs_dest_set *set)
202 } 202 }
203 } 203 }
204 204
205 IP_VS_DBG(6, "ip_vs_dest_set_min: server %d.%d.%d.%d:%d " 205 IP_VS_DBG(6, "ip_vs_dest_set_min: server %pI4:%d "
206 "activeconns %d refcnt %d weight %d overhead %d\n", 206 "activeconns %d refcnt %d weight %d overhead %d\n",
207 NIPQUAD(least->addr.ip), ntohs(least->port), 207 &least->addr.ip, ntohs(least->port),
208 atomic_read(&least->activeconns), 208 atomic_read(&least->activeconns),
209 atomic_read(&least->refcnt), 209 atomic_read(&least->refcnt),
210 atomic_read(&least->weight), loh); 210 atomic_read(&least->weight), loh);
@@ -248,9 +248,9 @@ static inline struct ip_vs_dest *ip_vs_dest_set_max(struct ip_vs_dest_set *set)
248 } 248 }
249 } 249 }
250 250
251 IP_VS_DBG(6, "ip_vs_dest_set_max: server %d.%d.%d.%d:%d " 251 IP_VS_DBG(6, "ip_vs_dest_set_max: server %pI4:%d "
252 "activeconns %d refcnt %d weight %d overhead %d\n", 252 "activeconns %d refcnt %d weight %d overhead %d\n",
253 NIPQUAD(most->addr.ip), ntohs(most->port), 253 &most->addr.ip, ntohs(most->port),
254 atomic_read(&most->activeconns), 254 atomic_read(&most->activeconns),
255 atomic_read(&most->refcnt), 255 atomic_read(&most->refcnt),
256 atomic_read(&most->weight), moh); 256 atomic_read(&most->weight), moh);
@@ -596,9 +596,9 @@ __ip_vs_lblcr_schedule(struct ip_vs_service *svc, struct iphdr *iph)
596 } 596 }
597 } 597 }
598 598
599 IP_VS_DBG(6, "LBLCR: server %d.%d.%d.%d:%d " 599 IP_VS_DBG(6, "LBLCR: server %pI4:%d "
600 "activeconns %d refcnt %d weight %d overhead %d\n", 600 "activeconns %d refcnt %d weight %d overhead %d\n",
601 NIPQUAD(least->addr.ip), ntohs(least->port), 601 &least->addr.ip, ntohs(least->port),
602 atomic_read(&least->activeconns), 602 atomic_read(&least->activeconns),
603 atomic_read(&least->refcnt), 603 atomic_read(&least->refcnt),
604 atomic_read(&least->weight), loh); 604 atomic_read(&least->weight), loh);
@@ -703,11 +703,8 @@ ip_vs_lblcr_schedule(struct ip_vs_service *svc, const struct sk_buff *skb)
703 write_unlock(&svc->sched_lock); 703 write_unlock(&svc->sched_lock);
704 704
705out: 705out:
706 IP_VS_DBG(6, "LBLCR: destination IP address %u.%u.%u.%u " 706 IP_VS_DBG(6, "LBLCR: destination IP address %pI4 --> server %pI4:%d\n",
707 "--> server %u.%u.%u.%u:%d\n", 707 &iph->daddr, &dest->addr.ip, ntohs(dest->port));
708 NIPQUAD(iph->daddr),
709 NIPQUAD(dest->addr.ip),
710 ntohs(dest->port));
711 708
712 return dest; 709 return dest;
713} 710}
diff --git a/net/netfilter/ipvs/ip_vs_proto.c b/net/netfilter/ipvs/ip_vs_proto.c
index 54cd67fbfe74..a01520e3d6b8 100644
--- a/net/netfilter/ipvs/ip_vs_proto.c
+++ b/net/netfilter/ipvs/ip_vs_proto.c
@@ -164,26 +164,21 @@ ip_vs_tcpudp_debug_packet_v4(struct ip_vs_protocol *pp,
164 if (ih == NULL) 164 if (ih == NULL)
165 sprintf(buf, "%s TRUNCATED", pp->name); 165 sprintf(buf, "%s TRUNCATED", pp->name);
166 else if (ih->frag_off & htons(IP_OFFSET)) 166 else if (ih->frag_off & htons(IP_OFFSET))
167 sprintf(buf, "%s %u.%u.%u.%u->%u.%u.%u.%u frag", 167 sprintf(buf, "%s %pI4->%pI4 frag",
168 pp->name, NIPQUAD(ih->saddr), 168 pp->name, &ih->saddr, &ih->daddr);
169 NIPQUAD(ih->daddr));
170 else { 169 else {
171 __be16 _ports[2], *pptr 170 __be16 _ports[2], *pptr
172; 171;
173 pptr = skb_header_pointer(skb, offset + ih->ihl*4, 172 pptr = skb_header_pointer(skb, offset + ih->ihl*4,
174 sizeof(_ports), _ports); 173 sizeof(_ports), _ports);
175 if (pptr == NULL) 174 if (pptr == NULL)
176 sprintf(buf, "%s TRUNCATED %u.%u.%u.%u->%u.%u.%u.%u", 175 sprintf(buf, "%s TRUNCATED %pI4->%pI4",
177 pp->name, 176 pp->name, &ih->saddr, &ih->daddr);
178 NIPQUAD(ih->saddr),
179 NIPQUAD(ih->daddr));
180 else 177 else
181 sprintf(buf, "%s %u.%u.%u.%u:%u->%u.%u.%u.%u:%u", 178 sprintf(buf, "%s %pI4:%u->%pI4:%u",
182 pp->name, 179 pp->name,
183 NIPQUAD(ih->saddr), 180 &ih->saddr, ntohs(pptr[0]),
184 ntohs(pptr[0]), 181 &ih->daddr, ntohs(pptr[1]));
185 NIPQUAD(ih->daddr),
186 ntohs(pptr[1]));
187 } 182 }
188 183
189 printk(KERN_DEBUG "IPVS: %s: %s\n", msg, buf); 184 printk(KERN_DEBUG "IPVS: %s: %s\n", msg, buf);
diff --git a/net/netfilter/ipvs/ip_vs_proto_ah_esp.c b/net/netfilter/ipvs/ip_vs_proto_ah_esp.c
index 6ede88812044..79f56c1e7c19 100644
--- a/net/netfilter/ipvs/ip_vs_proto_ah_esp.c
+++ b/net/netfilter/ipvs/ip_vs_proto_ah_esp.c
@@ -135,9 +135,8 @@ ah_esp_debug_packet_v4(struct ip_vs_protocol *pp, const struct sk_buff *skb,
135 if (ih == NULL) 135 if (ih == NULL)
136 sprintf(buf, "%s TRUNCATED", pp->name); 136 sprintf(buf, "%s TRUNCATED", pp->name);
137 else 137 else
138 sprintf(buf, "%s %u.%u.%u.%u->%u.%u.%u.%u", 138 sprintf(buf, "%s %pI4->%pI4",
139 pp->name, NIPQUAD(ih->saddr), 139 pp->name, &ih->saddr, &ih->daddr);
140 NIPQUAD(ih->daddr));
141 140
142 printk(KERN_DEBUG "IPVS: %s: %s\n", msg, buf); 141 printk(KERN_DEBUG "IPVS: %s: %s\n", msg, buf);
143} 142}
diff --git a/net/netfilter/ipvs/ip_vs_sh.c b/net/netfilter/ipvs/ip_vs_sh.c
index 1d96de27fefd..be5863cb4723 100644
--- a/net/netfilter/ipvs/ip_vs_sh.c
+++ b/net/netfilter/ipvs/ip_vs_sh.c
@@ -212,11 +212,8 @@ ip_vs_sh_schedule(struct ip_vs_service *svc, const struct sk_buff *skb)
212 return NULL; 212 return NULL;
213 } 213 }
214 214
215 IP_VS_DBG(6, "SH: source IP address %u.%u.%u.%u " 215 IP_VS_DBG(6, "SH: source IP address %pI4 --> server %pI4:%d\n",
216 "--> server %u.%u.%u.%u:%d\n", 216 &iph->saddr, &dest->addr.ip, ntohs(dest->port));
217 NIPQUAD(iph->saddr),
218 NIPQUAD(dest->addr.ip),
219 ntohs(dest->port));
220 217
221 return dest; 218 return dest;
222} 219}
diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
index de5e7e118eed..6be5d4efa51b 100644
--- a/net/netfilter/ipvs/ip_vs_sync.c
+++ b/net/netfilter/ipvs/ip_vs_sync.c
@@ -580,8 +580,8 @@ static int bind_mcastif_addr(struct socket *sock, char *ifname)
580 IP_VS_ERR("You probably need to specify IP address on " 580 IP_VS_ERR("You probably need to specify IP address on "
581 "multicast interface.\n"); 581 "multicast interface.\n");
582 582
583 IP_VS_DBG(7, "binding socket with (%s) %u.%u.%u.%u\n", 583 IP_VS_DBG(7, "binding socket with (%s) %pI4\n",
584 ifname, NIPQUAD(addr)); 584 ifname, &addr);
585 585
586 /* Now bind the socket with the address of multicast interface */ 586 /* Now bind the socket with the address of multicast interface */
587 sin.sin_family = AF_INET; 587 sin.sin_family = AF_INET;
diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
index fc342dda950a..2f3672190734 100644
--- a/net/netfilter/ipvs/ip_vs_xmit.c
+++ b/net/netfilter/ipvs/ip_vs_xmit.c
@@ -82,14 +82,13 @@ __ip_vs_get_out_rt(struct ip_vs_conn *cp, u32 rtos)
82 82
83 if (ip_route_output_key(&init_net, &rt, &fl)) { 83 if (ip_route_output_key(&init_net, &rt, &fl)) {
84 spin_unlock(&dest->dst_lock); 84 spin_unlock(&dest->dst_lock);
85 IP_VS_DBG_RL("ip_route_output error, " 85 IP_VS_DBG_RL("ip_route_output error, dest: %pI4\n",
86 "dest: %u.%u.%u.%u\n", 86 &dest->addr.ip);
87 NIPQUAD(dest->addr.ip));
88 return NULL; 87 return NULL;
89 } 88 }
90 __ip_vs_dst_set(dest, rtos, dst_clone(&rt->u.dst)); 89 __ip_vs_dst_set(dest, rtos, dst_clone(&rt->u.dst));
91 IP_VS_DBG(10, "new dst %u.%u.%u.%u, refcnt=%d, rtos=%X\n", 90 IP_VS_DBG(10, "new dst %pI4, refcnt=%d, rtos=%X\n",
92 NIPQUAD(dest->addr.ip), 91 &dest->addr.ip,
93 atomic_read(&rt->u.dst.__refcnt), rtos); 92 atomic_read(&rt->u.dst.__refcnt), rtos);
94 } 93 }
95 spin_unlock(&dest->dst_lock); 94 spin_unlock(&dest->dst_lock);
@@ -104,8 +103,8 @@ __ip_vs_get_out_rt(struct ip_vs_conn *cp, u32 rtos)
104 }; 103 };
105 104
106 if (ip_route_output_key(&init_net, &rt, &fl)) { 105 if (ip_route_output_key(&init_net, &rt, &fl)) {
107 IP_VS_DBG_RL("ip_route_output error, dest: " 106 IP_VS_DBG_RL("ip_route_output error, dest: %pI4\n",
108 "%u.%u.%u.%u\n", NIPQUAD(cp->daddr.ip)); 107 &cp->daddr.ip);
109 return NULL; 108 return NULL;
110 } 109 }
111 } 110 }
@@ -236,8 +235,8 @@ ip_vs_bypass_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
236 EnterFunction(10); 235 EnterFunction(10);
237 236
238 if (ip_route_output_key(&init_net, &rt, &fl)) { 237 if (ip_route_output_key(&init_net, &rt, &fl)) {
239 IP_VS_DBG_RL("ip_vs_bypass_xmit(): ip_route_output error, " 238 IP_VS_DBG_RL("ip_vs_bypass_xmit(): ip_route_output error, dest: %pI4\n",
240 "dest: %u.%u.%u.%u\n", NIPQUAD(iph->daddr)); 239 &iph->daddr);
241 goto tx_error_icmp; 240 goto tx_error_icmp;
242 } 241 }
243 242
diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c
index 8cab6d595909..629500901bd4 100644
--- a/net/netfilter/nf_conntrack_ftp.c
+++ b/net/netfilter/nf_conntrack_ftp.c
@@ -462,10 +462,9 @@ static int help(struct sk_buff *skb,
462 different IP address. Simply don't record it for 462 different IP address. Simply don't record it for
463 NAT. */ 463 NAT. */
464 if (cmd.l3num == PF_INET) { 464 if (cmd.l3num == PF_INET) {
465 pr_debug("conntrack_ftp: NOT RECORDING: " NIPQUAD_FMT 465 pr_debug("conntrack_ftp: NOT RECORDING: %pI4 != %pI4\n",
466 " != " NIPQUAD_FMT "\n", 466 &cmd.u3.ip,
467 NIPQUAD(cmd.u3.ip), 467 &ct->tuplehash[dir].tuple.src.u3.ip);
468 NIPQUAD(ct->tuplehash[dir].tuple.src.u3.ip));
469 } else { 468 } else {
470 pr_debug("conntrack_ftp: NOT RECORDING: %pI6 != %pI6\n", 469 pr_debug("conntrack_ftp: NOT RECORDING: %pI6 != %pI6\n",
471 cmd.u3.ip6, 470 cmd.u3.ip6,
diff --git a/net/netfilter/nf_conntrack_irc.c b/net/netfilter/nf_conntrack_irc.c
index 20633fdf7e6b..4d681a04447e 100644
--- a/net/netfilter/nf_conntrack_irc.c
+++ b/net/netfilter/nf_conntrack_irc.c
@@ -156,9 +156,9 @@ static int help(struct sk_buff *skb, unsigned int protoff,
156 /* we have at least (19+MINMATCHLEN)-5 bytes valid data left */ 156 /* we have at least (19+MINMATCHLEN)-5 bytes valid data left */
157 157
158 iph = ip_hdr(skb); 158 iph = ip_hdr(skb);
159 pr_debug("DCC found in master %u.%u.%u.%u:%u %u.%u.%u.%u:%u\n", 159 pr_debug("DCC found in master %pI4:%u %pI4:%u\n",
160 NIPQUAD(iph->saddr), ntohs(th->source), 160 &iph->saddr, ntohs(th->source),
161 NIPQUAD(iph->daddr), ntohs(th->dest)); 161 &iph->daddr, ntohs(th->dest));
162 162
163 for (i = 0; i < ARRAY_SIZE(dccprotos); i++) { 163 for (i = 0; i < ARRAY_SIZE(dccprotos); i++) {
164 if (memcmp(data, dccprotos[i], strlen(dccprotos[i]))) { 164 if (memcmp(data, dccprotos[i], strlen(dccprotos[i]))) {
@@ -185,10 +185,9 @@ static int help(struct sk_buff *skb, unsigned int protoff,
185 tuple->dst.u3.ip != htonl(dcc_ip)) { 185 tuple->dst.u3.ip != htonl(dcc_ip)) {
186 if (net_ratelimit()) 186 if (net_ratelimit())
187 printk(KERN_WARNING 187 printk(KERN_WARNING
188 "Forged DCC command from " 188 "Forged DCC command from %pI4: %pI4:%u\n",
189 "%u.%u.%u.%u: %u.%u.%u.%u:%u\n", 189 &tuple->src.u3.ip,
190 NIPQUAD(tuple->src.u3.ip), 190 &dcc_ip, dcc_port);
191 HIPQUAD(dcc_ip), dcc_port);
192 continue; 191 continue;
193 } 192 }
194 193
diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
index 6379717f9044..f97fded024c4 100644
--- a/net/netfilter/xt_hashlimit.c
+++ b/net/netfilter/xt_hashlimit.c
@@ -893,12 +893,11 @@ static int dl_seq_real_show(struct dsthash_ent *ent, u_int8_t family,
893 893
894 switch (family) { 894 switch (family) {
895 case NFPROTO_IPV4: 895 case NFPROTO_IPV4:
896 return seq_printf(s, "%ld %u.%u.%u.%u:%u->" 896 return seq_printf(s, "%ld %pI4:%u->%pI4:%u %u %u %u\n",
897 "%u.%u.%u.%u:%u %u %u %u\n",
898 (long)(ent->expires - jiffies)/HZ, 897 (long)(ent->expires - jiffies)/HZ,
899 NIPQUAD(ent->dst.ip.src), 898 &ent->dst.ip.src,
900 ntohs(ent->dst.src_port), 899 ntohs(ent->dst.src_port),
901 NIPQUAD(ent->dst.ip.dst), 900 &ent->dst.ip.dst,
902 ntohs(ent->dst.dst_port), 901 ntohs(ent->dst.dst_port),
903 ent->rateinfo.credit, ent->rateinfo.credit_cap, 902 ent->rateinfo.credit, ent->rateinfo.credit_cap,
904 ent->rateinfo.cost); 903 ent->rateinfo.cost);
diff --git a/net/netfilter/xt_iprange.c b/net/netfilter/xt_iprange.c
index 7ac54eab0b00..501f9b623188 100644
--- a/net/netfilter/xt_iprange.c
+++ b/net/netfilter/xt_iprange.c
@@ -26,12 +26,11 @@ iprange_mt_v0(const struct sk_buff *skb, const struct xt_match_param *par)
26 if ((ntohl(iph->saddr) < ntohl(info->src.min_ip) 26 if ((ntohl(iph->saddr) < ntohl(info->src.min_ip)
27 || ntohl(iph->saddr) > ntohl(info->src.max_ip)) 27 || ntohl(iph->saddr) > ntohl(info->src.max_ip))
28 ^ !!(info->flags & IPRANGE_SRC_INV)) { 28 ^ !!(info->flags & IPRANGE_SRC_INV)) {
29 pr_debug("src IP %u.%u.%u.%u NOT in range %s" 29 pr_debug("src IP %pI4 NOT in range %s%pI4-%pI4\n",
30 "%u.%u.%u.%u-%u.%u.%u.%u\n", 30 &iph->saddr,
31 NIPQUAD(iph->saddr),
32 info->flags & IPRANGE_SRC_INV ? "(INV) " : "", 31 info->flags & IPRANGE_SRC_INV ? "(INV) " : "",
33 NIPQUAD(info->src.min_ip), 32 &info->src.min_ip,
34 NIPQUAD(info->src.max_ip)); 33 &info->src.max_ip);
35 return false; 34 return false;
36 } 35 }
37 } 36 }
@@ -39,12 +38,11 @@ iprange_mt_v0(const struct sk_buff *skb, const struct xt_match_param *par)
39 if ((ntohl(iph->daddr) < ntohl(info->dst.min_ip) 38 if ((ntohl(iph->daddr) < ntohl(info->dst.min_ip)
40 || ntohl(iph->daddr) > ntohl(info->dst.max_ip)) 39 || ntohl(iph->daddr) > ntohl(info->dst.max_ip))
41 ^ !!(info->flags & IPRANGE_DST_INV)) { 40 ^ !!(info->flags & IPRANGE_DST_INV)) {
42 pr_debug("dst IP %u.%u.%u.%u NOT in range %s" 41 pr_debug("dst IP %pI4 NOT in range %s%pI4-%pI4\n",
43 "%u.%u.%u.%u-%u.%u.%u.%u\n", 42 &iph->daddr,
44 NIPQUAD(iph->daddr),
45 info->flags & IPRANGE_DST_INV ? "(INV) " : "", 43 info->flags & IPRANGE_DST_INV ? "(INV) " : "",
46 NIPQUAD(info->dst.min_ip), 44 &info->dst.min_ip,
47 NIPQUAD(info->dst.max_ip)); 45 &info->dst.max_ip);
48 return false; 46 return false;
49 } 47 }
50 } 48 }
@@ -63,12 +61,11 @@ iprange_mt4(const struct sk_buff *skb, const struct xt_match_param *par)
63 m |= ntohl(iph->saddr) > ntohl(info->src_max.ip); 61 m |= ntohl(iph->saddr) > ntohl(info->src_max.ip);
64 m ^= !!(info->flags & IPRANGE_SRC_INV); 62 m ^= !!(info->flags & IPRANGE_SRC_INV);
65 if (m) { 63 if (m) {
66 pr_debug("src IP " NIPQUAD_FMT " NOT in range %s" 64 pr_debug("src IP %pI4 NOT in range %s%pI4-%pI4\n",
67 NIPQUAD_FMT "-" NIPQUAD_FMT "\n", 65 &iph->saddr,
68 NIPQUAD(iph->saddr),
69 (info->flags & IPRANGE_SRC_INV) ? "(INV) " : "", 66 (info->flags & IPRANGE_SRC_INV) ? "(INV) " : "",
70 NIPQUAD(info->src_max.ip), 67 &info->src_max.ip,
71 NIPQUAD(info->src_max.ip)); 68 &info->src_max.ip);
72 return false; 69 return false;
73 } 70 }
74 } 71 }
@@ -77,12 +74,11 @@ iprange_mt4(const struct sk_buff *skb, const struct xt_match_param *par)
77 m |= ntohl(iph->daddr) > ntohl(info->dst_max.ip); 74 m |= ntohl(iph->daddr) > ntohl(info->dst_max.ip);
78 m ^= !!(info->flags & IPRANGE_DST_INV); 75 m ^= !!(info->flags & IPRANGE_DST_INV);
79 if (m) { 76 if (m) {
80 pr_debug("dst IP " NIPQUAD_FMT " NOT in range %s" 77 pr_debug("dst IP %pI4 NOT in range %s%pI4-%pI4\n",
81 NIPQUAD_FMT "-" NIPQUAD_FMT "\n", 78 &iph->daddr,
82 NIPQUAD(iph->daddr),
83 (info->flags & IPRANGE_DST_INV) ? "(INV) " : "", 79 (info->flags & IPRANGE_DST_INV) ? "(INV) " : "",
84 NIPQUAD(info->dst_min.ip), 80 &info->dst_min.ip,
85 NIPQUAD(info->dst_max.ip)); 81 &info->dst_max.ip);
86 return false; 82 return false;
87 } 83 }
88 } 84 }
diff --git a/net/netfilter/xt_recent.c b/net/netfilter/xt_recent.c
index b785727a5bf7..3c3dd22b1d06 100644
--- a/net/netfilter/xt_recent.c
+++ b/net/netfilter/xt_recent.c
@@ -422,9 +422,8 @@ static int recent_seq_show(struct seq_file *seq, void *v)
422 422
423 i = (e->index - 1) % ip_pkt_list_tot; 423 i = (e->index - 1) % ip_pkt_list_tot;
424 if (e->family == NFPROTO_IPV4) 424 if (e->family == NFPROTO_IPV4)
425 seq_printf(seq, "src=" NIPQUAD_FMT " ttl: %u last_seen: %lu " 425 seq_printf(seq, "src=%pI4 ttl: %u last_seen: %lu oldest_pkt: %u",
426 "oldest_pkt: %u", NIPQUAD(e->addr.ip), e->ttl, 426 &e->addr.ip, e->ttl, e->stamps[i], e->index);
427 e->stamps[i], e->index);
428 else 427 else
429 seq_printf(seq, "src=%pI6 ttl: %u last_seen: %lu oldest_pkt: %u", 428 seq_printf(seq, "src=%pI6 ttl: %u last_seen: %lu oldest_pkt: %u",
430 &e->addr.in6, e->ttl, e->stamps[i], e->index); 429 &e->addr.in6, e->ttl, e->stamps[i], e->index);
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-04 13:27:06 -0500