Commit Graph

254 Commits

Author SHA1 Message Date
Jeff Becker
0f13591802
does not work 2020-01-28 16:55:36 -05:00
Ryan Tharp
cd8aba4d4e daemon don't override the existing CURL 2019-12-23 07:16:13 +00:00
Rick V
fd6602bf05
fix versiontag 2019-12-16 11:32:42 -06:00
Rick V
9fa9209114
don't be aggressive
remove libcurl packaging rules. We still build it, but ship only the curl.exe
2019-12-16 11:28:47 -06:00
Rick V
6d49ffd60b
include all platform dependencies transitively 2019-12-16 11:28:46 -06:00
Rick V
e15c57c114
get ready for v0.6
bump version

don't ship the shared object
2019-12-16 11:28:21 -06:00
Jason Rhinelander
638fb25b47 Put version info into a compiled file
This rewrites the version info using lokid's approach of compiling it
into a .cpp file that gets generated as part of the build (*not* during
the configure stage).

Among other things, this means that changing the version no longer
invalidates ccache or cmake dependencies, and because it depends on
`.git/index` git commits will cause the version to be regenerated,
making the commit tag more reliable (currently if you rebuild without
running cmake your git commit tag doesn't update).
2019-12-11 22:40:07 -04:00
Jeff Becker
cec36b62b5 make logic and net thread one in the same 2019-12-10 11:49:32 -07:00
Jeff Becker
70771a2460
fix last commit 2019-12-07 14:58:52 -05:00
Jeff Becker
f56e543d75
add deadlock checker and revert bencode change from long ago 2019-12-07 14:58:19 -05:00
Rick V
cf3469e11a
crash on wine, we support linux, ucb_unix, svr4
natively ffs. i tested this patch on wine 4.4 on fuckin
Solaris 11 snv_151
2019-12-01 19:01:40 -06:00
Jason Rhinelander
f54740fa85 Don't pointlessly set conffname back to itself 2019-11-20 18:00:10 -04:00
Jason Rhinelander
e0340e86b2 clang-format fixes 2019-11-20 17:45:56 -04:00
Jason Rhinelander
2bdde18558 Remove shell globbing of path
resolvePath was leaking memory (the returned char * from realpath was
never freed), but upon closer inspection resolvePath doesn't seem right:
shell/glob/~ expansion is the job of the shell, not the argument (but
worse, if you pass it something like '~' (quoted) it would expand, which
is wrong.

Also de-duplicate some code.
2019-11-20 17:22:07 -04:00
Rick V
83c5e9ace4
manually merge #859 2019-10-30 18:02:34 -05:00
jeff
869ab0b652 Merge remote-tracking branch 'upstream/dev' into vpn-api-2019-10-03 2019-10-21 08:01:29 -04:00
Michael
f6adacf936
Review fixes 2019-10-09 23:00:50 +01:00
Michael
3371da98cf
Use libcurl (optional dependency) to hit jsonrpc 2019-10-09 23:00:50 +01:00
jeff
c26b67c379 finish wiring up jni shizz 2019-10-08 10:52:01 -04:00
jeff
7d7c6bf38c Merge remote-tracking branch 'upstream/dev' into multithreaded-cryptography 2019-10-07 06:08:47 -04:00
michael-loki
4b6dab5651
Fixup 2019-10-05 17:06:35 +01:00
Michael
abc527ca35
Split cmake files for executables into src dirs 2019-10-05 16:08:12 +01:00
jeff
52757fef0e Merge remote-tracking branch 'micheal/background_mode' into vpn-api-2019-10-03 2019-10-04 14:10:58 -04:00
Michael
15cb49c9bd
Introduce --background to only start JSON RPC
fixes #853
2019-10-04 10:32:52 +01:00
Stephen Shelton
c9b862a12b Add a --version flag to lokinet CLI args 2019-10-02 12:08:45 -06:00
jeff
32ed821763 Merge remote-tracking branch 'upstream/dev' into multithreaded-cryptography 2019-10-01 10:51:28 -04:00
Michael
ae3fc3a395
Add initial macOS app 2019-09-24 09:50:57 +01:00
Jeff Becker
12314e8d00
ensure no crash on quit 2019-09-04 08:41:07 -04:00
Michael
1aec0dfa2b
Move logging to subdirectory 2019-09-03 20:52:27 +01:00
Michael
c98ae332b2
Add missing header 2019-08-13 00:26:25 +00:00
Michael
0a1620aff2
make format 2019-08-12 22:10:07 +00:00
Michael
de21a2f687
Include json output 2019-08-12 22:09:44 +00:00
Michael
8c5bbcaeeb
Update rcutil and add to build 2019-08-12 21:47:30 +00:00
Rick V
f6c97091fd
clang-format 2019-08-01 22:25:48 -05:00
Rick V
581e64a2ef
back out for now 2019-08-01 21:39:45 -05:00
Rick V
578bcba73d
ok use exception filter
typo

no infinite loops
2019-08-01 21:39:44 -05:00
Rick V
16096c6adb
add debug helper lib for core dump generation on all supported windows targets
had an epiphany earlier

i kept having problems with static linking because
i merged the GNU C runtime with the SEH library
instead of merging the latter with pthread
2019-08-01 21:39:42 -05:00
Jeff Becker
c1bf69f96f
run main in it's own thread and set its process name. 2019-07-26 08:55:08 -04:00
Michael
a2326efa37
Revert "Merge pull request #679 from tewinget/revert-config-refactor"
This reverts commit 2996a7f29c, reversing
changes made to 10df3bd4b3.
2019-07-06 14:46:25 +01:00
Thomas Winget
d044d60101 Reverts #678 #677 and #669 with hashes:
10df3bd
766ece8
979f095

See those commits for further details
2019-07-02 11:02:20 -04:00
Michael
00c237dc6d
Move config class to its own dir 2019-07-02 01:58:38 +01:00
Michael
8323725509
Initial No-Op Crypto implementation 2019-05-29 09:46:34 +01:00
Ryan Tharp
124e9dc4bf
Merge pull request #556 from neuroscr/issue547-2
handle relative config paths better
2019-04-23 17:40:54 -07:00
Ryan Tharp
89837d5528 handle relative config paths better 2019-04-23 17:40:44 -07:00
Ryan Tharp
4f70c729c0
Merge pull request #554 from neuroscr/issue547-2
fix generate router config
2019-04-23 17:04:05 -07:00
Ryan Tharp
ecec0628f0 fix generate router config 2019-04-23 17:03:42 -07:00
Ryan Tharp
db25a9107c format / fix syntax error 2019-04-23 16:17:10 -07:00
Ryan Tharp
f9d20fe75b
Merge branch 'master' into cooler_help 2019-04-23 16:10:52 -07:00
Ryan Tharp
b36b378583 issue 547 make format 2019-04-23 14:57:01 -07:00
Ryan Tharp
8cf6a77c1d address issue loki-project#547, remove client.ini, update ini defaults, and clean up help message 2019-04-23 14:50:49 -07:00