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

452 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Logan007
d3e823af98 removed branchless code 2020-07-23 02:17:08 +05:45
Logan007
36eb807fca added time stamp handling functions 2020-07-23 01:55:02 +05:45
Logan007
252ce9779a moved windows-gettimeofday() from benchmark.c to n2n.c 2020-07-21 19:11:31 +05:45
Luca Deri
0ab9f3229e
Merge pull request #315 from switch-iot/hin2n_arp 
delete android define and log code
 2020-07-20 17:15:04 +02:00
Luca Deri
7d573823e7
Merge pull request #313 from fengdaolong/dev 
Clean up redundant code in sn.c
 2020-07-20 17:13:48 +02:00
Luca Deri
57d78f927f
Merge pull request #309 from skyformat99/dev 
add sleep() for fix compile error on windows
 2020-07-20 17:09:09 +02:00
switch_st
8a1bcf0fa6 close trace file if needed 2020-07-20 12:08:13 +08:00
switch_st
21122df969 delete android define and log code 2020-07-20 11:13:46 +08:00
fengdaolong
485cab2afa Fix pointer assignment error 2020-07-18 19:52:41 +08:00
fengdaolong
16b1c7c065 Clean up redundant code in sn.c 
Clean up redundant code contained in both sn.c and sn_utils.c
 2020-07-18 17:17:30 +08:00
ygg
e6c851d276 add sleep() for fix compile error on windows 2020-07-17 14:21:27 +08:00
Luca Deri
bb64130c42
Merge pull request #306 from switch-iot/hin2n_arp 
move android arp code to n2n_edge_callbacks
 2020-07-16 09:51:26 +02:00
switch_st
48db4bfb6c add extra comment to n2n_edge_callbacks 2020-07-07 11:03:13 +08:00
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