Page MenuHomeFreeBSD
Differential D6811

Rename CAM_NETFLIX_IOSCHED to CAM_IOSCHED_DYNAMIC to better reflect its nature.
ClosedPublic
Actions

Authored by imp on Jun 11 2016, 6:56 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mar 11 2025, 9:13 AM
Unknown Object (File)
Mar 5 2025, 8:37 PM
Unknown Object (File)
Feb 3 2025, 1:39 AM
Unknown Object (File)
Jan 24 2025, 1:23 AM
Unknown Object (File)
Jan 11 2025, 4:57 PM
Unknown Object (File)
Dec 20 2024, 8:21 PM
Unknown Object (File)
Dec 15 2024, 1:19 AM
Unknown Object (File)
Nov 29 2024, 8:13 PM
View All 94 Files
Subscribers
None

Details

Reviewers
scottl
ken
jhb
gnn
Commits
rS302163: Rename CAM_NETFLIX_IOSCHED to CAM_IOSCHED_DYNAMIC to better reflect

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 4188
Build 4231: arc lint + arc unit

Event Timeline

imp updated this revision to Diff 17519.Jun 11 2016, 6:56 PM
imp retitled this revision from to Rename CAM_NETFLIX_IOSCHED to CAM_IOSCHED_DYNAMIC to better reflect its nature..
imp updated this object.
imp edited the test plan for this revision. (Show Details)
imp added reviewers: gnn, scottl, ken, jhb.Jun 11 2016, 6:58 PM
jhb accepted this revision.Jun 15 2016, 5:06 PM
jhb edited edge metadata.
This revision is now accepted and ready to land.Jun 15 2016, 5:06 PM
Closed by commit rS302163: Rename CAM_NETFLIX_IOSCHED to CAM_IOSCHED_DYNAMIC to better reflect (authored by imp). · Explain WhyJun 23 2016, 11:21 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
sys/
cam/
50 lines
conf/
2 lines

Diff 17519

View Options

sys/cam/cam_iosched.c

  • This file was added.
