d57c78bc71
This is how I did it: 1. `git clone https://github.com/ooni/probe-engine internal/engine` 2. ``` (cd internal/engine && git describe --tags) v0.23.0 ``` 3. `nvim go.mod` (merging `go.mod` with `internal/engine/go.mod` 4. `rm -rf internal/.git internal/engine/go.{mod,sum}` 5. `git add internal/engine` 6. `find . -type f -name \*.go -exec sed -i 's@/ooni/probe-engine@/ooni/probe-cli/v3/internal/engine@g' {} \;` 7. `go build ./...` (passes) 8. `go test -race ./...` (temporary failure on RiseupVPN) 9. `go mod tidy` 10. this commit message Once this piece of work is done, we can build a new version of `ooniprobe` that is using `internal/engine` directly. We need to do more work to ensure all the other functionality in `probe-engine` (e.g. making mobile packages) are still WAI. Part of https://github.com/ooni/probe/issues/1335
52 lines
1.5 KiB
C
52 lines
1.5 KiB
C
#ifndef INCLUDE_OONIFFI_H_
|
|
#define INCLUDE_OONIFFI_H_
|
|
|
|
#include <stdint.h>
|
|
#include <stdlib.h>
|
|
|
|
/*
|
|
* ABI compatible with Measurement Kit v0.10.11 [1].
|
|
*
|
|
* Just replace `mk_` with `ooniffi_` and recompile.
|
|
*
|
|
* .. [1] https://github.com/measurement-kit/measurement-kit/tree/v0.10.11/
|
|
*
|
|
* This is not used in any OONI product. We may break something
|
|
* in ooniffi without noticing it. Please, be aware of that.
|
|
*/
|
|
|
|
typedef struct ooniffi_task_ ooniffi_task_t;
|
|
typedef struct ooniffi_event_ ooniffi_event_t;
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
extern ooniffi_task_t *ooniffi_task_start(const char *settings);
|
|
extern ooniffi_event_t *ooniffi_task_wait_for_next_event(ooniffi_task_t *task);
|
|
extern int ooniffi_task_is_done(ooniffi_task_t *task);
|
|
extern void ooniffi_task_interrupt(ooniffi_task_t *task);
|
|
extern const char *ooniffi_event_serialization(ooniffi_event_t *str);
|
|
extern void ooniffi_event_destroy(ooniffi_event_t *str);
|
|
extern void ooniffi_task_destroy(ooniffi_task_t *task);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
/*
|
|
* Define OONIFFI_EMULATE_MK_API to provide a MK-compatible API at
|
|
* compile time that will map to ooniffi's own API.
|
|
*/
|
|
#ifdef OONIFFI_EMULATE_MK_API
|
|
#define mk_task_start ooniffi_task_start
|
|
#define mk_task_wait_for_next_event ooniffi_task_wait_for_next_event
|
|
#define mk_task_is_done ooniffi_task_is_done
|
|
#define mk_task_interrupt ooniffi_task_interrupt
|
|
#define mk_event_serialization ooniffi_event_serialization
|
|
#define mk_event_destroy ooniffi_event_destroy
|
|
#define mk_task_destroy ooniffi_task_destroy
|
|
#endif
|
|
|
|
#endif /* INCLUDE_OONIFFI_H_ */
|