mirror of https://github.com/PurpleI2P/i2pd
commit
d1de89f387
@ -1,86 +1,167 @@
|
|||||||
#include <boost/date_time/posix_time/posix_time.hpp>
|
/*
|
||||||
|
* Copyright (c) 2013-2016, The PurpleI2P Project
|
||||||
|
*
|
||||||
|
* This file is part of Purple i2pd project and licensed under BSD3
|
||||||
|
*
|
||||||
|
* See full license text in LICENSE file at top of project tree
|
||||||
|
*/
|
||||||
|
|
||||||
#include "Log.h"
|
#include "Log.h"
|
||||||
|
|
||||||
Log * g_Log = nullptr;
|
namespace i2p {
|
||||||
|
namespace log {
|
||||||
|
Log logger;
|
||||||
|
/**
|
||||||
|
* @enum Maps our loglevel to their symbolic name
|
||||||
|
*/
|
||||||
|
static const char * g_LogLevelStr[eNumLogLevels] =
|
||||||
|
{
|
||||||
|
"error", // eLogError
|
||||||
|
"warn", // eLogWarn
|
||||||
|
"info", // eLogInfo
|
||||||
|
"debug" // eLogDebug
|
||||||
|
};
|
||||||
|
|
||||||
static const char * g_LogLevelStr[eNumLogLevels] =
|
#ifndef _WIN32
|
||||||
{
|
/**
|
||||||
"error", // eLogError
|
* @brief Maps our log levels to syslog one
|
||||||
"warn", // eLogWarning
|
* @return syslog priority LOG_*, as defined in syslog.h
|
||||||
"info", // eLogInfo
|
*/
|
||||||
"debug" // eLogDebug
|
static inline int GetSyslogPrio (enum LogLevel l) {
|
||||||
};
|
int priority = LOG_DEBUG;
|
||||||
|
switch (l) {
|
||||||
|
case eLogError : priority = LOG_ERR; break;
|
||||||
|
case eLogWarning : priority = LOG_WARNING; break;
|
||||||
|
case eLogInfo : priority = LOG_INFO; break;
|
||||||
|
case eLogDebug : priority = LOG_DEBUG; break;
|
||||||
|
default : priority = LOG_DEBUG; break;
|
||||||
|
}
|
||||||
|
return priority;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
void LogMsg::Process()
|
Log::Log():
|
||||||
{
|
m_Destination(eLogStdout), m_MinLevel(eLogInfo),
|
||||||
auto stream = log ? log->GetLogStream () : nullptr;
|
m_LogStream (nullptr), m_Logfile(""), m_IsReady(false)
|
||||||
auto& output = stream ? *stream : std::cout;
|
{
|
||||||
if (log)
|
}
|
||||||
output << log->GetTimestamp ();
|
|
||||||
else
|
|
||||||
output << boost::posix_time::second_clock::local_time().time_of_day ();
|
|
||||||
output << "/" << g_LogLevelStr[level] << " - ";
|
|
||||||
output << s.str();
|
|
||||||
}
|
|
||||||
|
|
||||||
const std::string& Log::GetTimestamp ()
|
Log::~Log ()
|
||||||
{
|
|
||||||
#if (__GNUC__ == 4) && (__GNUC_MINOR__ <= 6) && !defined(__clang__)
|
|
||||||
auto ts = std::chrono::monotonic_clock::now ();
|
|
||||||
#else
|
|
||||||
auto ts = std::chrono::steady_clock::now ();
|
|
||||||
#endif
|
|
||||||
if (ts > m_LastTimestampUpdate + std::chrono::milliseconds (500)) // 0.5 second
|
|
||||||
{
|
{
|
||||||
m_LastTimestampUpdate = ts;
|
switch (m_Destination) {
|
||||||
m_Timestamp = boost::posix_time::to_simple_string (boost::posix_time::second_clock::local_time().time_of_day ());
|
#ifndef _WIN32
|
||||||
}
|
case eLogSyslog :
|
||||||
return m_Timestamp;
|
closelog();
|
||||||
}
|
break;
|
||||||
|
#endif
|
||||||
|
case eLogFile:
|
||||||
|
case eLogStream:
|
||||||
|
m_LogStream->flush();
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
/* do nothing */
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
Process();
|
||||||
|
}
|
||||||
|
|
||||||
void Log::Flush ()
|
void Log::SetLogLevel (const std::string& level) {
|
||||||
{
|
if (level == "error") { m_MinLevel = eLogError; }
|
||||||
if (m_LogStream)
|
else if (level == "warn") { m_MinLevel = eLogWarning; }
|
||||||
m_LogStream->flush();
|
else if (level == "info") { m_MinLevel = eLogInfo; }
|
||||||
}
|
else if (level == "debug") { m_MinLevel = eLogDebug; }
|
||||||
|
else {
|
||||||
|
LogPrint(eLogError, "Log: unknown loglevel: ", level);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
LogPrint(eLogInfo, "Log: min messages level set to ", level);
|
||||||
|
}
|
||||||
|
|
||||||
|
const char * Log::TimeAsString(std::time_t t) {
|
||||||
|
if (t != m_LastTimestamp) {
|
||||||
|
strftime(m_LastDateTime, sizeof(m_LastDateTime), "%H:%M:%S", localtime(&t));
|
||||||
|
m_LastTimestamp = t;
|
||||||
|
}
|
||||||
|
return m_LastDateTime;
|
||||||
|
}
|
||||||
|
|
||||||
void Log::SetLogFile (const std::string& fullFilePath, bool truncate)
|
/**
|
||||||
{
|
* @note This function better to be run in separate thread due to disk i/o.
|
||||||
m_FullFilePath = fullFilePath;
|
* Unfortunately, with current startup process with late fork() this
|
||||||
auto mode = std::ofstream::out | std::ofstream::binary;
|
* will give us nothing but pain. Maybe later. See in NetDb as example.
|
||||||
mode |= truncate ? std::ofstream::trunc : std::ofstream::app;
|
*/
|
||||||
auto logFile = std::make_shared<std::ofstream> (fullFilePath, mode);
|
void Log::Process() {
|
||||||
if (logFile->is_open ())
|
std::unique_lock<std::mutex> l(m_OutputLock);
|
||||||
{
|
std::hash<std::thread::id> hasher;
|
||||||
SetLogStream (logFile);
|
unsigned short short_tid;
|
||||||
LogPrint(eLogInfo, "Log: will send messages to ", fullFilePath);
|
while (1) {
|
||||||
}
|
auto msg = m_Queue.GetNextWithTimeout (1);
|
||||||
}
|
if (!msg)
|
||||||
|
break;
|
||||||
|
short_tid = (short) (hasher(msg->tid) % 1000);
|
||||||
|
switch (m_Destination) {
|
||||||
|
#ifndef _WIN32
|
||||||
|
case eLogSyslog:
|
||||||
|
syslog(GetSyslogPrio(msg->level), "[%03u] %s", short_tid, msg->text.c_str());
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
case eLogFile:
|
||||||
|
case eLogStream:
|
||||||
|
*m_LogStream << TimeAsString(msg->timestamp)
|
||||||
|
<< "@" << short_tid
|
||||||
|
<< "/" << g_LogLevelStr[msg->level]
|
||||||
|
<< " - " << msg->text << std::endl;
|
||||||
|
break;
|
||||||
|
case eLogStdout:
|
||||||
|
default:
|
||||||
|
std::cout << TimeAsString(msg->timestamp)
|
||||||
|
<< "@" << short_tid
|
||||||
|
<< "/" << g_LogLevelStr[msg->level]
|
||||||
|
<< " - " << msg->text << std::endl;
|
||||||
|
break;
|
||||||
|
} // switch
|
||||||
|
} // while
|
||||||
|
}
|
||||||
|
|
||||||
void Log::ReopenLogFile ()
|
void Log::Append(std::shared_ptr<i2p::log::LogMsg> & msg) {
|
||||||
{
|
m_Queue.Put(msg);
|
||||||
if (m_FullFilePath.length () > 0)
|
if (!m_IsReady)
|
||||||
{
|
return;
|
||||||
SetLogFile (m_FullFilePath, false); // don't truncate
|
Process();
|
||||||
LogPrint(eLogInfo, "Log: file ", m_FullFilePath, " reopen");
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
void Log::SendTo (const std::string& path) {
|
||||||
|
auto flags = std::ofstream::out | std::ofstream::app;
|
||||||
|
auto os = std::make_shared<std::ofstream> (path, flags);
|
||||||
|
if (os->is_open ()) {
|
||||||
|
m_Logfile = path;
|
||||||
|
m_Destination = eLogFile;
|
||||||
|
m_LogStream = os;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
LogPrint(eLogError, "Log: can't open file ", path);
|
||||||
|
}
|
||||||
|
|
||||||
void Log::SetLogLevel (const std::string& level)
|
void Log::SendTo (std::shared_ptr<std::ostream> os) {
|
||||||
{
|
m_Destination = eLogStream;
|
||||||
if (level == "error") { m_MinLevel = eLogError; }
|
m_LogStream = os;
|
||||||
else if (level == "warn") { m_MinLevel = eLogWarning; }
|
}
|
||||||
else if (level == "info") { m_MinLevel = eLogInfo; }
|
|
||||||
else if (level == "debug") { m_MinLevel = eLogDebug; }
|
|
||||||
else {
|
|
||||||
LogPrint(eLogError, "Log: Unknown loglevel: ", level);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
LogPrint(eLogInfo, "Log: min msg level set to ", level);
|
|
||||||
}
|
|
||||||
|
|
||||||
void Log::SetLogStream (std::shared_ptr<std::ostream> logStream)
|
#ifndef _WIN32
|
||||||
{
|
void Log::SendTo(const char *name, int facility) {
|
||||||
m_LogStream = logStream;
|
m_Destination = eLogSyslog;
|
||||||
}
|
m_LogStream = nullptr;
|
||||||
|
openlog(name, LOG_CONS | LOG_PID, facility);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
void Log::Reopen() {
|
||||||
|
if (m_Destination == eLogFile)
|
||||||
|
SendTo(m_Logfile);
|
||||||
|
}
|
||||||
|
|
||||||
|
Log & Logger() {
|
||||||
|
return logger;
|
||||||
|
}
|
||||||
|
} // log
|
||||||
|
} // i2p
|
||||||
|
@ -1,91 +1,91 @@
|
|||||||
UNAME := $(shell uname -s)
|
UNAME := $(shell uname -s)
|
||||||
SHLIB := libi2pd.so
|
SHLIB := libi2pd.so
|
||||||
ARLIB := libi2pd.a
|
ARLIB := libi2pd.a
|
||||||
SHLIB_CLIENT := libi2pdclient.so
|
SHLIB_CLIENT := libi2pdclient.so
|
||||||
ARLIB_CLIENT := libi2pdclient.a
|
ARLIB_CLIENT := libi2pdclient.a
|
||||||
I2PD := i2pd
|
I2PD := i2pd
|
||||||
GREP := fgrep
|
GREP := fgrep
|
||||||
DEPS := obj/make.dep
|
DEPS := obj/make.dep
|
||||||
|
|
||||||
include filelist.mk
|
include filelist.mk
|
||||||
|
|
||||||
USE_AESNI := yes
|
USE_AESNI := yes
|
||||||
USE_STATIC := no
|
USE_STATIC := no
|
||||||
|
|
||||||
ifeq ($(UNAME),Darwin)
|
ifeq ($(UNAME),Darwin)
|
||||||
DAEMON_SRC += DaemonLinux.cpp
|
DAEMON_SRC += DaemonLinux.cpp
|
||||||
include Makefile.osx
|
include Makefile.osx
|
||||||
else ifeq ($(shell echo $(UNAME) | $(GREP) -c FreeBSD),1)
|
else ifeq ($(shell echo $(UNAME) | $(GREP) -c FreeBSD),1)
|
||||||
DAEMON_SRC += DaemonLinux.cpp
|
DAEMON_SRC += DaemonLinux.cpp
|
||||||
include Makefile.bsd
|
include Makefile.bsd
|
||||||
else ifeq ($(UNAME),Linux)
|
else ifeq ($(UNAME),Linux)
|
||||||
DAEMON_SRC += DaemonLinux.cpp
|
DAEMON_SRC += DaemonLinux.cpp
|
||||||
include Makefile.linux
|
include Makefile.linux
|
||||||
else # win32 mingw
|
else # win32 mingw
|
||||||
DAEMON_SRC += DaemonWin32.cpp Win32/Win32Service.cpp Win32/Win32App.cpp
|
DAEMON_SRC += DaemonWin32.cpp Win32/Win32Service.cpp Win32/Win32App.cpp
|
||||||
include Makefile.mingw
|
include Makefile.mingw
|
||||||
endif
|
endif
|
||||||
|
|
||||||
all: mk_obj_dir $(ARLIB) $(ARLIB_CLIENT) $(I2PD)
|
all: mk_obj_dir $(ARLIB) $(ARLIB_CLIENT) $(I2PD)
|
||||||
|
|
||||||
mk_obj_dir:
|
mk_obj_dir:
|
||||||
@mkdir -p obj
|
@mkdir -p obj
|
||||||
@mkdir -p obj/Win32
|
@mkdir -p obj/Win32
|
||||||
|
|
||||||
api: mk_obj_dir $(SHLIB) $(ARLIB)
|
api: mk_obj_dir $(SHLIB) $(ARLIB)
|
||||||
api_client: mk_obj_dir $(SHLIB) $(ARLIB) $(SHLIB_CLIENT) $(ARLIB_CLIENT)
|
api_client: mk_obj_dir $(SHLIB) $(ARLIB) $(SHLIB_CLIENT) $(ARLIB_CLIENT)
|
||||||
|
|
||||||
## NOTE: The NEEDED_CXXFLAGS are here so that CXXFLAGS can be specified at build time
|
## NOTE: The NEEDED_CXXFLAGS are here so that CXXFLAGS can be specified at build time
|
||||||
## **without** overwriting the CXXFLAGS which we need in order to build.
|
## **without** overwriting the CXXFLAGS which we need in order to build.
|
||||||
## For example, when adding 'hardening flags' to the build
|
## For example, when adding 'hardening flags' to the build
|
||||||
## (e.g. -fstack-protector-strong -Wformat -Werror=format-security), we do not want to remove
|
## (e.g. -fstack-protector-strong -Wformat -Werror=format-security), we do not want to remove
|
||||||
## -std=c++11. If you want to remove this variable please do so in a way that allows setting
|
## -std=c++11. If you want to remove this variable please do so in a way that allows setting
|
||||||
## custom FLAGS to work at build-time.
|
## custom FLAGS to work at build-time.
|
||||||
|
|
||||||
deps: mk_obj_dir
|
deps: mk_obj_dir
|
||||||
$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) -MM *.cpp > $(DEPS)
|
$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) -MM *.cpp > $(DEPS)
|
||||||
@sed -i -e '/\.o:/ s/^/obj\//' $(DEPS)
|
@sed -i -e '/\.o:/ s/^/obj\//' $(DEPS)
|
||||||
|
|
||||||
obj/%.o: %.cpp
|
obj/%.o: %.cpp
|
||||||
$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) $(CPU_FLAGS) -c -o $@ $<
|
$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) $(CPU_FLAGS) -c -o $@ $<
|
||||||
|
|
||||||
# '-' is 'ignore if missing' on first run
|
# '-' is 'ignore if missing' on first run
|
||||||
-include $(DEPS)
|
-include $(DEPS)
|
||||||
|
|
||||||
DAEMON_OBJS += $(patsubst %.cpp,obj/%.o,$(DAEMON_SRC))
|
DAEMON_OBJS += $(patsubst %.cpp,obj/%.o,$(DAEMON_SRC))
|
||||||
$(I2PD): $(DAEMON_OBJS) $(ARLIB) $(ARLIB_CLIENT)
|
$(I2PD): $(DAEMON_OBJS) $(ARLIB) $(ARLIB_CLIENT)
|
||||||
$(CXX) -o $@ $^ $(LDLIBS) $(LDFLAGS)
|
$(CXX) -o $@ $^ $(LDLIBS) $(LDFLAGS)
|
||||||
|
|
||||||
$(SHLIB): $(patsubst %.cpp,obj/%.o,$(LIB_SRC))
|
$(SHLIB): $(patsubst %.cpp,obj/%.o,$(LIB_SRC))
|
||||||
ifneq ($(USE_STATIC),yes)
|
ifneq ($(USE_STATIC),yes)
|
||||||
$(CXX) $(LDFLAGS) $(LDLIBS) -shared -o $@ $^
|
$(CXX) $(LDFLAGS) $(LDLIBS) -shared -o $@ $^
|
||||||
endif
|
endif
|
||||||
|
|
||||||
$(SHLIB_CLIENT): $(patsubst %.cpp,obj/%.o,$(LIB_CLIENT_SRC))
|
$(SHLIB_CLIENT): $(patsubst %.cpp,obj/%.o,$(LIB_CLIENT_SRC))
|
||||||
$(CXX) $(LDFLAGS) $(LDLIBS) -shared -o $@ $^
|
$(CXX) $(LDFLAGS) $(LDLIBS) -shared -o $@ $^
|
||||||
|
|
||||||
$(ARLIB): $(patsubst %.cpp,obj/%.o,$(LIB_SRC))
|
$(ARLIB): $(patsubst %.cpp,obj/%.o,$(LIB_SRC))
|
||||||
ar -r $@ $^
|
ar -r $@ $^
|
||||||
|
|
||||||
$(ARLIB_CLIENT): $(patsubst %.cpp,obj/%.o,$(LIB_CLIENT_SRC))
|
$(ARLIB_CLIENT): $(patsubst %.cpp,obj/%.o,$(LIB_CLIENT_SRC))
|
||||||
ar -r $@ $^
|
ar -r $@ $^
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rf obj
|
rm -rf obj
|
||||||
$(RM) $(I2PD) $(SHLIB) $(ARLIB) $(SHLIB_CLIENT) $(ARLIB_CLIENT)
|
$(RM) $(I2PD) $(SHLIB) $(ARLIB) $(SHLIB_CLIENT) $(ARLIB_CLIENT)
|
||||||
|
|
||||||
strip: $(I2PD) $(SHLIB_CLIENT) $(SHLIB)
|
strip: $(I2PD) $(SHLIB_CLIENT) $(SHLIB)
|
||||||
strip $^
|
strip $^
|
||||||
|
|
||||||
LATEST_TAG=$(shell git describe --tags --abbrev=0 master)
|
LATEST_TAG=$(shell git describe --tags --abbrev=0 openssl)
|
||||||
dist:
|
dist:
|
||||||
git archive --format=tar.gz -9 --worktree-attributes \
|
git archive --format=tar.gz -9 --worktree-attributes \
|
||||||
--prefix=i2pd_$(LATEST_TAG)/ $(LATEST_TAG) -o i2pd_$(LATEST_TAG).tar.gz
|
--prefix=i2pd_$(LATEST_TAG)/ $(LATEST_TAG) -o i2pd_$(LATEST_TAG).tar.gz
|
||||||
|
|
||||||
.PHONY: all
|
.PHONY: all
|
||||||
.PHONY: clean
|
.PHONY: clean
|
||||||
.PHONY: deps
|
.PHONY: deps
|
||||||
.PHONY: dist
|
.PHONY: dist
|
||||||
.PHONY: api
|
.PHONY: api
|
||||||
.PHONY: api_client
|
.PHONY: api_client
|
||||||
.PHONY: mk_obj_dir
|
.PHONY: mk_obj_dir
|
||||||
|
@ -1,44 +1,43 @@
|
|||||||
USE_WIN32_APP=yes
|
USE_WIN32_APP=yes
|
||||||
CXX = g++
|
CXX = g++
|
||||||
WINDRES = windres
|
WINDRES = windres
|
||||||
CXXFLAGS = -Os -D_MT -DWIN32 -D_WINDOWS -DWIN32_LEAN_AND_MEAN
|
CXXFLAGS = -Os -D_MT -DWIN32 -D_WINDOWS -DWIN32_LEAN_AND_MEAN
|
||||||
NEEDED_CXXFLAGS = -std=c++11
|
NEEDED_CXXFLAGS = -std=c++11
|
||||||
BOOST_SUFFIX = -mt
|
BOOST_SUFFIX = -mt
|
||||||
INCFLAGS = -I/usr/include/ -I/usr/local/include/
|
INCFLAGS = -I/usr/include/ -I/usr/local/include/
|
||||||
LDFLAGS = -Wl,-rpath,/usr/local/lib \
|
LDFLAGS = -Wl,-rpath,/usr/local/lib \
|
||||||
-L/usr/local/lib \
|
-L/usr/local/lib \
|
||||||
-L/c/dev/openssl \
|
-L/c/dev/openssl \
|
||||||
-L/c/dev/boost/lib
|
-L/c/dev/boost/lib
|
||||||
LDLIBS = \
|
LDLIBS = \
|
||||||
-Wl,-Bstatic -lboost_system$(BOOST_SUFFIX) \
|
-Wl,-Bstatic -lboost_system$(BOOST_SUFFIX) \
|
||||||
-Wl,-Bstatic -lboost_date_time$(BOOST_SUFFIX) \
|
-Wl,-Bstatic -lboost_date_time$(BOOST_SUFFIX) \
|
||||||
-Wl,-Bstatic -lboost_filesystem$(BOOST_SUFFIX) \
|
-Wl,-Bstatic -lboost_filesystem$(BOOST_SUFFIX) \
|
||||||
-Wl,-Bstatic -lboost_regex$(BOOST_SUFFIX) \
|
-Wl,-Bstatic -lboost_regex$(BOOST_SUFFIX) \
|
||||||
-Wl,-Bstatic -lboost_program_options$(BOOST_SUFFIX) \
|
-Wl,-Bstatic -lboost_program_options$(BOOST_SUFFIX) \
|
||||||
-Wl,-Bstatic -lssl \
|
-Wl,-Bstatic -lssl \
|
||||||
-Wl,-Bstatic -lcrypto \
|
-Wl,-Bstatic -lcrypto \
|
||||||
-Wl,-Bstatic -lz \
|
-Wl,-Bstatic -lz \
|
||||||
-Wl,-Bstatic -lwsock32 \
|
-Wl,-Bstatic -lwsock32 \
|
||||||
-Wl,-Bstatic -lws2_32 \
|
-Wl,-Bstatic -lws2_32 \
|
||||||
-Wl,-Bstatic -lgdi32 \
|
-Wl,-Bstatic -lgdi32 \
|
||||||
-Wl,-Bstatic -liphlpapi \
|
-Wl,-Bstatic -liphlpapi \
|
||||||
-static-libgcc -static-libstdc++ \
|
-static-libgcc -static-libstdc++ \
|
||||||
-Wl,-Bstatic -lstdc++ \
|
-Wl,-Bstatic -lstdc++ \
|
||||||
-Wl,-Bstatic -lpthread
|
-Wl,-Bstatic -lpthread
|
||||||
|
|
||||||
ifeq ($(USE_WIN32_APP), yes)
|
ifeq ($(USE_WIN32_APP), yes)
|
||||||
CXXFLAGS += -DWIN32_APP
|
CXXFLAGS += -DWIN32_APP
|
||||||
LDFLAGS += -mwindows -s
|
LDFLAGS += -mwindows -s
|
||||||
DAEMON_RC += Win32/Resource.rc
|
DAEMON_RC += Win32/Resource.rc
|
||||||
DAEMON_OBJS += $(patsubst %.rc,obj/%.o,$(DAEMON_RC))
|
DAEMON_OBJS += $(patsubst %.rc,obj/%.o,$(DAEMON_RC))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(USE_AESNI),1)
|
ifeq ($(USE_AESNI),1)
|
||||||
CPU_FLAGS = -maes -DAESNI
|
CPU_FLAGS = -maes -DAESNI
|
||||||
else
|
else
|
||||||
CPU_FLAGS = -msse
|
CPU_FLAGS = -msse
|
||||||
endif
|
endif
|
||||||
|
|
||||||
obj/%.o : %.rc
|
obj/%.o : %.rc
|
||||||
$(WINDRES) -i $< -o $@
|
$(WINDRES) -i $< -o $@
|
||||||
|
|
||||||
|
@ -0,0 +1,12 @@
|
|||||||
|
-----BEGIN CERTIFICATE-----
|
||||||
|
MIIBwTCCAWigAwIBAgIJAOZBC10+/38EMAkGByqGSM49BAEwZzELMAkGA1UEBhMC
|
||||||
|
QVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdp
|
||||||
|
dHMgUHR5IEx0ZDEgMB4GA1UEAwwXbWNhMi1pMnAuZmFtaWx5LmkycC5uZXQwHhcN
|
||||||
|
MTYwMzI4MjIwMjMxWhcNMjYwMzI2MjIwMjMxWjBnMQswCQYDVQQGEwJBVTETMBEG
|
||||||
|
A1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkg
|
||||||
|
THRkMSAwHgYDVQQDDBdtY2EyLWkycC5mYW1pbHkuaTJwLm5ldDBZMBMGByqGSM49
|
||||||
|
AgEGCCqGSM49AwEHA0IABNNyfzJr/rMSUeWliVBbJHRF2+qMypOlHEZ9m1nNATVX
|
||||||
|
64OhuyuVCmbF9R3oDkcZZJQQK1ovXd/EsbAIWDI8K/gwCQYHKoZIzj0EAQNIADBF
|
||||||
|
AiEApmv2tvMwzlvPjHJG1/5aXOSjYWw2s4ETeGt4abWPQkACIBbF3RuCHuzg+KN8
|
||||||
|
N0n9hAJztAqhRCdG3hilxF4fbVLp
|
||||||
|
-----END CERTIFICATE-----
|
@ -1,4 +1,4 @@
|
|||||||
etc/i2pd/i2pd.conf var/lib/i2pd/i2p.conf
|
etc/i2pd/i2pd.conf var/lib/i2pd/i2pd.conf
|
||||||
etc/i2pd/tunnels.conf var/lib/i2pd/tunnels.cfg
|
etc/i2pd/tunnels.conf var/lib/i2pd/tunnels.conf
|
||||||
etc/i2pd/subscriptions.txt var/lib/i2pd/subscriptions.txt
|
etc/i2pd/subscriptions.txt var/lib/i2pd/subscriptions.txt
|
||||||
usr/share/i2pd/certificates var/lib/i2pd/certificates
|
usr/share/i2pd/certificates var/lib/i2pd/certificates
|
||||||
|
Loading…
Reference in New Issue