summaryrefslogtreecommitdiff
path: root/package/rtsp/src
diff options
context:
space:
mode:
Diffstat (limited to 'package/rtsp/src')
-rw-r--r--package/rtsp/src/nf_conntrack_rtsp.c6
-rw-r--r--package/rtsp/src/nf_nat_rtsp.c8
2 files changed, 7 insertions, 7 deletions
diff --git a/package/rtsp/src/nf_conntrack_rtsp.c b/package/rtsp/src/nf_conntrack_rtsp.c
index 7b5d2be67..75aada89b 100644
--- a/package/rtsp/src/nf_conntrack_rtsp.c
+++ b/package/rtsp/src/nf_conntrack_rtsp.c
@@ -369,10 +369,10 @@ help_out(struct sk_buff *skb, unsigned char *rb_ptr, unsigned int datalen,
//exp->mask.dst.u.udp.port = 0xfffe;
}
- pr_debug("expect_related %u.%u.%u.%u:%u-%u.%u.%u.%u:%u\n",
- NIPQUAD(exp->tuple.src.u3.ip),
+ pr_debug("expect_related %pI4:%u-%pI4:%u\n",
+ exp->tuple.src.u3.ip,
ntohs(exp->tuple.src.u.udp.port),
- NIPQUAD(exp->tuple.dst.u3.ip),
+ exp->tuple.dst.u3.ip,
ntohs(exp->tuple.dst.u.udp.port));
nf_nat_rtsp = rcu_dereference(nf_nat_rtsp_hook);
diff --git a/package/rtsp/src/nf_nat_rtsp.c b/package/rtsp/src/nf_nat_rtsp.c
index adb44d0ae..9683e3c75 100644
--- a/package/rtsp/src/nf_nat_rtsp.c
+++ b/package/rtsp/src/nf_nat_rtsp.c
@@ -139,8 +139,8 @@ rtsp_mangle_tran(enum ip_conntrack_info ctinfo,
t = &exp->tuple;
t->dst.u3.ip = newip;
- extaddrlen = extip ? sprintf(szextaddr, "%u.%u.%u.%u", NIPQUAD(extip))
- : sprintf(szextaddr, "%u.%u.%u.%u", NIPQUAD(newip));
+ extaddrlen = extip ? sprintf(szextaddr, "%pI4", extip)
+ : sprintf(szextaddr, "%pI4", newip);
pr_debug("stunaddr=%s (%s)\n", szextaddr, (extip?"forced":"auto"));
rbuf1len = rbufalen = 0;
@@ -483,8 +483,8 @@ static void expected(struct nf_conn* ct, struct nf_conntrack_expect *exp)
//code from 2.4 : newip = (HOOK2MANIP(hooknum) == IP_NAT_MANIP_SRC) ? newsrcip : newdstip;
newip = newdstip;
- pr_debug("newsrcip=%u.%u.%u.%u, newdstip=%u.%u.%u.%u, newip=%u.%u.%u.%u\n",
- NIPQUAD(newsrcip), NIPQUAD(newdstip), NIPQUAD(newip));
+ pr_debug("newsrcip=%pI4, newdstip=%pI4, newip=%pI4\n",
+ newsrcip, newdstip, newip);
mr.rangesize = 1;
// We don't want to manip the per-protocol, just the IPs.