Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #12338 from alinnastac/rtsp-pb_discon

Browse source 
xtables-addons: fix RTSP helper support for client_port=x/y Transport…
This commit is contained in:
Rosen Penev 2020-07-04 11:39:17 -07:00 committed by GitHub
commit 390c06a738
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
net/xtables-addons/patches/100-add-rtsp-conntrack.patch
View file

@ -671,7 +671,7 @@
+ +
+ rtp_exp->flags = 0; + rtp_exp->flags = 0;
+ +
+ if (expinfo.pbtype == pb_range) { + if (expinfo.pbtype == pb_range || expinfo.pbtype == pb_discon) {
+ pr_debug("setup expectation for rtcp\n"); + pr_debug("setup expectation for rtcp\n");
+ +
+ be_hiport = htons(expinfo.hiport); + be_hiport = htons(expinfo.hiport);
@ -833,7 +833,7 @@
+ goto out; + goto out;
+ +
+ /* replace rtcp expect src addr */ + /* replace rtcp expect src addr */
+ if (expinfo.pbtype == pb_range) { + if (expinfo.pbtype == pb_range || expinfo.pbtype == pb_discon) {
+ t.dst.u.all = htons(expinfo.hiport); + t.dst.u.all = htons(expinfo.hiport);
+ +
+ /* get the rtcp expect and replace the srcaddr with RTP server addr */ + /* get the rtcp expect and replace the srcaddr with RTP server addr */
@ -1082,7 +1082,7 @@
+#endif /* _IP_CONNTRACK_RTSP_H */ +#endif /* _IP_CONNTRACK_RTSP_H */
--- /dev/null --- /dev/null
+++ b/extensions/rtsp/nf_nat_rtsp.c +++ b/extensions/rtsp/nf_nat_rtsp.c
@@ -0,0 +1,635 @@ @@ -0,0 +1,640 @@
+/* +/*
+ * RTSP extension for TCP NAT alteration + * RTSP extension for TCP NAT alteration
+ * (C) 2003 by Tom Marshall <tmarshall at real.com> + * (C) 2003 by Tom Marshall <tmarshall at real.com>
@ -1333,8 +1333,8 @@
+ } + }
+ } + }
+ for (hiport = prtspexp->hiport; hiport != 0; hiport++) { /* XXX: improper wrap? */ + for (hiport = prtspexp->hiport; hiport != 0; hiport++) { /* XXX: improper wrap? */
+ rtp_t->dst.u.udp.port = htons(hiport); + rtcp_exp->tuple.dst.u.udp.port = htons(hiport);
+ if (rtsp_nf_ct_expect_related(rtp_exp) == 0) { + if (rtsp_nf_ct_expect_related(rtcp_exp) == 0) {
+ pr_debug("using port %hu (2 of 2)\n", hiport); + pr_debug("using port %hu (2 of 2)\n", hiport);
+ break; + break;
+ } + }
@ -1343,6 +1343,11 @@
+ rbuf1len = sprintf(rbuf1, "%hu", loport); + rbuf1len = sprintf(rbuf1, "%hu", loport);
+ rbufalen = sprintf(rbufa, hiport == loport+1 ? + rbufalen = sprintf(rbufa, hiport == loport+1 ?
+ "%hu-%hu":"%hu/%hu", loport, hiport); + "%hu-%hu":"%hu/%hu", loport, hiport);
+ } else {
+ if (loport != 0)
+ nf_ct_unexpect_related(rtp_exp);
+ if (hiport != 0)
+ nf_ct_unexpect_related(rtcp_exp);
+ } + }
+ break; + break;
+ } + }