enoch/n2n
1
0
Fork 0
mirror of https://github.com/ntop/n2n.git synced 2024-09-20 09:01:10 +02:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity
989 Commits 7 Branches 7 Tags 5.4 MiB
Commit Graph

989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
switch_st
7ceaebade5 move android arp code to tuntap_android.c 2020-07-07 10:51:21 +08:00
Luca Deri
26e0f787d1
Merge pull request #304 from fengdaolong/dev 
Fix read tap device failed when OS wake up from sleep.
 2020-07-06 10:33:11 +02:00
Luca Deri
1125d7f368
Merge pull request #301 from Logan007/macMgmt 
added MAC to management port output
 2020-07-06 10:27:45 +02:00
Luca Deri
cd10f5e19f
Merge pull request #300 from Logan007/fixChk 
enabled packet checksum
 2020-07-06 10:27:03 +02:00
fengdaolong
51c889ddea Fix read tap device failed when OS wake up from sleep. 
Adjust the structure of the source file to the header file.
 2020-07-06 13:17:01 +08:00
Logan007
6fc9890e55 added MAC to management port output 2020-07-04 18:42:20 +05:45
Logan007
65be75dbe2 enabled packet checksum 2020-07-04 15:10:58 +05:45
Luca Deri
da870876c8
Merge pull request #297 from switch-iot/hin2n_arp 
Change n2n_edge_callbacks payload_size parameter to pointer.
 2020-07-03 09:17:46 +02:00
Luca Deri
18998e6a96
Merge pull request #296 from Logan007/fixHE 
quick fix for header encryption, temporary disabling checksum check
 2020-07-03 09:17:06 +02:00
switch_st
e7ac9cf129 change n2n_edge_callbacks payload_size parameter to pointer. 2020-07-03 11:50:47 +08:00
Logan007
a84d03a6a6 quick fix for header encryption, also disabling checksum check 2020-07-03 02:26:39 +05:45
Luca Deri
e236c1f1ec
Removed old Android link 2020-07-02 17:21:08 +02:00
Luca Deri
f7ea8eba21
Merge pull request #294 from Logan007/regPayload 
no payload with REGISTER
 2020-07-02 17:19:10 +02:00
Luca Deri
edd4a8a863
Merge pull request #293 from Logan007/qlz 
Removed quicklz define
 2020-07-02 17:18:54 +02:00
Luca Deri
4a08411fe9
Merge pull request #292 from Logan007/pearsonUpdate 
pearson hashing: added optional 16-bit look-up table
 2020-07-02 17:18:34 +02:00
Luca Deri
edc48acb83
Merge pull request #290 from emanuele-f/protect_cleanup 
Move android code to hin2n
 2020-07-02 17:17:44 +02:00
Luca Deri
efa8c8a036
Merge pull request #289 from fengdaolong/dev 
Fix cmake compilation errors.
 2020-07-02 17:16:18 +02:00
Logan007
8fb553ab03 initialized hash in sn, too 2020-07-02 19:08:33 +05:45
Logan007
eaa1acb543 no payload with REGISTER 2020-07-02 18:02:16 +05:45
Logan007
89542607e7 removed quicklz define 2020-07-02 17:50:05 +05:45
Logan007
8d0c52102c added optional 16-bit look-up table 2020-07-02 12:49:25 +05:45
fengdaolong
1ada1dc7ed CMakeLists.txt automatically judges git commands and OpenSSL libraries. 
1. Automatically determines whether the git command exists to generate a revision number.
2. When OpenSSL is not found, AES is automatically disabled.
 2020-07-02 11:54:22 +08:00
emanuele-f
e42837c3fb Move android code to hin2n 2020-07-01 16:27:08 +02:00
Luca Deri
73fa50a37d
Merge pull request #288 from emanuele-f/termination_fix 
Terminate n2n as soon as the stop command is received
 2020-07-01 14:04:39 +02:00
fengdaolong
f5accc8221 Fix cmake compilation errors. 
1. CMakeLists.txt added to automatically obtain the revised version number from the git repository.
2. Adjusted some header files to fix Windows platform compilation errors.
3. Eliminate some compilation warnings.
 2020-07-01 18:35:22 +08:00
