clean-up trailing whitespace (#453)
These changes have been mostly auto-generated with: find . -type f -print0 | xargs -0 perl -pi -e 's/ +$//' Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
This commit is contained in:
parent
071b89ad30
commit
50f397b249
@ -119,10 +119,10 @@ control MyEgress(inout headers hdr,
|
|||||||
|
|
||||||
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
||||||
apply {
|
apply {
|
||||||
update_checksum(
|
update_checksum(
|
||||||
hdr.ipv4.isValid(),
|
hdr.ipv4.isValid(),
|
||||||
{ hdr.ipv4.version,
|
{ hdr.ipv4.version,
|
||||||
hdr.ipv4.ihl,
|
hdr.ipv4.ihl,
|
||||||
hdr.ipv4.diffserv,
|
hdr.ipv4.diffserv,
|
||||||
hdr.ipv4.totalLen,
|
hdr.ipv4.totalLen,
|
||||||
hdr.ipv4.identification,
|
hdr.ipv4.identification,
|
||||||
|
@ -133,10 +133,10 @@ control MyEgress(inout headers hdr,
|
|||||||
|
|
||||||
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
||||||
apply {
|
apply {
|
||||||
update_checksum(
|
update_checksum(
|
||||||
hdr.ipv4.isValid(),
|
hdr.ipv4.isValid(),
|
||||||
{ hdr.ipv4.version,
|
{ hdr.ipv4.version,
|
||||||
hdr.ipv4.ihl,
|
hdr.ipv4.ihl,
|
||||||
hdr.ipv4.diffserv,
|
hdr.ipv4.diffserv,
|
||||||
hdr.ipv4.totalLen,
|
hdr.ipv4.totalLen,
|
||||||
hdr.ipv4.identification,
|
hdr.ipv4.identification,
|
||||||
|
@ -153,10 +153,10 @@ control MyEgress(inout headers hdr,
|
|||||||
|
|
||||||
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
||||||
apply {
|
apply {
|
||||||
update_checksum(
|
update_checksum(
|
||||||
hdr.ipv4.isValid(),
|
hdr.ipv4.isValid(),
|
||||||
{ hdr.ipv4.version,
|
{ hdr.ipv4.version,
|
||||||
hdr.ipv4.ihl,
|
hdr.ipv4.ihl,
|
||||||
hdr.ipv4.diffserv,
|
hdr.ipv4.diffserv,
|
||||||
hdr.ipv4.totalLen,
|
hdr.ipv4.totalLen,
|
||||||
hdr.ipv4.identification,
|
hdr.ipv4.identification,
|
||||||
|
@ -171,10 +171,10 @@ control MyEgress(inout headers hdr,
|
|||||||
|
|
||||||
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
||||||
apply {
|
apply {
|
||||||
update_checksum(
|
update_checksum(
|
||||||
hdr.ipv4.isValid(),
|
hdr.ipv4.isValid(),
|
||||||
{ hdr.ipv4.version,
|
{ hdr.ipv4.version,
|
||||||
hdr.ipv4.ihl,
|
hdr.ipv4.ihl,
|
||||||
hdr.ipv4.diffserv,
|
hdr.ipv4.diffserv,
|
||||||
hdr.ipv4.totalLen,
|
hdr.ipv4.totalLen,
|
||||||
hdr.ipv4.identification,
|
hdr.ipv4.identification,
|
||||||
|
@ -144,8 +144,8 @@ control MyEgress(inout headers hdr,
|
|||||||
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
||||||
apply {
|
apply {
|
||||||
/* TODO: replace tos with diffserve and ecn */
|
/* TODO: replace tos with diffserve and ecn */
|
||||||
update_checksum(
|
update_checksum(
|
||||||
hdr.ipv4.isValid(),
|
hdr.ipv4.isValid(),
|
||||||
{ hdr.ipv4.version,
|
{ hdr.ipv4.version,
|
||||||
hdr.ipv4.ihl,
|
hdr.ipv4.ihl,
|
||||||
hdr.ipv4.tos,
|
hdr.ipv4.tos,
|
||||||
|
@ -144,12 +144,12 @@ control MyEgress(inout headers hdr,
|
|||||||
|
|
||||||
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
||||||
apply {
|
apply {
|
||||||
update_checksum(
|
update_checksum(
|
||||||
hdr.ipv4.isValid(),
|
hdr.ipv4.isValid(),
|
||||||
{ hdr.ipv4.version,
|
{ hdr.ipv4.version,
|
||||||
hdr.ipv4.ihl,
|
hdr.ipv4.ihl,
|
||||||
hdr.ipv4.diffserv,
|
hdr.ipv4.diffserv,
|
||||||
hdr.ipv4.ecn,
|
hdr.ipv4.ecn,
|
||||||
hdr.ipv4.totalLen,
|
hdr.ipv4.totalLen,
|
||||||
hdr.ipv4.identification,
|
hdr.ipv4.identification,
|
||||||
hdr.ipv4.flags,
|
hdr.ipv4.flags,
|
||||||
|
@ -133,10 +133,10 @@ control MyEgress(inout headers hdr,
|
|||||||
|
|
||||||
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
||||||
apply {
|
apply {
|
||||||
update_checksum(
|
update_checksum(
|
||||||
hdr.ipv4.isValid(),
|
hdr.ipv4.isValid(),
|
||||||
{ hdr.ipv4.version,
|
{ hdr.ipv4.version,
|
||||||
hdr.ipv4.ihl,
|
hdr.ipv4.ihl,
|
||||||
hdr.ipv4.diffserv,
|
hdr.ipv4.diffserv,
|
||||||
hdr.ipv4.totalLen,
|
hdr.ipv4.totalLen,
|
||||||
hdr.ipv4.identification,
|
hdr.ipv4.identification,
|
||||||
|
@ -232,10 +232,10 @@ control MyEgress(inout headers hdr,
|
|||||||
|
|
||||||
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
||||||
apply {
|
apply {
|
||||||
update_checksum(
|
update_checksum(
|
||||||
hdr.ipv4.isValid(),
|
hdr.ipv4.isValid(),
|
||||||
{ hdr.ipv4.version,
|
{ hdr.ipv4.version,
|
||||||
hdr.ipv4.ihl,
|
hdr.ipv4.ihl,
|
||||||
hdr.ipv4.diffserv,
|
hdr.ipv4.diffserv,
|
||||||
hdr.ipv4.totalLen,
|
hdr.ipv4.totalLen,
|
||||||
hdr.ipv4.identification,
|
hdr.ipv4.identification,
|
||||||
|
@ -238,10 +238,10 @@ control MyEgress(inout headers hdr,
|
|||||||
|
|
||||||
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
||||||
apply {
|
apply {
|
||||||
update_checksum(
|
update_checksum(
|
||||||
hdr.ipv4.isValid(),
|
hdr.ipv4.isValid(),
|
||||||
{ hdr.ipv4.version,
|
{ hdr.ipv4.version,
|
||||||
hdr.ipv4.ihl,
|
hdr.ipv4.ihl,
|
||||||
hdr.ipv4.diffserv,
|
hdr.ipv4.diffserv,
|
||||||
hdr.ipv4.totalLen,
|
hdr.ipv4.totalLen,
|
||||||
hdr.ipv4.identification,
|
hdr.ipv4.identification,
|
||||||
|
@ -253,10 +253,10 @@ control MyEgress(inout headers hdr,
|
|||||||
|
|
||||||
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
||||||
apply {
|
apply {
|
||||||
update_checksum(
|
update_checksum(
|
||||||
hdr.ipv4.isValid(),
|
hdr.ipv4.isValid(),
|
||||||
{ hdr.ipv4.version,
|
{ hdr.ipv4.version,
|
||||||
hdr.ipv4.ihl,
|
hdr.ipv4.ihl,
|
||||||
hdr.ipv4.diffserv,
|
hdr.ipv4.diffserv,
|
||||||
hdr.ipv4.totalLen,
|
hdr.ipv4.totalLen,
|
||||||
hdr.ipv4.identification,
|
hdr.ipv4.identification,
|
||||||
|
@ -252,10 +252,10 @@ control MyEgress(inout headers hdr,
|
|||||||
|
|
||||||
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
||||||
apply {
|
apply {
|
||||||
update_checksum(
|
update_checksum(
|
||||||
hdr.ipv4.isValid(),
|
hdr.ipv4.isValid(),
|
||||||
{ hdr.ipv4.version,
|
{ hdr.ipv4.version,
|
||||||
hdr.ipv4.ihl,
|
hdr.ipv4.ihl,
|
||||||
hdr.ipv4.diffserv,
|
hdr.ipv4.diffserv,
|
||||||
hdr.ipv4.totalLen,
|
hdr.ipv4.totalLen,
|
||||||
hdr.ipv4.identification,
|
hdr.ipv4.identification,
|
||||||
|
@ -133,8 +133,8 @@ control MyIngress(inout headers hdr,
|
|||||||
}
|
}
|
||||||
apply {
|
apply {
|
||||||
/* TODO: apply ecmp_group table and ecmp_nhop table if IPv4 header is
|
/* TODO: apply ecmp_group table and ecmp_nhop table if IPv4 header is
|
||||||
* valid and TTL hasn't reached zero
|
* valid and TTL hasn't reached zero
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -173,10 +173,10 @@ control MyEgress(inout headers hdr,
|
|||||||
|
|
||||||
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
||||||
apply {
|
apply {
|
||||||
update_checksum(
|
update_checksum(
|
||||||
hdr.ipv4.isValid(),
|
hdr.ipv4.isValid(),
|
||||||
{ hdr.ipv4.version,
|
{ hdr.ipv4.version,
|
||||||
hdr.ipv4.ihl,
|
hdr.ipv4.ihl,
|
||||||
hdr.ipv4.diffserv,
|
hdr.ipv4.diffserv,
|
||||||
hdr.ipv4.totalLen,
|
hdr.ipv4.totalLen,
|
||||||
hdr.ipv4.identification,
|
hdr.ipv4.identification,
|
||||||
|
@ -103,14 +103,14 @@ control MyIngress(inout headers hdr,
|
|||||||
}
|
}
|
||||||
action set_ecmp_select(bit<16> ecmp_base, bit<32> ecmp_count) {
|
action set_ecmp_select(bit<16> ecmp_base, bit<32> ecmp_count) {
|
||||||
hash(meta.ecmp_select,
|
hash(meta.ecmp_select,
|
||||||
HashAlgorithm.crc16,
|
HashAlgorithm.crc16,
|
||||||
ecmp_base,
|
ecmp_base,
|
||||||
{ hdr.ipv4.srcAddr,
|
{ hdr.ipv4.srcAddr,
|
||||||
hdr.ipv4.dstAddr,
|
hdr.ipv4.dstAddr,
|
||||||
hdr.ipv4.protocol,
|
hdr.ipv4.protocol,
|
||||||
hdr.tcp.srcPort,
|
hdr.tcp.srcPort,
|
||||||
hdr.tcp.dstPort },
|
hdr.tcp.dstPort },
|
||||||
ecmp_count);
|
ecmp_count);
|
||||||
}
|
}
|
||||||
action set_nhop(bit<48> nhop_dmac, bit<32> nhop_ipv4, bit<9> port) {
|
action set_nhop(bit<48> nhop_dmac, bit<32> nhop_ipv4, bit<9> port) {
|
||||||
hdr.ethernet.dstAddr = nhop_dmac;
|
hdr.ethernet.dstAddr = nhop_dmac;
|
||||||
@ -181,10 +181,10 @@ control MyEgress(inout headers hdr,
|
|||||||
|
|
||||||
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
||||||
apply {
|
apply {
|
||||||
update_checksum(
|
update_checksum(
|
||||||
hdr.ipv4.isValid(),
|
hdr.ipv4.isValid(),
|
||||||
{ hdr.ipv4.version,
|
{ hdr.ipv4.version,
|
||||||
hdr.ipv4.ihl,
|
hdr.ipv4.ihl,
|
||||||
hdr.ipv4.diffserv,
|
hdr.ipv4.diffserv,
|
||||||
hdr.ipv4.totalLen,
|
hdr.ipv4.totalLen,
|
||||||
hdr.ipv4.identification,
|
hdr.ipv4.identification,
|
||||||
|
@ -226,7 +226,7 @@ control MyEgress(inout headers hdr,
|
|||||||
* - If hdr.mri is valid:
|
* - If hdr.mri is valid:
|
||||||
* - Apply table swtrace
|
* - Apply table swtrace
|
||||||
*/
|
*/
|
||||||
swtrace.apply();
|
swtrace.apply();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -236,10 +236,10 @@ control MyEgress(inout headers hdr,
|
|||||||
|
|
||||||
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
||||||
apply {
|
apply {
|
||||||
update_checksum(
|
update_checksum(
|
||||||
hdr.ipv4.isValid(),
|
hdr.ipv4.isValid(),
|
||||||
{ hdr.ipv4.version,
|
{ hdr.ipv4.version,
|
||||||
hdr.ipv4.ihl,
|
hdr.ipv4.ihl,
|
||||||
hdr.ipv4.diffserv,
|
hdr.ipv4.diffserv,
|
||||||
hdr.ipv4.totalLen,
|
hdr.ipv4.totalLen,
|
||||||
hdr.ipv4.identification,
|
hdr.ipv4.identification,
|
||||||
|
@ -203,13 +203,13 @@ control MyEgress(inout headers hdr,
|
|||||||
|
|
||||||
hdr.ipv4.ihl = hdr.ipv4.ihl + 2;
|
hdr.ipv4.ihl = hdr.ipv4.ihl + 2;
|
||||||
hdr.ipv4_option.optionLength = hdr.ipv4_option.optionLength + 8;
|
hdr.ipv4_option.optionLength = hdr.ipv4_option.optionLength + 8;
|
||||||
hdr.ipv4.totalLen = hdr.ipv4.totalLen + 8;
|
hdr.ipv4.totalLen = hdr.ipv4.totalLen + 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
table swtrace {
|
table swtrace {
|
||||||
actions = {
|
actions = {
|
||||||
add_swtrace;
|
add_swtrace;
|
||||||
NoAction;
|
NoAction;
|
||||||
}
|
}
|
||||||
default_action = NoAction();
|
default_action = NoAction();
|
||||||
}
|
}
|
||||||
@ -227,10 +227,10 @@ control MyEgress(inout headers hdr,
|
|||||||
|
|
||||||
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
||||||
apply {
|
apply {
|
||||||
update_checksum(
|
update_checksum(
|
||||||
hdr.ipv4.isValid(),
|
hdr.ipv4.isValid(),
|
||||||
{ hdr.ipv4.version,
|
{ hdr.ipv4.version,
|
||||||
hdr.ipv4.ihl,
|
hdr.ipv4.ihl,
|
||||||
hdr.ipv4.diffserv,
|
hdr.ipv4.diffserv,
|
||||||
hdr.ipv4.totalLen,
|
hdr.ipv4.totalLen,
|
||||||
hdr.ipv4.identification,
|
hdr.ipv4.identification,
|
||||||
|
@ -194,10 +194,10 @@ control MyEgress(inout headers hdr,
|
|||||||
|
|
||||||
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
||||||
apply {
|
apply {
|
||||||
update_checksum(
|
update_checksum(
|
||||||
hdr.ipv4.isValid(),
|
hdr.ipv4.isValid(),
|
||||||
{ hdr.ipv4.version,
|
{ hdr.ipv4.version,
|
||||||
hdr.ipv4.ihl,
|
hdr.ipv4.ihl,
|
||||||
hdr.ipv4.diffserv,
|
hdr.ipv4.diffserv,
|
||||||
hdr.ipv4.totalLen,
|
hdr.ipv4.totalLen,
|
||||||
hdr.ipv4.identification,
|
hdr.ipv4.identification,
|
||||||
|
@ -159,8 +159,8 @@ control MyEgress(inout headers hdr,
|
|||||||
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
||||||
apply {
|
apply {
|
||||||
/* TODO: replace tos with diffserv and ecn */
|
/* TODO: replace tos with diffserv and ecn */
|
||||||
update_checksum(
|
update_checksum(
|
||||||
hdr.ipv4.isValid(),
|
hdr.ipv4.isValid(),
|
||||||
{ hdr.ipv4.version,
|
{ hdr.ipv4.version,
|
||||||
hdr.ipv4.ihl,
|
hdr.ipv4.ihl,
|
||||||
hdr.ipv4.tos,
|
hdr.ipv4.tos,
|
||||||
|
@ -207,9 +207,9 @@ control MyIngress(inout headers hdr,
|
|||||||
if (hdr.ipv4.isValid()) {
|
if (hdr.ipv4.isValid()) {
|
||||||
if (hdr.ipv4.protocol == IP_PROTOCOLS_UDP) {
|
if (hdr.ipv4.protocol == IP_PROTOCOLS_UDP) {
|
||||||
expedited_forwarding();
|
expedited_forwarding();
|
||||||
}
|
}
|
||||||
else if (hdr.ipv4.protocol == IP_PROTOCOLS_TCP) {
|
else if (hdr.ipv4.protocol == IP_PROTOCOLS_TCP) {
|
||||||
voice_admit();
|
voice_admit();
|
||||||
}
|
}
|
||||||
ipv4_lpm.apply();
|
ipv4_lpm.apply();
|
||||||
}
|
}
|
||||||
@ -232,12 +232,12 @@ control MyEgress(inout headers hdr,
|
|||||||
|
|
||||||
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
control MyComputeChecksum(inout headers hdr, inout metadata meta) {
|
||||||
apply {
|
apply {
|
||||||
update_checksum(
|
update_checksum(
|
||||||
hdr.ipv4.isValid(),
|
hdr.ipv4.isValid(),
|
||||||
{ hdr.ipv4.version,
|
{ hdr.ipv4.version,
|
||||||
hdr.ipv4.ihl,
|
hdr.ipv4.ihl,
|
||||||
hdr.ipv4.diffserv,
|
hdr.ipv4.diffserv,
|
||||||
hdr.ipv4.ecn,
|
hdr.ipv4.ecn,
|
||||||
hdr.ipv4.totalLen,
|
hdr.ipv4.totalLen,
|
||||||
hdr.ipv4.identification,
|
hdr.ipv4.identification,
|
||||||
hdr.ipv4.flags,
|
hdr.ipv4.flags,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user