#include <atf-c.h>
#include <alias.h>
#include <stdio.h>
#include <stdlib.h>
#include "util.h"
ATF_TC_WITHOUT_HEAD(1_portforward);
ATF_TC_BODY(1_portforward, dummy)
{
struct libalias *la = LibAliasInit(NULL);
struct alias_link *pf1, *pf2, *pf3, *pf4;
struct ip *p;
struct udphdr *u;
ATF_REQUIRE(la != NULL);
LibAliasSetAddress(la, masq);
LibAliasSetMode(la, PKT_ALIAS_RESET_ON_ADDR_CHANGE, ~0);
LibAliasSetMode(la, PKT_ALIAS_DENY_INCOMING, PKT_ALIAS_DENY_INCOMING);
/*
* Fully specified
*/
pf1 = LibAliasRedirectPort(la, prv1, ntohs(0x1234), ext, ntohs(0x5678), masq, ntohs(0xabcd), IPPROTO_UDP);
ATF_REQUIRE(pf1 != NULL);
p = ip_packet(0, 64);
UDP_UNNAT_CHECK(p, u, ext, 0x5678, masq, 0xabcd, prv1, 0x1234);
/* try again */
UDP_UNNAT_CHECK(p, u, ext, 0x5678, masq, 0xabcd, prv1, 0x1234);
/* different source */
UDP_UNNAT_FAIL(p, u, pub, 0x5678, masq, 0xabcd);
UDP_UNNAT_FAIL(p, u, ext, 0xdead, masq, 0xabcd);
/* clear table by keeping the address */
LibAliasSetAddress(la, ext);
LibAliasSetAddress(la, masq);
/* delete and try again */
LibAliasRedirectDelete(la, pf1);
UDP_UNNAT_FAIL(p, u, ext, 0x5678, masq, 0xabcd);
/*
* Any external port
*/
pf2 = LibAliasRedirectPort(la, prv2, ntohs(0x1234), ext, ntohs(0), masq, ntohs(0xabcd), IPPROTO_UDP);
ATF_REQUIRE(pf2 != NULL);
u = set_udp(p, 0x5678, 0xabcd);
UNNAT_CHECK(p, ext, masq, prv2);
ATF_CHECK(u->uh_sport == ntohs(0x5678));
ATF_CHECK(u->uh_dport == ntohs(0x1234));
/* try again */
u = set_udp(p, 0x5678, 0xabcd);
UNNAT_CHECK(p, ext, masq, prv2);
ATF_CHECK(u->uh_sport == ntohs(0x5678));
ATF_CHECK(u->uh_dport == ntohs(0x1234));
/* different source */
u = set_udp(p, 0x5678, 0xabcd);
UNNAT_FAIL(p, pub, masq);
u = set_udp(p, 0xdead, 0xabcd);
UNNAT_CHECK(p, ext, masq, prv2);
ATF_CHECK(u->uh_sport == ntohs(0xdead));
ATF_CHECK(u->uh_dport == ntohs(0x1234));
/* clear table by keeping the address */
LibAliasSetAddress(la, ext);
LibAliasSetAddress(la, masq);
LibAliasRedirectDelete(la, pf2);
/* try again, but not the existing flow */
u = set_udp(p, 0x5678, 0xabcd);
UNNAT_FAIL(p, ext, masq);
/*
* Any external host
*/
pf3 = LibAliasRedirectPort(la, prv3, ntohs(0x1234), ANY_ADDR, ntohs(0x5678), masq, ntohs(0xabcd), IPPROTO_UDP);
ATF_REQUIRE(pf3 != NULL);
u = set_udp(p, 0x5678, 0xabcd);
UNNAT_CHECK(p, ext, masq, prv3);
ATF_CHECK(u->uh_sport == ntohs(0x5678));
ATF_CHECK(u->uh_dport == ntohs(0x1234));
/* try again */
u = set_udp(p, 0x5678, 0xabcd);
UNNAT_CHECK(p, ext, masq, prv3);
ATF_CHECK(u->uh_sport == ntohs(0x5678));
ATF_CHECK(u->uh_dport == ntohs(0x1234));
/* different source */
u = set_udp(p, 0x5678, 0xabcd);
UNNAT_CHECK(p, pub, masq, prv3);
ATF_CHECK(u->uh_sport == ntohs(0x5678));
ATF_CHECK(u->uh_dport == ntohs(0x1234));
u = set_udp(p, 0xdead, 0xabcd);
UNNAT_FAIL(p, ext, masq);
/* clear table by keeping the address */
LibAliasSetAddress(la, ext);
LibAliasSetAddress(la, masq);
LibAliasRedirectDelete(la, pf3);
/* try again, but not the existing flow */
u = set_udp(p, 0x5678, 0xabcd);
UNNAT_FAIL(p, ext, masq);
/*
* Any external host, any port
*/
pf4 = LibAliasRedirectPort(la, cgn, ntohs(0x1234), ANY_ADDR, ntohs(0), masq, ntohs(0xabcd), IPPROTO_UDP);
ATF_REQUIRE(pf4 != NULL);
u = set_udp(p, 0x5678, 0xabcd);
UNNAT_CHECK(p, ext, masq, cgn);
ATF_CHECK(u->uh_sport == ntohs(0x5678));
ATF_CHECK(u->uh_dport == ntohs(0x1234));
/* try again */
u = set_udp(p, 0x5678, 0xabcd);
UNNAT_CHECK(p, ext, masq, cgn);
ATF_CHECK(u->uh_sport == ntohs(0x5678));
ATF_CHECK(u->uh_dport == ntohs(0x1234));
/* different source */
u = set_udp(p, 0x5678, 0xabcd);
UNNAT_CHECK(p, pub, masq, cgn);
ATF_CHECK(u->uh_sport == ntohs(0x5678));
ATF_CHECK(u->uh_dport == ntohs(0x1234));
u = set_udp(p, 0xdead, 0xabcd);
UNNAT_CHECK(p, ext, masq, cgn);
ATF_CHECK(u->uh_sport == ntohs(0xdead));
ATF_CHECK(u->uh_dport == ntohs(0x1234));
/* clear table by keeping the address */
LibAliasSetAddress(la, ext);
LibAliasSetAddress(la, masq);
LibAliasRedirectDelete(la, pf4);
/* try again, but not the existing flow */
u = set_udp(p, 0x5678, 0xabcd);
UNNAT_FAIL(p, ext, masq);
free(p);
LibAliasUninit(la);
}
ATF_TC_WITHOUT_HEAD(2_portoverlap);
ATF_TC_BODY(2_portoverlap, dummy)
{
struct libalias *la = LibAliasInit(NULL);
struct alias_link *pf1, *pf2, *pf3, *pf4;
struct ip *p;
struct udphdr *u;
ATF_REQUIRE(la != NULL);
LibAliasSetAddress(la, masq);
LibAliasSetMode(la, PKT_ALIAS_RESET_ON_ADDR_CHANGE, ~0);
LibAliasSetMode(la, PKT_ALIAS_DENY_INCOMING, PKT_ALIAS_DENY_INCOMING);
/*
* Fully specified
*/
pf1 = LibAliasRedirectPort(la, prv2, ntohs(0x1234), ext, ntohs(0x5678), masq, ntohs(0xabcd), IPPROTO_UDP);
ATF_REQUIRE(pf1 != NULL);
p = ip_packet(0, 64);
UDP_UNNAT_CHECK(p, u, ext, 0x5678, masq, 0xabcd, prv2, 0x1234);
/* clear table by keeping the address */
LibAliasSetAddress(la, ext);
LibAliasSetAddress(la, masq);
/*
* Fully specified (override)
*/
pf1 = LibAliasRedirectPort(la, prv1, ntohs(0x1234), ext, ntohs(0x5678), masq, ntohs(0xabcd), IPPROTO_UDP);
ATF_REQUIRE(pf1 != NULL);
UDP_UNNAT_CHECK(p, u, ext, 0x5678, masq, 0xabcd, prv1, 0x1234);
/* clear table by keeping the address */
LibAliasSetAddress(la, ext);
LibAliasSetAddress(la, masq);
/*
* Any external port
*/
pf2 = LibAliasRedirectPort(la, prv2, ntohs(0x1234), ext, ntohs(0), masq, ntohs(0xabcd), IPPROTO_UDP);
ATF_REQUIRE(pf2 != NULL);
UDP_UNNAT_CHECK(p, u, ext, 0x5679, masq, 0xabcd, prv2, 0x1234);
/* more specific rule wins */
UDP_UNNAT_CHECK(p, u, ext, 0x5678, masq, 0xabcd, prv1, 0x1234);
/* clear table by keeping the address */
LibAliasSetAddress(la, ext);
LibAliasSetAddress(la, masq);
/*
* Any external host
*/
pf3 = LibAliasRedirectPort(la, prv3, ntohs(0x1234), ANY_ADDR, ntohs(0x5678), masq, ntohs(0xabcd), IPPROTO_UDP);
ATF_REQUIRE(pf3 != NULL);
UDP_UNNAT_CHECK(p, u, pub, 0x5678, masq, 0xabcd, prv3, 0x1234);
/* more specific rule wins */
UDP_UNNAT_CHECK(p, u, ext, 0x5679, masq, 0xabcd, prv2, 0x1234);
UDP_UNNAT_CHECK(p, u, ext, 0x5678, masq, 0xabcd, prv1, 0x1234);
/* clear table by keeping the address */
LibAliasSetAddress(la, ext);
LibAliasSetAddress(la, masq);
/*
* Any external host, any port
*/
pf4 = LibAliasRedirectPort(la, cgn, ntohs(0x1234), ANY_ADDR, ntohs(0), masq, ntohs(0xabcd), IPPROTO_UDP);
ATF_REQUIRE(pf4 != NULL);
UDP_UNNAT_CHECK(p, u, prv1, 0x5679, masq, 0xabcd, cgn, 0x1234);
/* more specific rule wins */
UDP_UNNAT_CHECK(p, u, pub, 0x5678, masq, 0xabcd, prv3, 0x1234);
UDP_UNNAT_CHECK(p, u, ext, 0x5679, masq, 0xabcd, prv2, 0x1234);
UDP_UNNAT_CHECK(p, u, ext, 0x5678, masq, 0xabcd, prv1, 0x1234);
free(p);
LibAliasUninit(la);
}
ATF_TP_ADD_TCS(natin)
{
/* Use "dd if=/dev/random bs=2 count=1 | od -x" to reproduce */
srand(0xe859);
ATF_TP_ADD_TC(natin, 1_portforward);
ATF_TP_ADD_TC(natin, 2_portoverlap);
return atf_no_error();
}
View Options

