X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Flearn.h;h=0e676fe9866d96c65197eef44e9fc36bd3ad354f;hb=003ce655b7116d18c86a74c50391e54990346931;hp=19a9089c2e0069e858f28cf8a54abc9fb3409c36;hpb=75a75043564dc9b002fffa6c6ad71e0d4d5c892e;p=sliver-openvswitch.git

diff --git a/lib/learn.h b/lib/learn.h
index 19a9089c2..0e676fe98 100644
--- a/lib/learn.h
+++ b/lib/learn.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Nicira Networks.
+ * Copyright (c) 2011, 2012, 2013 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,9 +17,14 @@
 #ifndef LEARN_H
 #define LEARN_H 1
 
+#include "compiler.h"
+#include "ofp-errors.h"
+
 struct ds;
 struct flow;
+struct flow_wildcards;
 struct ofpbuf;
+struct ofpact_learn;
 struct ofputil_flow_mod;
 struct nx_action_learn;
 
@@ -28,11 +33,16 @@ struct nx_action_learn;
  * See include/openflow/nicira-ext.h for NXAST_LEARN specification.
  */
 
-int learn_check(const struct nx_action_learn *, const struct flow *);
-void learn_execute(const struct nx_action_learn *, const struct flow *,
-                   struct ofputil_flow_mod *);
+enum ofperr learn_from_openflow(const struct nx_action_learn *,
+                                struct ofpbuf *ofpacts);
+enum ofperr learn_check(const struct ofpact_learn *, const struct flow *);
+void learn_to_nxast(const struct ofpact_learn *, struct ofpbuf *openflow);
+
+void learn_execute(const struct ofpact_learn *, const struct flow *,
+                   struct ofputil_flow_mod *, struct ofpbuf *ofpacts);
+void learn_mask(const struct ofpact_learn *, struct flow_wildcards *);
 
-void learn_parse(struct ofpbuf *, char *, const struct flow *);
-void learn_format(const struct nx_action_learn *, struct ds *);
+char *learn_parse(char *, struct ofpbuf *ofpacts) WARN_UNUSED_RESULT;
+void learn_format(const struct ofpact_learn *, struct ds *);
 
 #endif /* learn.h */