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

Merge controller/egress

Browse source 
As they are interdependent
This commit is contained in:
Nico Schottelius 2019-07-24 11:56:27 +02:00
parent 3559637b56
commit 62d5816d9d
3 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
p4src/actions_controller.p4
View file

@ -1,33 +0,0 @@
#ifndef NICO_CONTROLLER
#define NICO_CONTROLLER
/********************** GENERAL ACTIONS ***********************************/
#ifndef _SUME_SWITCH_P4_
action controller_reply(task_t task) {
meta.task = task;
meta.ingress_port = standard_metadata.ingress_port;
clone3(CloneType.I2E, 100, meta);
}
#else
#include "actions_egress.p4"
action controller_reply(task_t task) {
meta.task = task;
meta.ingress_port = sume_metadata.src_port;
set_egress_port(4); /* port1 = 1, port2 = 2, port3=4 */
}
#endif /* _SUME_SWITCH_P4_ */
action controller_debug_table_id(table_t table_id) {
meta.table_id = table_id;
controller_reply(TASK_DEBUG);
}
action controller_debug() {
controller_reply(TASK_DEBUG);
}
#endif

37
p4src/actions_egress.p4
View file

@ -1,8 +1,7 @@
#ifndef NICO_EGRESS
#define NICO_EGRESS
/********************** ROUTING (egress definiton) TABLES ***********************************/
/********************** EGRESS ACTIONS ***********************************/
action set_egress_port (port_t out_port) {
#ifndef _SUME_SWITCH_P4_
@ -17,6 +16,40 @@ action set_egress_port_and_mac (port_t out_port, mac_addr_t mac_addr) {
set_egress_port(out_port);
}
/********************** GENERAL ACTIONS ***********************************/
#ifndef _SUME_SWITCH_P4_
action controller_reply(task_t task) {
meta.task = task;
meta.ingress_port = standard_metadata.ingress_port;
clone3(CloneType.I2E, 100, meta);
}
#else
#include "actions_egress.p4"
action controller_reply(task_t task) {
meta.task = task;
meta.ingress_port = sume_metadata.src_port;
set_egress_port(4); /* port1 = 1, port2 = 2, port3=4 */
}
#endif /* _SUME_SWITCH_P4_ */
action controller_debug_table_id(table_t table_id) {
meta.table_id = table_id;
controller_reply(TASK_DEBUG);
}
action controller_debug() {
controller_reply(TASK_DEBUG);
}
#endif
/********************** ROUTING (egress definiton) TABLES ***********************************/
table v6_networks {
key = {
hdr.ipv6.dst_addr: lpm;

2
p4src/actions_nat64_generic.p4
View file

@ -1,7 +1,7 @@
#ifndef NICO_NAT64_GENERIC
#define NICO_NAT64_GENERIC
#include "actions_controller.p4"
#include "actions_egress.p4"
#include "actions_delta_checksum.p4"
/********************** NAT64 / NAT46 ACTIONS GENERIC ***********************************/