mirror of
https://github.com/oxen-io/lokinet.git
synced 2024-11-19 09:25:28 +00:00
329da951b7
- Add a C callback interface (context_wrapper.h) between lokinet and the
objective-C code so that:
- we can use objective-C (rather than objective-C++), which seems more
likely to be supported by Apple into the future;
- we minimize the amount of code that needs to be aware of the Apple
APIs.
- this replaces apple logger objective c++ implementation with a plain
c++ implementation that takes a very simple C callback (provided
from the obj-c code) to actually make the call to NSLog.
- Add various documentation to the code of what is going on.
- Send all DNS traffic to the primary IP on the tun interface. The
match prefixes simply don't work as advertised, and have weird shit
(like even if you get it working for some domains, "instagram.com"
still doesn't because of god-knows-what Apple internal politics).
- Drop the dns proxy code as we don't need it anymore.
- Don't use 9.9.9.9 for default DNS. (We might consider the unfiltered
9.9.9.10 as an alternative default, but if we do it should be a global
lokinet change rather than a Mac-specific change).
- Parse a lokinet.ini in the data directory, if it exists. (Since we
are sandboxed, it is an app-specific "home" directory so is probably
buried god knows where, but at least the GUI ought to be able to get
it to let users add things to it).
- This commit also adds a swift version of the PacketTunnelProvider
glue, which ought to work in theory, but the *tooling* for cmake is so
underdeveloped that I couldn't find any way to actually get the damn
thing working. So I'm committing it here anyway (and will revert it
away in the next commit) in case we someday want to switch to it.
-
41 lines
803 B
C++
41 lines
803 B
C++
#pragma once
|
|
|
|
#include <llarp/util/logging/logger.hpp>
|
|
#include <llarp/util/logging/logstream.hpp>
|
|
|
|
namespace llarp::apple
|
|
{
|
|
struct NSLogStream : public ILogStream
|
|
{
|
|
using ns_logger_callback = void (*)(const char* log_this);
|
|
|
|
NSLogStream(ns_logger_callback logger) : ns_logger{logger}
|
|
{}
|
|
|
|
void
|
|
PreLog(
|
|
std::stringstream& s,
|
|
LogLevel lvl,
|
|
const char* fname,
|
|
int lineno,
|
|
const std::string& nodename) const override;
|
|
|
|
void
|
|
Print(LogLevel lvl, const char* tag, const std::string& msg) override;
|
|
|
|
void
|
|
PostLog(std::stringstream& ss) const override
|
|
{}
|
|
|
|
void
|
|
ImmediateFlush() override
|
|
{}
|
|
|
|
void Tick(llarp_time_t) override
|
|
{}
|
|
|
|
private:
|
|
ns_logger_callback ns_logger;
|
|
};
|
|
} // namespace llarp::apple
|