X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/e60c0328f00278865338525f5ad9abeb0785ca5f..c4174021acc57c9d482e4496733352bcac5a0d13:/target/linux/generic/patches-2.6.36/190-netfilter_rtsp.patch diff --git a/target/linux/generic/patches-2.6.36/190-netfilter_rtsp.patch b/target/linux/generic/patches-2.6.36/190-netfilter_rtsp.patch index 68792936b..7f1a9d80d 100644 --- a/target/linux/generic/patches-2.6.36/190-netfilter_rtsp.patch +++ b/target/linux/generic/patches-2.6.36/190-netfilter_rtsp.patch @@ -304,7 +304,7 @@ obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig -@@ -280,6 +280,16 @@ config NF_CONNTRACK_TFTP +@@ -259,6 +259,16 @@ config NF_CONNTRACK_TFTP To compile it as a module, choose M here. If unsure, say N. @@ -1016,8 +1016,8 @@ + 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; @@ -1319,7 +1319,7 @@ + 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.