X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Factions.c;h=a28e98662db314b23486b48d1f321c1b1a7f1aed;hb=cb4ef1ea12789af09fe9a6634012cf0f3797a56a;hp=945c461cdc01c6dd965ddc9a9a20ecb24ac569e7;hpb=e9141eec249f97e547c6e47205b61ee98d9b52e9;p=openvswitch

diff --git a/datapath/actions.c b/datapath/actions.c
index 945c461c..a28e9866 100644
--- a/datapath/actions.c
+++ b/datapath/actions.c
@@ -13,6 +13,7 @@
 #include <linux/skbuff.h>
 #include <linux/in.h>
 #include <linux/ip.h>
+#include <linux/openvswitch.h>
 #include <linux/tcp.h>
 #include <linux/udp.h>
 #include <linux/in6.h>
@@ -25,7 +26,6 @@
 #include "actions.h"
 #include "checksum.h"
 #include "datapath.h"
-#include "openvswitch/datapath-protocol.h"
 #include "vlan.h"
 #include "vport.h"
 
@@ -245,13 +245,31 @@ static int do_output(struct datapath *dp, struct sk_buff *skb, int out_port)
 	return 0;
 }
 
-static int output_userspace(struct datapath *dp, struct sk_buff *skb, u64 arg)
+static int output_userspace(struct datapath *dp, struct sk_buff *skb,
+			    const struct nlattr *attr)
 {
 	struct dp_upcall_info upcall;
+	const struct nlattr *a;
+	int rem;
 
 	upcall.cmd = OVS_PACKET_CMD_ACTION;
 	upcall.key = &OVS_CB(skb)->flow->key;
-	upcall.userdata = arg;
+	upcall.userdata = NULL;
+	upcall.pid = 0;
+
+	for (a = nla_data(attr), rem = nla_len(attr); rem > 0;
+		 a = nla_next(a, &rem)) {
+		switch (nla_type(a)) {
+		case OVS_USERSPACE_ATTR_USERDATA:
+			upcall.userdata = a;
+			break;
+
+		case OVS_USERSPACE_ATTR_PID:
+			upcall.pid = nla_get_u32(a);
+			break;
+		}
+	}
+
 	return dp_upcall(dp, skb, &upcall);
 }
 
@@ -308,7 +326,7 @@ static int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
 			break;
 
 		case OVS_ACTION_ATTR_USERSPACE:
-			output_userspace(dp, skb, nla_get_u64(a));
+			output_userspace(dp, skb, a);
 			break;
 
 		case OVS_ACTION_ATTR_SET_TUNNEL: