Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

set correct settings for connection via tor proxy. have confirmed again with toxcore devs that this is actually correct. this should fix no connecting when using tor for that first time #99

Merged
merged 2 commits into from
Jan 3, 2024
Merged

set correct settings for connection via tor proxy. have confirmed again with toxcore devs that this is actually correct. this should fix no connecting when using tor for that first time #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c17b8b1
fix ngc history sync interval and increase logging for ngc history sync
zoff99 Jan 3, 2024
1198974
set correct settings for connection via tor proxy. have confirmed aga…
zoff99 Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions src/main/java/com/zoffcc/applications/trifa/HelperGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,16 +888,16 @@ static void handle_incoming_sync_group_file(final long group_number, final long
send_pubkey_bytes.put(data, 8 + 32, 32);
ByteBufferCompat send_pubkey_bytes_compat = new ByteBufferCompat(send_pubkey_bytes);
final String original_sender_peerpubkey = bytesToHexJava(send_pubkey_bytes_compat.array(),send_pubkey_bytes_compat.arrayOffset(),send_pubkey_bytes_compat.limit()).toUpperCase();
// Log.i(TAG, "handle_incoming_sync_group_file:peerpubkey hex=" + original_sender_peerpubkey);
Log.i(TAG, "handle_incoming_sync_group_file:peerpubkey hex=" + original_sender_peerpubkey);
try
{
// Log.i(TAG, "handle_incoming_sync_group_file:syncer_name=" + tox_group_peer_get_name(group_number, syncer_peer_id));
Log.i(TAG, "handle_incoming_sync_group_file:syncer_name=" + tox_group_peer_get_name(group_number, syncer_peer_id));
}
catch(Exception e)
{

}
// Log.i(TAG, "handle_incoming_sync_group_file:syncer_pubkey=" + syncer_pubkey);
Log.i(TAG, "handle_incoming_sync_group_file:syncer_pubkey=" + syncer_pubkey);

if (tox_group_self_get_public_key(group_number).toUpperCase().equalsIgnoreCase(original_sender_peerpubkey))
{
Expand All @@ -918,18 +918,18 @@ static void handle_incoming_sync_group_file(final long group_number, final long
timestamp_byte_buffer.rewind();
long timestamp = timestamp_byte_buffer.getLong();
timestamp_byte_buffer.rewind();
// Log.i(TAG, "handle_incoming_sync_group_file:timestamp=" + timestamp);
Log.i(TAG, "handle_incoming_sync_group_file:timestamp=" + timestamp);

if (timestamp > ((System.currentTimeMillis() / 1000) + (60 * 5)))
{
long delta_t = timestamp - (System.currentTimeMillis() / 1000);
// Log.i(TAG, "handle_incoming_sync_group_file:delta t=" + delta_t + " do NOT sync files from the future");
Log.i(TAG, "handle_incoming_sync_group_file:delta t=" + delta_t + " do NOT sync files from the future");
return;
}
else if (timestamp < ((System.currentTimeMillis() / 1000) - (60 * 200)))
{
long delta_t = (System.currentTimeMillis() / 1000) - timestamp;
// Log.i(TAG, "handle_incoming_sync_group_file:delta t=" + (-delta_t) + " do NOT sync files that are too old");
Log.i(TAG, "handle_incoming_sync_group_file:delta t=" + (-delta_t) + " do NOT sync files that are too old");
return;
}

Expand All @@ -940,7 +940,7 @@ else if (timestamp < ((System.currentTimeMillis() / 1000) - (60 * 200)))
hash_msg_id_bytes.put(data, 8, 32);
ByteBufferCompat hash_msg_id_bytes_compat = new ByteBufferCompat(hash_msg_id_bytes);
final String message_id_hash = bytesToHexJava(hash_msg_id_bytes_compat.array(),hash_msg_id_bytes_compat.arrayOffset(),hash_msg_id_bytes_compat.limit()).toUpperCase();
// Log.i(TAG, "handle_incoming_sync_group_file:message_id_hash hex=" + message_id_hash);
Log.i(TAG, "handle_incoming_sync_group_file:message_id_hash hex=" + message_id_hash);
//
//
ByteBuffer name_buffer = ByteBuffer.allocateDirect(TOX_NGC_HISTORY_SYNC_MAX_PEERNAME_BYTES);
Expand Down Expand Up @@ -982,7 +982,7 @@ else if (timestamp < ((System.currentTimeMillis() / 1000) - (60 * 200)))

byte[] peername_byte_buf_stripped = Arrays.copyOfRange(name_byte_buf, start_index,end_index);
peer_name = new String(peername_byte_buf_stripped, StandardCharsets.UTF_8);
// Log.i(TAG,"handle_incoming_sync_group_file:peer_name str=" + peer_name);
Log.i(TAG,"handle_incoming_sync_group_file:peer_name str=" + peer_name);
//
//
//
Expand Down Expand Up @@ -1015,7 +1015,7 @@ else if (timestamp < ((System.currentTimeMillis() / 1000) - (60 * 200)))

if (gm != null)
{
// Log.i(TAG, "handle_incoming_sync_group_file:potential double file, message_id_hash:" + message_id_hash);
Log.i(TAG, "handle_incoming_sync_group_file:potential double file, message_id_hash:" + message_id_hash);
return;
}
}
Expand Down Expand Up @@ -1103,7 +1103,7 @@ static void handle_incoming_sync_group_message(final long group_number, final lo
ByteBufferCompat hash_bytes_compat = new ByteBufferCompat(hash_bytes);
final String original_sender_peerpubkey = bytesToHexJava
(hash_bytes_compat.array(),hash_bytes_compat.arrayOffset(),hash_bytes_compat.limit()).toUpperCase();
// Log.i(TAG, "handle_incoming_sync_group_message:peerpubkey hex=" + original_sender_peerpubkey);
Log.i(TAG, "handle_incoming_sync_group_message:peerpubkey hex=" + original_sender_peerpubkey);

if (tox_group_self_get_public_key(group_number).toUpperCase().equalsIgnoreCase(original_sender_peerpubkey))
{
Expand Down Expand Up @@ -1131,18 +1131,18 @@ static void handle_incoming_sync_group_message(final long group_number, final lo
// timestamp_byte_buffer.arrayOffset(),
// timestamp_byte_buffer.limit()));

// Log.i(TAG, "handle_incoming_sync_group_message:timestamp=" + timestamp);
Log.i(TAG, "handle_incoming_sync_group_message:timestamp=" + timestamp);

if (timestamp > ((System.currentTimeMillis() / 1000) + (60 * 5)))
{
long delta_t = timestamp - (System.currentTimeMillis() / 1000);
// Log.i(TAG, "handle_incoming_sync_group_message:delta t=" + delta_t + " do NOT sync messages from the future");
Log.i(TAG, "handle_incoming_sync_group_message:delta t=" + delta_t + " do NOT sync messages from the future");
return;
}
else if (timestamp < ((System.currentTimeMillis() / 1000) - (60 * 200)))
{
long delta_t = (System.currentTimeMillis() / 1000) - timestamp;
// Log.i(TAG, "handle_incoming_sync_group_message:delta t=" + (-delta_t) + " do NOT sync messages that are too old");
Log.i(TAG, "handle_incoming_sync_group_message:delta t=" + (-delta_t) + " do NOT sync messages that are too old");
return;
}

Expand All @@ -1153,7 +1153,7 @@ else if (timestamp < ((System.currentTimeMillis() / 1000) - (60 * 200)))
hash_msg_id_bytes.put(data, 8, 4);
ByteBufferCompat hash_msg_id_bytes_compat = new ByteBufferCompat(hash_msg_id_bytes);
final String message_id_tox = bytesToHexJava(hash_msg_id_bytes_compat.array(),hash_msg_id_bytes_compat.arrayOffset(),hash_msg_id_bytes_compat.limit()).toLowerCase();
// Log.i(TAG, "handle_incoming_sync_group_message:message_id_tox hex=" + message_id_tox);
Log.i(TAG, "handle_incoming_sync_group_message:message_id_tox hex=" + message_id_tox);
//
//
ByteBuffer name_buffer = ByteBuffer.allocateDirect(TOX_NGC_HISTORY_SYNC_MAX_PEERNAME_BYTES);
Expand Down Expand Up @@ -1195,7 +1195,7 @@ else if (timestamp < ((System.currentTimeMillis() / 1000) - (60 * 200)))

byte[] peername_byte_buf_stripped = Arrays.copyOfRange(name_byte_buf, start_index,end_index);
peer_name = new String(peername_byte_buf_stripped, StandardCharsets.UTF_8);
// Log.i(TAG,"handle_incoming_sync_group_message:peer_name str=" + peer_name);
Log.i(TAG,"handle_incoming_sync_group_message:peer_name str=" + peer_name);
//
final int header = 6+1+1+4+32+4+25; // 73 bytes
long text_size = length - header;
Expand All @@ -1207,7 +1207,7 @@ else if (timestamp < ((System.currentTimeMillis() / 1000) - (60 * 200)))

byte[] text_byte_buf = Arrays.copyOfRange(data, header, (int)length);
String message_str = new String(text_byte_buf, StandardCharsets.UTF_8);
// Log.i(TAG,"handle_incoming_sync_group_message:message str=" + message_str);
Log.i(TAG,"handle_incoming_sync_group_message:message str=" + message_str);

long sender_peer_num = HelperGroup.get_group_peernum_from_peer_pubkey(group_identifier,
original_sender_peerpubkey);
Expand All @@ -1218,7 +1218,7 @@ else if (timestamp < ((System.currentTimeMillis() / 1000) - (60 * 200)))

if (gm != null)
{
// Log.i(TAG,"handle_incoming_sync_group_message:potential double message:" + message_str);
Log.i(TAG,"handle_incoming_sync_group_message:potential double message:" + message_str);
return;
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/zoffcc/applications/trifa/TRIFAGlobals.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public class TRIFAGlobals
public static final int TOX_NGC_HISTORY_SYNC_MAX_PEERNAME_BYTES = 25;
public static final int TOX_NGC_HISTORY_SYNC_MAX_SECONDS_BACK = 130 * 60; // 130 minutes

static int MESSAGE_GROUP_HISTORY_SYNC_DOUBLE_INTERVAL_SECS = 60 * 24 * 1; // 1 day
static int MESSAGE_GROUP_HISTORY_SYNC_DOUBLE_INTERVAL_SECS = 60 * 60 * 24 * 1; // 1 day

static long global_last_activity_outgoung_ft_ts = -1;

Expand Down
Loading
Loading