experimenter match field refactoring (V.0.1)

nikchez01 · Jun 3, 2015 · bfc7a48 · bfc7a48
1 parent 98d1aa9
commit bfc7a48
Show file tree

Hide file tree

Showing 27 changed files with 1,694 additions and 571 deletions.
diff --git a/lib/vconn.c b/lib/vconn.c
@@ -90,12 +90,18 @@ static struct ofl_exp_stats ofl_exp_stats =
          .reply_free    = ofl_exp_stats_reply_free,
          .reply_to_string = ofl_exp_stats_reply_to_string};
 
+static struct ofl_exp_field ofl_exp_field =
+        {.unpack      = ofl_exp_field_unpack, 
+         .pack        = ofl_exp_field_pack,
+         .match       = ofl_exp_field_match};
+
 static struct ofl_exp ofl_exp =
         {.act   = &ofl_exp_act,
          .inst  = NULL,
          .match = NULL,
          .stats = &ofl_exp_stats,
-         .msg   = &ofl_exp_msg};
+         .msg   = &ofl_exp_msg,
+         .field = &ofl_exp_field};
 
 static struct vconn_class *vconn_classes[] = {
     &tcp_vconn_class,

diff --git a/lib/vlog.h b/lib/vlog.h
@@ -196,5 +196,7 @@ void print_file(const char* format, ...);
     } while (0)
 extern enum vlog_level min_vlog_levels[VLM_N_MODULES];
 
+void
+pfile(const char* format, ...);
 
 #endif /* vlog.h */
diff --git a/oflib-exp/ofl-exp-openflow.h b/oflib-exp/ofl-exp-openflow.h
@@ -90,7 +90,4 @@ ofl_exp_openflow_act_free(struct ofl_action_header *act);
 char *
 ofl_exp_openflow_act_to_string(struct ofl_action_header *act);
 
-void
-ofl_exp_stats_type_print(FILE *stream, uint32_t type);
-
 #endif /* OFL_EXP_OPENFLOW_H */