mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 22:35:15 +00:00
Code Issues Releases Wiki Activity

ofproto-dpif: Implement PACKET_IN in userspace.

Browse Source 
In future patches, PACKET_IN messages will include meta-data which
is only available in userspace during action translation.  Either,
this data needs to be stored until it's required by a userspace
datapath action, or the PACKET_IN messages must be sent at the time
the data is available.  This patch implements the latter.

Signed-off-by: Ethan Jackson <ethan@nicira.com>
This commit is contained in:
Ethan Jackson
2011-12-15 15:21:23 -08:00
parent 102ce76655
commit 999fba59af
4 changed files with 77 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/odp-util.c
View File

@@ -189,9 +189,7 @@ format_odp_userspace_action(struct ds *ds, const struct nlattr *attr)
memcpy(&cookie, &userdata, sizeof cookie);
if (cookie.type == USER_ACTION_COOKIE_CONTROLLER) {
ds_put_format(ds, ",controller,length=%"PRIu32, cookie.data);
} else if (cookie.type == USER_ACTION_COOKIE_SFLOW) {
if (cookie.type == USER_ACTION_COOKIE_SFLOW) {
ds_put_format(ds, ",sFlow,n_output=%"PRIu8","
"vid=%"PRIu16",pcp=%"PRIu8",ifindex=%"PRIu32,
cookie.n_output, vlan_tci_to_vid(cookie.vlan_tci),
@@ -328,7 +326,6 @@ parse_odp_action(const char *s, const struct shash *port_names,
{
unsigned long long int pid;
unsigned long long int length;
unsigned long long int ifindex;
char userdata_s[32];
int n_output;
@@ -338,16 +335,6 @@ parse_odp_action(const char *s, const struct shash *port_names,
if (sscanf(s, "userspace(pid=%lli)%n", &pid, &n) > 0 && n > 0) {
odp_put_userspace_action(pid, NULL, actions);
return n;
} else if (sscanf(s, "userspace(pid=%lli,controller,length=%lli)%n",
&pid, &length, &n) > 0 && n > 0) {
struct user_action_cookie cookie;
cookie.type = USER_ACTION_COOKIE_CONTROLLER;
cookie.n_output = 0;
cookie.vlan_tci = htons(0);
cookie.data = length;
odp_put_userspace_action(pid, &cookie, actions);
return n;
} else if (sscanf(s, "userspace(pid=%lli,sFlow,n_output=%i,vid=%i,"
"pcp=%i,ifindex=%lli)%n", &pid, &n_output,
&vid, &pcp, &ifindex, &n) > 0 && n > 0) {