sys/conf/options

  • This file was added.
#include <atf-c.h>
#include <alias.h>
#include <stdio.h>
#include <stdlib.h>
#include "util.h"
ATF_TC_WITHOUT_HEAD(1_portforward);
ATF_TC_BODY(1_portforward, dummy)
{
struct libalias *la = LibAliasInit(NULL);
struct alias_link *pf1, *pf2, *pf3, *pf4;
struct ip *p;
struct udphdr *u;
ATF_REQUIRE(la != NULL);
LibAliasSetAddress(la, masq);
LibAliasSetMode(la, PKT_ALIAS_RESET_ON_ADDR_CHANGE, ~0);
LibAliasSetMode(la, PKT_ALIAS_DENY_INCOMING, PKT_ALIAS_DENY_INCOMING);
/*
* Fully specified
*/
pf1 = LibAliasRedirectPort(la, prv1, ntohs(0x1234), ext, ntohs(0x5678), masq, ntohs(0xabcd), IPPROTO_UDP);
ATF_REQUIRE(pf1 != NULL);
p = ip_packet(0, 64);
UDP_UNNAT_CHECK(p, u, ext, 0x5678, masq, 0xabcd, prv1, 0x1234);
/* try again */
UDP_UNNAT_CHECK(p, u, ext, 0x5678, masq, 0xabcd, prv1, 0x1234);
/* different source */
UDP_UNNAT_FAIL(p, u, pub, 0x5678, masq, 0xabcd);
UDP_UNNAT_FAIL(p, u, ext, 0xdead, masq, 0xabcd);
/* clear table by keeping the address */
LibAliasSetAddress(la, ext);
LibAliasSetAddress(la, masq);
/* delete and try again */
LibAliasRedirectDelete(la, pf1);
UDP_UNNAT_FAIL(p, u, ext, 0x5678, masq, 0xabcd);
/*
* Any external port
*/
pf2 = LibAliasRedirectPort(la, prv2, ntohs(0x1234), ext, ntohs(0), masq, ntohs(0xabcd), IPPROTO_UDP);
ATF_REQUIRE(pf2 != NULL);
u = set_udp(p, 0x5678, 0xabcd);
UNNAT_CHECK(p, ext, masq, prv2);
ATF_CHECK(u->uh_sport == ntohs(0x5678));
ATF_CHECK(u->uh_dport == ntohs(0x1234));
/* try again */
u = set_udp(p, 0x5678, 0xabcd);
UNNAT_CHECK(p, ext, masq, prv2);
ATF_CHECK(u->uh_sport == ntohs(0x5678));
ATF_CHECK(u->uh_dport == ntohs(0x1234));
/* different source */
u = set_udp(p, 0x5678, 0xabcd);
UNNAT_FAIL(p, pub, masq);
u = set_udp(p, 0xdead, 0xabcd);
UNNAT_CHECK(p, ext, masq, prv2);
ATF_CHECK(u->uh_sport == ntohs(0xdead));
ATF_CHECK(u->uh_dport == ntohs(0x1234));
/* clear table by keeping the address */
LibAliasSetAddress(la, ext);
LibAliasSetAddress(la, masq);
LibAliasRedirectDelete(la, pf2);
/* try again, but not the existing flow */
u = set_udp(p, 0x5678, 0xabcd);
UNNAT_FAIL(p, ext, masq);
/*
* Any external host
*/
pf3 = LibAliasRedirectPort(la, prv3, ntohs(0x1234), ANY_ADDR, ntohs(0x5678), masq, ntohs(0xabcd), IPPROTO_UDP);
ATF_REQUIRE(pf3 != NULL);
u = set_udp(p, 0x5678, 0xabcd);
UNNAT_CHECK(p, ext, masq, prv3);
ATF_CHECK(u->uh_sport == ntohs(0x5678));
ATF_CHECK(u->uh_dport == ntohs(0x1234));
/* try again */
u = set_udp(p, 0x5678, 0xabcd);
UNNAT_CHECK(p, ext, masq, prv3);
ATF_CHECK(u->uh_sport == ntohs(0x5678));
ATF_CHECK(u->uh_dport == ntohs(0x1234));
/* different source */
u = set_udp(p, 0x5678, 0xabcd);
UNNAT_CHECK(p, pub, masq, prv3);
ATF_CHECK(u->uh_sport == ntohs(0x5678));
ATF_CHECK(u->uh_dport == ntohs(0x1234));
u = set_udp(p, 0xdead, 0xabcd);
UNNAT_FAIL(p, ext, masq);
/* clear table by keeping the address */
LibAliasSetAddress(la, ext);
LibAliasSetAddress(la, masq);
LibAliasRedirectDelete(la, pf3);
/* try again, but not the existing flow */
u = set_udp(p, 0x5678, 0xabcd);
UNNAT_FAIL(p, ext, masq);
/*
* Any external host, any port
*/
pf4 = LibAliasRedirectPort(la, cgn, ntohs(0x1234), ANY_ADDR, ntohs(0), masq, ntohs(0xabcd), IPPROTO_UDP);
ATF_REQUIRE(pf4 != NULL);
u = set_udp(p, 0x5678, 0xabcd);
UNNAT_CHECK(p, ext, masq, cgn);
ATF_CHECK(u->uh_sport == ntohs(0x5678));
ATF_CHECK(u->uh_dport == ntohs(0x1234));
/* try again */
u = set_udp(p, 0x5678, 0xabcd);
UNNAT_CHECK(p, ext, masq, cgn);
ATF_CHECK(u->uh_sport == ntohs(0x5678));
ATF_CHECK(u->uh_dport == ntohs(0x1234));
/* different source */
u = set_udp(p, 0x5678, 0xabcd);
UNNAT_CHECK(p, pub, masq, cgn);
ATF_CHECK(u->uh_sport == ntohs(0x5678));
ATF_CHECK(u->uh_dport == ntohs(0x1234));
u = set_udp(p, 0xdead, 0xabcd);
UNNAT_CHECK(p, ext, masq, cgn);
ATF_CHECK(u->uh_sport == ntohs(0xdead));
ATF_CHECK(u->uh_dport == ntohs(0x1234));
/* clear table by keeping the address */
LibAliasSetAddress(la, ext);
LibAliasSetAddress(la, masq);
LibAliasRedirectDelete(la, pf4);
/* try again, but not the existing flow */
u = set_udp(p, 0x5678, 0xabcd);
UNNAT_FAIL(p, ext, masq);
free(p);
LibAliasUninit(la);
}
ATF_TC_WITHOUT_HEAD(2_portoverlap);
ATF_TC_BODY(2_portoverlap, dummy)
{
struct libalias *la = LibAliasInit(NULL);
struct alias_link *pf1, *pf2, *pf3, *pf4;
struct ip *p;
struct udphdr *u;
ATF_REQUIRE(la != NULL);
LibAliasSetAddress(la, masq);
LibAliasSetMode(la, PKT_ALIAS_RESET_ON_ADDR_CHANGE, ~0);
LibAliasSetMode(la, PKT_ALIAS_DENY_INCOMING, PKT_ALIAS_DENY_INCOMING);
/*
* Fully specified
*/
pf1 = LibAliasRedirectPort(la, prv2, ntohs(0x1234), ext, ntohs(0x5678), masq, ntohs(0xabcd), IPPROTO_UDP);
ATF_REQUIRE(pf1 != NULL);
p = ip_packet(0, 64);
UDP_UNNAT_CHECK(p, u, ext, 0x5678, masq, 0xabcd, prv2, 0x1234);
/* clear table by keeping the address */
LibAliasSetAddress(la, ext);
LibAliasSetAddress(la, masq);
/*
* Fully specified (override)
*/
pf1 = LibAliasRedirectPort(la, prv1, ntohs(0x1234), ext, ntohs(0x5678), masq, ntohs(0xabcd), IPPROTO_UDP);
ATF_REQUIRE(pf1 != NULL);
UDP_UNNAT_CHECK(p, u, ext, 0x5678, masq, 0xabcd, prv1, 0x1234);
/* clear table by keeping the address */
LibAliasSetAddress(la, ext);
LibAliasSetAddress(la, masq);
/*
* Any external port
*/
pf2 = LibAliasRedirectPort(la, prv2, ntohs(0x1234), ext, ntohs(0), masq, ntohs(0xabcd), IPPROTO_UDP);
ATF_REQUIRE(pf2 != NULL);
UDP_UNNAT_CHECK(p, u, ext, 0x5679, masq, 0xabcd, prv2, 0x1234);
/* more specific rule wins */
UDP_UNNAT_CHECK(p, u, ext, 0x5678, masq, 0xabcd, prv1, 0x1234);
/* clear table by keeping the address */
LibAliasSetAddress(la, ext);
LibAliasSetAddress(la, masq);
/*
* Any external host
*/
pf3 = LibAliasRedirectPort(la, prv3, ntohs(0x1234), ANY_ADDR, ntohs(0x5678), masq, ntohs(0xabcd), IPPROTO_UDP);
ATF_REQUIRE(pf3 != NULL);
UDP_UNNAT_CHECK(p, u, pub, 0x5678, masq, 0xabcd, prv3, 0x1234);
/* more specific rule wins */
UDP_UNNAT_CHECK(p, u, ext, 0x5679, masq, 0xabcd, prv2, 0x1234);
UDP_UNNAT_CHECK(p, u, ext, 0x5678, masq, 0xabcd, prv1, 0x1234);
/* clear table by keeping the address */
LibAliasSetAddress(la, ext);
LibAliasSetAddress(la, masq);
/*
* Any external host, any port
*/
pf4 = LibAliasRedirectPort(la, cgn, ntohs(0x1234), ANY_ADDR, ntohs(0), masq, ntohs(0xabcd), IPPROTO_UDP);
ATF_REQUIRE(pf4 != NULL);
UDP_UNNAT_CHECK(p, u, prv1, 0x5679, masq, 0xabcd, cgn, 0x1234);
/* more specific rule wins */
UDP_UNNAT_CHECK(p, u, pub, 0x5678, masq, 0xabcd, prv3, 0x1234);
UDP_UNNAT_CHECK(p, u, ext, 0x5679, masq, 0xabcd, prv2, 0x1234);
UDP_UNNAT_CHECK(p, u, ext, 0x5678, masq, 0xabcd, prv1, 0x1234);
free(p);
LibAliasUninit(la);
}
ATF_TP_ADD_TCS(natin)
{
/* Use "dd if=/dev/random bs=2 count=1 | od -x" to reproduce */
srand(0xe859);
ATF_TP_ADD_TC(natin, 1_portforward);
ATF_TP_ADD_TC(natin, 2_portoverlap);
return atf_no_error();
}