emanuele-f
33dd97c798 Terminate n2n as soon as the stop command is received 2020-07-01 12:05:19 +02:00
Luca Deri
a2a817b1a7
Merge pull request #286 from emanuele-f/sendto_fix 
Fix invalid sendto when supernode name resolution fails
 2020-07-01 11:44:19 +02:00
lucaderi
2cf63fb90d Compilation fix 2020-07-01 11:22:06 +02:00
emanuele-f
4e97023b95 Fix invalid sendto when supernode name resolution fails 
Even though the supernode resolution failed, sendto was called with
and invalid socket, resulting in the following error:

ERROR: sendto failed (13) Permission denied
 2020-07-01 11:16:34 +02:00
Luca Deri
ff689f9b72
Merge pull request #285 from Logan007/fixLzoError 
call lzo_init() only if required
 2020-07-01 09:51:09 +02:00
Logan007
49a5823b9c call lzo_init() only if required 2020-07-01 02:21:54 +05:45
Luca Deri
b14fd9f08a
Merge pull request #283 from emanuele-f/android_cleanup 
Remove duplicated code
 2020-06-30 16:37:09 +02:00
Luca Deri
cf65d9ad98
Merge pull request #282 from emanuele-f/n2n_callbacks 
Add the callbacks API
 2020-06-30 16:36:11 +02:00
Luca Deri
9dd0387d36
Merge pull request #279 from Logan007/checksum 
Packet Checksum
 2020-06-30 16:35:28 +02:00
Luca Deri
a6929aa6df
Merge pull request #284 from disconnect3d/patch-1 
edge.c: fix incorrect bad gateway check
 2020-06-30 16:33:57 +02:00
Disconnect3d
c2442ae486
edge.c: fix incorrect bad gateway check 
It seems the previous `route.net_addr == INADDR_NONE` check was incorrect and was probably a result of copy-pasting the previous if statement and not changing the condition.
 2020-06-30 14:16:54 +02:00
emanuele-f
4ba7f4022f Remove duplicated code 
The android code is part of the hin2n project at https://github.com/switch-iot/hin2n . This PR removes
the duplicated code in n2n which only creates confusion.
 2020-06-30 13:08:27 +02:00
emanuele-f
346631ffe8 Add the callbacks API 
Callbacks allow n2n API users to extend n2n without modifying the upstream code. This also allows us
to move the hin2n code, which is specific of android, out of the n2n repository.
 2020-06-30 13:01:37 +02:00
Logan007
0e0d662dbb added decryption step 2020-06-29 19:20:40 +05:45
Logan007
e8d5e939a7 added encryption step 2020-06-29 16:49:54 +05:45
Logan007
033b1890f2 blended checksum into header iv 2020-06-29 16:31:44 +05:45
Logan007
a6915fd6af prepared header iv encryption handling 2020-06-29 15:50:05 +05:45
Logan007
a64cfa450e added 16-bit hashing 2020-06-29 15:44:51 +05:45
Logan007
c7a8210078 added 96 bit block size for header iv encryption 2020-06-29 15:13:36 +05:45
Luca Deri
c6b7b67a6a Minor cleanup 2020-06-28 21:30:40 +02:00
Luca Deri
590800c996
Merge pull request #259 from emanuele-f/hin2n_android 
Compilation fixes for hin2n
 2020-06-28 21:23:06 +02:00
emanuele-f
f5804db2b0 Android compilation fixes 2020-06-28 19:46:12 +02:00
emanuele-f
0b4d36f7bd Merge remote-tracking branch 'origin/dev' into hin2n_android 2020-06-28 17:52:21 +02:00
Luca Deri
6bdffb918a
Merge pull request #276 from Logan007/updateReadme 
updated README.md
 2020-06-27 17:41:42 +02:00
Luca Deri
1647c4f709
Merge pull request #275 from Logan007/shortenHelpText 
shortened help text by three lines
 2020-06-27 17:41:22 +02:00