oval_agent_api.h   oval_agent_api.h 
skipping to change at line 77 skipping to change at line 77
* Probe the system and evaluate specified definition * Probe the system and evaluate specified definition
*/ */
oval_result_t oval_agent_eval_definition(oval_agent_session_t * ag_sess, co nst char *id); oval_result_t oval_agent_eval_definition(oval_agent_session_t * ag_sess, co nst char *id);
/** /**
* Clean resuls that were generated in this agent session * Clean resuls that were generated in this agent session
*/ */
int oval_agent_reset_session(oval_agent_session_t * ag_sess); int oval_agent_reset_session(oval_agent_session_t * ag_sess);
/** /**
* Abort a running probe session
*/
int oval_agent_abort_session(oval_agent_session_t *ag_sess);
/**
* Probe and evaluate all definitions from the content, call the callback f unctions upon single evaluation * Probe and evaluate all definitions from the content, call the callback f unctions upon single evaluation
*/ */
int oval_agent_eval_system(oval_agent_session_t * ag_sess, oscap_reporter c b, void *arg); int oval_agent_eval_system(oval_agent_session_t * ag_sess, oscap_reporter c b, void *arg);
/** /**
* Get a result model from agent session * Get a result model from agent session
*/ */
struct oval_results_model * oval_agent_get_results_model(oval_agent_session _t * ag_sess); struct oval_results_model * oval_agent_get_results_model(oval_agent_session _t * ag_sess);
/** /**
* Get a filename under which was created * Get a filename under which was created
 End of changes. 1 change blocks. 
0 lines changed or deleted 5 lines changed or added


 oval_definitions.h   oval_definitions.h 
skipping to change at line 559 skipping to change at line 559
* @see oval_definition_get_notes * @see oval_definition_get_notes
* @see oval_test_get_notes * @see oval_test_get_notes
* @see oval_object_get_notes * @see oval_object_get_notes
* @see oval_state_get_notes * @see oval_state_get_notes
* @see oval_affected_get_platforms * @see oval_affected_get_platforms
* @see oval_affected_get_products * @see oval_affected_get_products
*/ */
struct oval_string_iterator; struct oval_string_iterator;
/** /**
* @struct oval_generator
*/
struct oval_generator;
struct oval_generator *oval_generator_new(void);
void oval_generator_free(struct oval_generator *generator);
struct oval_generator *oval_genrator_clone(struct oval_generator *old_gener
ator);
char *oval_generator_get_product_name(struct oval_generator *generator);
char *oval_generator_get_product_version(struct oval_generator *generator);
char *oval_generator_get_schema_version(struct oval_generator *generator);
char *oval_generator_get_timestamp(struct oval_generator *generator);
bool oval_generator_is_valid(struct oval_generator *generator);
void oval_generator_set_product_name(struct oval_generator *generator, char
*product_name);
void oval_generator_set_product_version(struct oval_generator *generator, c
har *product_version);
void oval_generator_set_schema_version(struct oval_generator *generator, ch
ar *schema_version);
void oval_generator_set_timestamp(struct oval_generator *generator, char *t
imestamp);
/**
* Create an empty oval_definition_model. * Create an empty oval_definition_model.
* @memberof oval_definition_model * @memberof oval_definition_model
*/ */
struct oval_definition_model *oval_definition_model_new(void); struct oval_definition_model *oval_definition_model_new(void);
/** /**
* Import the content from the file into an oval_definition_model. * Import the content from the file into an oval_definition_model.
* @param file filename * @param file filename
* @return new oval_definition_model, or NULL if an error occurred * @return new oval_definition_model, or NULL if an error occurred
* @memberof oval_definition_model * @memberof oval_definition_model
*/ */
skipping to change at line 603 skipping to change at line 621
/** /**
* Free OVAL object model. * Free OVAL object model.
* @memberof oval_definition_model * @memberof oval_definition_model
*/ */
void oval_definition_model_free(struct oval_definition_model *model); void oval_definition_model_free(struct oval_definition_model *model);
/** /**
* @name Setters * @name Setters
* @{ * @{
*/ */
void oval_definition_model_set_generator(struct oval_definition_model *mode l, struct oval_generator *generator);
/** /**
* Bind an oval_variable_model to the specified oval_definition_model. * Bind an oval_variable_model to the specified oval_definition_model.
* @return zero on success or non zero value if an error occurred * @return zero on success or non zero value if an error occurred
* @memberof oval_definition_model * @memberof oval_definition_model
*/ */
int oval_definition_model_bind_variable_model(struct oval_definition_model *, struct oval_variable_model *); int oval_definition_model_bind_variable_model(struct oval_definition_model *, struct oval_variable_model *);
void oval_definition_model_clear_external_variables(struct oval_definition_ model *); void oval_definition_model_clear_external_variables(struct oval_definition_ model *);
/** /**
* Lock the definition_model instance. * Lock the definition_model instance.
skipping to change at line 624 skipping to change at line 643
* This operation has no effect if the model is already locked. * This operation has no effect if the model is already locked.
* @memberof oval_definition_model * @memberof oval_definition_model
*/ */
void oval_definition_model_lock(struct oval_definition_model *definition_mo del); void oval_definition_model_lock(struct oval_definition_model *definition_mo del);
/** @} */ /** @} */
/** /**
* @name Getters * @name Getters
* @{ * @{
*/ */
struct oval_generator *oval_definition_model_get_generator(struct oval_defi nition_model *model);
/** /**
* Returns the appended @ref oval_definition having the specified id. * Returns the appended @ref oval_definition having the specified id.
* IF the specified id does not resolve to an appended Oval_definition the method shall return NULL. * IF the specified id does not resolve to an appended Oval_definition the method shall return NULL.
* @see oval_definition_add_definition * @see oval_definition_add_definition
* @param id the definition id. * @param id the definition id.
* @memberof oval_definition_model * @memberof oval_definition_model
*/ */
struct oval_definition *oval_definition_model_get_definition(struct oval_de finition_model *, const char *id); struct oval_definition *oval_definition_model_get_definition(struct oval_de finition_model *, const char *id);
/** /**
* Get oval test by ID. * Get oval test by ID.
 End of changes. 3 change blocks. 
0 lines changed or deleted 25 lines changed or added


 oval_probe.h   oval_probe.h 
skipping to change at line 53 skipping to change at line 53
#define OVAL_PDFLAG_NOREPLY 0x0001 /**< don't send probe result to libr ary - just an ack */ #define OVAL_PDFLAG_NOREPLY 0x0001 /**< don't send probe result to libr ary - just an ack */
#define OVAL_PDFLAG_NORECONN 0x0002 /**< don't try to reconnect on fatal errors */ #define OVAL_PDFLAG_NORECONN 0x0002 /**< don't try to reconnect on fatal errors */
#define OVAL_PDGLAG_RUNALL 0x0004 /**< execute all probes when executi ng the first */ #define OVAL_PDGLAG_RUNALL 0x0004 /**< execute all probes when executi ng the first */
#define OVAL_PDFLAG_RUNNOW 0x0008 /**< execute all probes immediately */ #define OVAL_PDFLAG_RUNNOW 0x0008 /**< execute all probes immediately */
#define OVAL_PDFLAG_MASK (0x0001|0x0002|0x0004|0x0008) #define OVAL_PDFLAG_MASK (0x0001|0x0002|0x0004|0x0008)
/** /**
* Evaluate system info probe * Evaluate system info probe
* @param sess probe session * @param sess probe session
* @param out_sysinfo address of a pointer to hold the result
*/ */
struct oval_sysinfo *oval_probe_query_sysinfo(oval_probe_session_t *sess) _ _attribute__ ((nonnull(1))); int oval_probe_query_sysinfo(oval_probe_session_t *sess, struct oval_sysinf o **out_sysinfo) __attribute__ ((nonnull(1, 2)));
/** /**
* Evaluate an object * Evaluate an object
* @param sess probe session * @param sess probe session
* @param object the object to evaluate * @param object the object to evaluate
*/ */
int oval_probe_query_object(oval_probe_session_t *psess, struct oval_object *object, int flags, struct oval_syschar **out_syschar) __attribute__ ((non null(1, 2))); int oval_probe_query_object(oval_probe_session_t *psess, struct oval_object *object, int flags, struct oval_syschar **out_syschar) __attribute__ ((non null(1, 2)));
/** /**
* Probe all objects and update system characteristic model in the session * Probe all objects and update system characteristic model in the session
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 oval_probe_handler.h   oval_probe_handler.h 
skipping to change at line 52 skipping to change at line 52
* your particular case). * your particular case).
*/ */
typedef int (oval_probe_handler_t)(oval_subtype_t, void *, int, ...); typedef int (oval_probe_handler_t)(oval_subtype_t, void *, int, ...);
#define PROBE_HANDLER_ACT_INIT 0 #define PROBE_HANDLER_ACT_INIT 0
#define PROBE_HANDLER_ACT_FREE 1 #define PROBE_HANDLER_ACT_FREE 1
#define PROBE_HANDLER_ACT_OPEN 2 #define PROBE_HANDLER_ACT_OPEN 2
#define PROBE_HANDLER_ACT_EVAL 3 #define PROBE_HANDLER_ACT_EVAL 3
#define PROBE_HANDLER_ACT_RESET 4 #define PROBE_HANDLER_ACT_RESET 4
#define PROBE_HANDLER_ACT_CLOSE 5 #define PROBE_HANDLER_ACT_CLOSE 5
#define PROBE_HANDLER_ACT_ABORT 6
#define PROBE_HANDLER_IGNORE NULL #define PROBE_HANDLER_IGNORE NULL
#endif /* OVAL_PROBE_HANDLER */ #endif /* OVAL_PROBE_HANDLER */
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 oval_probe_session.h   oval_probe_session.h 
skipping to change at line 68 skipping to change at line 68
/** /**
* Reset the session. All state information created during the lifetime of the * Reset the session. All state information created during the lifetime of the
* session is freed and reset to its initial state. All cached results are lost. * session is freed and reset to its initial state. All cached results are lost.
* @param sess pointer to the probe session structure * @param sess pointer to the probe session structure
* @param sysch pointer to a new syschar model or NULL * @param sysch pointer to a new syschar model or NULL
*/ */
int oval_probe_session_reset(oval_probe_session_t *sess, struct oval_syscha r_model *sysch); int oval_probe_session_reset(oval_probe_session_t *sess, struct oval_syscha r_model *sysch);
/** /**
* Abort the session.
*/
int oval_probe_session_abort(oval_probe_session_t *sess);
/**
* Set a new handler for an object of the specified type. * Set a new handler for an object of the specified type.
* @param sess pointer to the probe session structure * @param sess pointer to the probe session structure
* @param type object type * @param type object type
* @param handler * @param handler
* @param ptr user pointer that will be passed to the handler on each invoc ation of the handler * @param ptr user pointer that will be passed to the handler on each invoc ation of the handler
*/ */
int oval_probe_session_sethandler(oval_probe_session_t *sess, oval_subtype_ t type, oval_probe_handler_t handler, void *ptr); int oval_probe_session_sethandler(oval_probe_session_t *sess, oval_subtype_ t type, oval_probe_handler_t handler, void *ptr);
/** /**
* Get system characteristics model from probe session. * Get system characteristics model from probe session.
 End of changes. 1 change blocks. 
0 lines changed or deleted 5 lines changed or added


 oval_results.h   oval_results.h 
skipping to change at line 188 skipping to change at line 188
* @param model the oval_results_model * @param model the oval_results_model
* @param file filename * @param file filename
* @memberof oval_results_model * @memberof oval_results_model
*/ */
int oval_results_model_export(struct oval_results_model *, struct oval_resu lt_directives *, const char *file); int oval_results_model_export(struct oval_results_model *, struct oval_resu lt_directives *, const char *file);
/** /**
* @name Setters * @name Setters
* @{ * @{
*/ */
void oval_results_model_set_generator(struct oval_results_model *model, str uct oval_generator *generator);
/** /**
* Lock the result_model instance. * Lock the result_model instance.
* The state of a locked instance cannot be changed. * The state of a locked instance cannot be changed.
* This operation has no effect if the model is already locked. * This operation has no effect if the model is already locked.
* @memberof oval_results_model * @memberof oval_results_model
*/ */
void oval_results_model_lock(struct oval_results_model *result_model); void oval_results_model_lock(struct oval_results_model *result_model);
/** @} */ /** @} */
/** /**
* @name Getters * @name Getters
* @{ * @{
*/ */
struct oval_generator *oval_results_model_get_generator(struct oval_results _model *model);
/** /**
* Return bound definition model from an oval_results_model. * Return bound definition model from an oval_results_model.
* @param model the specified oval_results_model. * @param model the specified oval_results_model.
* @memberof oval_results_model * @memberof oval_results_model
*/ */
struct oval_definition_model *oval_results_model_get_definition_model(struc t oval_results_model *model); struct oval_definition_model *oval_results_model_get_definition_model(struc t oval_results_model *model);
/** /**
* Return iterator over reporting systems. * Return iterator over reporting systems.
* @param model the specified results model * @param model the specified results model
 End of changes. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added


 oval_system_characteristics.h   oval_system_characteristics.h 
skipping to change at line 217 skipping to change at line 217
* Free memory allocated to a specified syschar model. * Free memory allocated to a specified syschar model.
* @param model the specified syschar model * @param model the specified syschar model
* @memberof oval_syschar_model * @memberof oval_syschar_model
*/ */
void oval_syschar_model_free(struct oval_syschar_model *model); void oval_syschar_model_free(struct oval_syschar_model *model);
/** /**
* @name Setters * @name Setters
* @{ * @{
*/ */
void oval_syschar_model_set_generator(struct oval_syschar_model *model, str uct oval_generator *generator);
/** /**
* Bind a variable model to the definitions bound to the syschar model. * Bind a variable model to the definitions bound to the syschar model.
* @return zero on success or non zero value if an error occurred * @return zero on success or non zero value if an error occurred
* @memberof oval_syschar_model * @memberof oval_syschar_model
*/ */
int oval_syschar_model_bind_variable_model(struct oval_syschar_model *, str uct oval_variable_model *); int oval_syschar_model_bind_variable_model(struct oval_syschar_model *, str uct oval_variable_model *);
/** /**
* @memberof oval_syschar_model * @memberof oval_syschar_model
*/ */
void oval_syschar_model_set_sysinfo(struct oval_syschar_model *model, struc t oval_sysinfo *sysinfo); void oval_syschar_model_set_sysinfo(struct oval_syschar_model *model, struc t oval_sysinfo *sysinfo);
skipping to change at line 244 skipping to change at line 245
* This operation has no effect if the model is already locked. * This operation has no effect if the model is already locked.
* @memberof oval_syschar_model * @memberof oval_syschar_model
*/ */
void oval_syschar_model_lock(struct oval_syschar_model *syschar_model); void oval_syschar_model_lock(struct oval_syschar_model *syschar_model);
/** @} */ /** @} */
/** /**
* @name Getters * @name Getters
* @{ * @{
*/ */
struct oval_generator *oval_syschar_model_get_generator(struct oval_syschar _model *model);
/** /**
* Return related oval_definition_model from an oval_syschar_model. * Return related oval_definition_model from an oval_syschar_model.
* @param model the specified oval_syschar_model. * @param model the specified oval_syschar_model.
* @memberof oval_syschar_model * @memberof oval_syschar_model
*/ */
struct oval_definition_model *oval_syschar_model_get_definition_model(struc t oval_syschar_model *model); struct oval_definition_model *oval_syschar_model_get_definition_model(struc t oval_syschar_model *model);
/** /**
* Return an iterator over the oval_sychar objects persisted by this model. * Return an iterator over the oval_sychar objects persisted by this model.
* @param model the specified oval_syschar_model. * @param model the specified oval_syschar_model.
* @memberof oval_syschar_model * @memberof oval_syschar_model
 End of changes. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added


 oval_variables.h   oval_variables.h 
skipping to change at line 75 skipping to change at line 75
/** /**
* Export the specified oval_variable_model into file * Export the specified oval_variable_model into file
* @memberof oval_variable_model * @memberof oval_variable_model
*/ */
int oval_variable_model_export (struct oval_variable_model *, const char *f ile); int oval_variable_model_export (struct oval_variable_model *, const char *f ile);
/** /**
* @name Setters * @name Setters
* @{ * @{
*/ */
void oval_variable_model_set_generator(struct oval_variable_model *model, s truct oval_generator *generator);
/** /**
* Lock the variable_model instance. * Lock the variable_model instance.
* The state of a locked instance cannot be changed. * The state of a locked instance cannot be changed.
* This operation has no effect if the model is already locked. * This operation has no effect if the model is already locked.
* @memberof oval_variable_model * @memberof oval_variable_model
*/ */
void oval_variable_model_lock(struct oval_variable_model *variable_model); void oval_variable_model_lock(struct oval_variable_model *variable_model);
/** /**
* Get the values bound to a specified external variable. * Get the values bound to a specified external variable.
* If the varid does not resolve to a managed external variable, this metho d returns NULL. * If the varid does not resolve to a managed external variable, this metho d returns NULL.
skipping to change at line 96 skipping to change at line 97
* @param varid the identifier of the required oval_variable. * @param varid the identifier of the required oval_variable.
* @memberof oval_variable_model * @memberof oval_variable_model
*/ */
void oval_variable_model_add(struct oval_variable_model *model, char *varid , const char *comment, oval_datatype_t datatype, char *value); void oval_variable_model_add(struct oval_variable_model *model, char *varid , const char *comment, oval_datatype_t datatype, char *value);
/** @} */ /** @} */
/** /**
* @name Getters * @name Getters
* @{ * @{
*/ */
struct oval_generator *oval_variable_model_get_generator(struct oval_variab le_model *model);
/** /**
* Get all external variables managed by a specified oval_variable_model. * Get all external variables managed by a specified oval_variable_model.
* @param variable_model the specified oval_variable_model. * @param variable_model the specified oval_variable_model.
* @memberof oval_variable_model * @memberof oval_variable_model
*/ */
struct oval_string_iterator *oval_variable_model_get_variable_ids (struct o val_variable_model *); struct oval_string_iterator *oval_variable_model_get_variable_ids (struct o val_variable_model *);
/** /**
* Return true if variable with ID is present in variable model, false othe rwise * Return true if variable with ID is present in variable model, false othe rwise
* @param model Variable model * @param model Variable model
 End of changes. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/