nico
/
master-thesis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[netpfga] adjust names to use new bmv2 style naming

This commit is contained in:
Nico Schottelius 2019-07-23 12:26:59 +02:00
parent cae8e6c7c0
commit e72265df47
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
p4src/minip4_solution.p4
View File

@ -62,16 +62,22 @@ parser TopParser(packet_in packet,
/******************************************************************************** /********************************************************************************
* Main * Main
*/ */
control TopPipe(inout Parsed_packet p,
inout user_metadata_t user_metadata, // control TopPipe(inout Parsed_packet p,
// inout user_metadata_t user_metadata,
// inout digest_data_t digest_data,
// inout sume_metadata_t sume_metadata) {
control TopPipe(inout headers hdr,
inout metadata meta,
inout digest_data_t digest_data, inout digest_data_t digest_data,
inout sume_metadata_t sume_metadata) { inout sume_metadata_t sume_metadata) {
action swap_eth_addresses() { action swap_eth_addresses() {
EthAddr_t temp = p.ethernet.dstAddr; EthAddr_t temp = hdr.ethernet.dstAddr;
p.ethernet.dstAddr = p.ethernet.srcAddr; hdr.ethernet.dstAddr = hdr.ethernet.srcAddr;
p.ethernet.srcAddr = temp; hdr.ethernet.srcAddr = temp;
/* set egress port */ /* set egress port */
sume_metadata.dst_port = sume_metadata.src_port; sume_metadata.dst_port = sume_metadata.src_port;
@ -94,12 +100,12 @@ control TopPipe(inout Parsed_packet p,
} }
action do_nothing() { action do_nothing() {
EthAddr_t temp = p.ethernet.dstAddr; EthAddr_t temp = hdr.ethernet.dstAddr;
} }
table lookup_table { table lookup_table {
key = { key = {
p.ethernet.dstAddr: exact; hdr.ethernet.dstAddr: exact;
} }
actions = { actions = {
@ -124,13 +130,22 @@ control TopPipe(inout Parsed_packet p,
*/ */
@Xilinx_MaxPacketRegion(1024) @Xilinx_MaxPacketRegion(1024)
control TopDeparser(packet_out b, control TopDeparser(packet_out packet,
in Parsed_packet p, in headers hdr,
in user_metadata_t user_metadata, in metadata meta,
inout digest_data_t digest_data, inout digest_data_t digest_data,
inout sume_metadata_t sume_metadata) { inout sume_metadata_t sume_metadata) {
// @Xilinx_MaxPacketRegion(1024)
// control TopDeparser(packet_out b,
// in Parsed_packet p,
// in user_metadata_t user_metadata,
// inout digest_data_t digest_data,
// inout sume_metadata_t sume_metadata) {
apply { apply {
b.emit(p.ethernet); packet.emit(hdr.ethernet);
} }
} }