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
44 lines
1.1 KiB
C++
44 lines
1.1 KiB
C++
#include <stdlib.h>
|
|
|
|
#include <fstream>
|
|
#include <iostream>
|
|
#include <iterator>
|
|
#include <string>
|
|
|
|
#define OONIFFI_EMULATE_MK_API
|
|
#include "ooniffi.h"
|
|
|
|
int main(int argc, char **argv) {
|
|
if (argc != 2) {
|
|
std::clog << "usage: ffirun /path/to/json/settings" << std::endl;
|
|
exit(1);
|
|
}
|
|
std::ifstream filep(argv[1]);
|
|
if (!filep.good()) {
|
|
std::clog << "fatal: cannot open settings file" << std::endl;
|
|
exit(1);
|
|
}
|
|
std::string settings((std::istreambuf_iterator<char>(filep)),
|
|
std::istreambuf_iterator<char>());
|
|
auto taskp = mk_task_start(settings.c_str());
|
|
if (taskp == nullptr) {
|
|
std::clog << "fatal: cannot start task" << std::endl;
|
|
exit(1);
|
|
}
|
|
while (!mk_task_is_done(taskp)) {
|
|
auto evp = mk_task_wait_for_next_event(taskp);
|
|
if (evp == nullptr) {
|
|
std::clog << "warning: cannot wait for next event" << std::endl;
|
|
break;
|
|
}
|
|
auto evstr = mk_event_serialization(evp);
|
|
if (evstr != nullptr) {
|
|
std::cout << evstr << std::endl;
|
|
} else {
|
|
std::clog << "warning: cannot get event serialization" << std::endl;
|
|
}
|
|
mk_event_destroy(evp);
|
|
}
|
|
mk_task_destroy(taskp);
|
|
}
|