+ 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, "%u.%u.%u.%u", &extip)
++ : sprintf(szextaddr, "%u.%u.%u.%u", &newip);
+ DEBUGP("stunaddr=%s (%s)\n", szextaddr, (extip?"forced":"auto"));
+
+ rbuf1len = rbufalen = 0;
+ newip = newdstip;
+
+ DEBUGP("newsrcip=%u.%u.%u.%u, newdstip=%u.%u.%u.%u, newip=%u.%u.%u.%u\n",
-+ NIPQUAD(newsrcip), NIPQUAD(newdstip), NIPQUAD(newip));
++ &newsrcip, &newdstip, &newip);
+
+ mr.rangesize = 1;
+ // We don't want to manip the per-protocol, just the IPs.