*/
struct GNUNET_REGEX_Automaton;
+
/**
* Edge representation.
*/
struct GNUNET_REGEX_Edge
{
/**
- * Label of the edge.
+ * Label of the edge. FIXME: might want to not consume exactly multiples of 8 bits, need length?
*/
const char *label;
/**
* Destionation of the edge.
*/
- GNUNET_HashCode destination;
+ struct GNUNET_HashCode destination;
};
+
/**
* Construct an NFA by parsing the regex string of length 'len'.
*
struct GNUNET_REGEX_Automaton *
GNUNET_REGEX_construct_nfa (const char *regex, const size_t len);
+
/**
* Construct DFA for the given 'regex' of length 'len'.
*
struct GNUNET_REGEX_Automaton *
GNUNET_REGEX_construct_dfa (const char *regex, const size_t len);
+
/**
* Free the memory allocated by constructing the GNUNET_REGEX_Automaton.
* data structure.
void
GNUNET_REGEX_automaton_destroy (struct GNUNET_REGEX_Automaton *a);
+
/**
- * Save the given automaton as a GraphViz dot file.
+ * Save the given automaton as a GraphViz dot file
*
- * @param a the automaton to be saved.
- * @param filename where to save the file.
+ * @param a the automaton to be saved
+ * @param filename where to save the file
+ * @param verbose if set to GNUNET_YES the generated graph will include extra
+ * information such as the NFA states that were used to generate
+ * the DFA state etc.
*/
void
GNUNET_REGEX_automaton_save_graph (struct GNUNET_REGEX_Automaton *a,
- const char *filename);
+ const char *filename,
+ int verbose);
+
/**
* Evaluates the given 'string' against the given compiled regex.
GNUNET_REGEX_eval (struct GNUNET_REGEX_Automaton *a,
const char *string);
+
/**
+ * Get the first key for the given 'input_string'. This hashes
+ * the first x bits of the 'input_string'.
+ *
+ * @param input_string string.
+ * @param string_len length of the 'input_string'.
+ * @param key pointer to where to write the hash code.
+ *
* @return number of bits of 'input_string' that have been consumed
* to construct the key
*/
-unsigned int
-GNUNET_REGEX_get_first_key (const char *input_string,
- unsigned int string_len,
- GNUNET_HashCode *key);
+size_t
+GNUNET_REGEX_get_first_key (const char *input_string, size_t string_len,
+ struct GNUNET_HashCode * key);
/**
* Check if the given 'proof' matches the given 'key'.
*
- * @param proof partial regex
- * @param key hash
+ * @param proof partial regex of a state.
+ * @param key hash of a state.
*
- * @return GNUNET_OK if the proof is valid for the given key
+ * @return GNUNET_OK if the proof is valid for the given key.
*/
int
GNUNET_REGEX_check_proof (const char *proof,
- const GNUNET_HashCode *key);
+ const struct GNUNET_HashCode *key);
/**
* @param edges edges leaving current state.
*/
typedef void (*GNUNET_REGEX_KeyIterator)(void *cls,
- const GNUNET_HashCode *key,
+ const struct GNUNET_HashCode *key,
const char *proof,
int accepting,
unsigned int num_edges,