1 files changed, 49 insertions, 14 deletions

diff --git a/epan/dfilter/dfunctions.h b/epan/dfilter/dfunctions.h
index 83fa870374..9139001ba6 100644
--- a/epan/dfilter/dfunctions.h
+++ b/epan/dfilter/dfunctions.h
@@ -1,4 +1,5 @@
-/*
+/** @file
+ *
  * Wireshark - Network traffic analyzer
  *
  * Copyright 2006 Gilbert Ramirez <gram@alumni.rice.edu>
@@ -10,33 +11,67 @@
 #define DFUNCTIONS_H
 
 #include <glib.h>
-#include <ftypes/ftypes.h>
-#include "syntax-tree.h"
+#include <epan/ftypes/ftypes.h>
+#include <epan/dfilter/syntax-tree.h>
+#include <epan/dfilter/dfilter-int.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* Functions take any number of arguments and return 1. */
+
+#define dfunc_fail(dfw, node, ...) \
+    do { \
+        ws_noisy("Semantic check failed here."); \
+        dfilter_fail_throw(dfw, DF_ERROR_GENERIC, stnode_location(node), __VA_ARGS__); \
+    } while (0)
 
 /* The run-time logic of the dfilter function */
-typedef gboolean (*DFFuncType)(GList *arg1list, GList *arg2list, GList **retval);
+typedef bool (*DFFuncType)(GSList *stack, uint32_t arg_count, df_cell_t *retval);
 
 /* The semantic check for the dfilter function */
-typedef void (*DFSemCheckType)(dfwork_t *dfw, int param_num, stnode_t *st_node);
-
-/* If a function needs more args than this, increase
- * this macro and add more arg members to the dfvm_insn_t
- * struct in dfvm.h, and add some logic to dfw_append_function()
- * and dfvm_apply() */
-#define DFUNCTION_MAX_NARGS 2
+typedef ftenum_t (*DFSemCheckType)(dfwork_t *dfw, const char *func_name, ftenum_t lhs_ftype,
+                                GSList *param_list, df_loc_t func_loc);
 
 /* This is a "function definition" record, holding everything
  * we need to know about a function */
 typedef struct {
     const char      *name;
     DFFuncType      function;
-    ftenum_t        retval_ftype;
-    guint           min_nargs;
-    guint           max_nargs;
+    unsigned        min_nargs;
+    unsigned        max_nargs; /* 0 for no limit */
+    ftenum_t        return_ftype; /* Can be FT_NONE if the function returns the same type
+                                   * as its arguments. */
     DFSemCheckType  semcheck_param_function;
 } df_func_def_t;
 
+WS_DLL_PUBLIC
+ftenum_t
+df_semcheck_param(dfwork_t *dfw, const char *func_name, ftenum_t logical_ftype,
+                            stnode_t *param, df_loc_t func_loc);
+
+void df_func_init(void);
+
+/* Returns false if the function name already exists. */
+WS_DLL_PUBLIC
+bool df_func_register(df_func_def_t *func);
+
+WS_DLL_PUBLIC
+bool df_func_deregister(df_func_def_t *func);
+
 /* Return the function definition record for a function of named "name" */
+WS_DLL_PUBLIC
 df_func_def_t* df_func_lookup(const char *name);
 
+/* You must call g_ptr_array_unref() when you are done. */
+WS_DLL_PUBLIC
+GPtrArray *df_func_name_list(void);
+
+void df_func_cleanup(void);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif