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

Jump to bottom

Harmless improvements #61

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Harmless improvements #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e6285bf
also write tox_save in client mode (with -C)
Aug 19, 2020
ee6e937
Remove spurious debug output
Aug 19, 2020
15400c2
Avoid code repetition
Aug 19, 2020
c72d709
gitignore build products
Aug 19, 2020
de62d93
remove unused variable
Aug 20, 2020
5d1bce6
whitespace fixes
Aug 20, 2020
d2345a8
tokssh: persist client key if ~/.tuntox/persist/ exists
Aug 20, 2020
930eda7
improve parsing
Aug 20, 2020
8b340e2
ping mode: quit after pong (per documentation)
Aug 20, 2020
9217b34
remove unused variable
Aug 20, 2020
6ce9e56
avoid redundant comparison
Aug 20, 2020
ab4fa64
use tox_callback_friend_connection_status instead of polling
Aug 20, 2020
8569e6c
two new make targets: install-debs and debs
Aug 20, 2020
7712e55
gitignore gitversion.h
Aug 20, 2020
ed93588
add "-dirty" to gitversion.h when tree is dirty"
Aug 20, 2020
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
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,8 @@

# tuntox related, not needed in repo
tuntox
tuntox_nostatic
debian/debhelper-build-stamp
debian/files
debian/tuntox.substvars
gitversion.h
9 changes: 8 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ bindir ?= $(prefix)/bin
all: tuntox tuntox_nostatic

gitversion.h: FORCE
@if [ -f .git/HEAD ] ; then echo " GEN $@"; echo "#define GITVERSION \"$(shell git rev-parse HEAD)\"" > $@; fi
@if [ -f .git/HEAD ] ; then echo " GEN $@"; echo "#define GITVERSION \"$(shell echo -n $$(git rev-parse HEAD) && (git diff --quiet || printf %s -dirty) )\"" > $@; fi

FORCE:

Expand Down Expand Up @@ -48,4 +48,11 @@ install: tuntox_nostatic
$(INSTALL_MKDIR) -d $(DESTDIR)$(bindir)
cp tuntox_nostatic $(DESTDIR)$(bindir)/tuntox

debs = ../tuntox_0.0.9-1_amd64.deb ../tuntox-dbgsym_0.0.9-1_amd64.deb
.PHONY: install-debs debs
install-debs: $(debs)
$(shell [ "$$(id -u)" = 0 ] || echo sudo) dpkg -i $(debs)
$(debs) debs:
fakeroot ./debian/rules binary

.PHONY: all clean tuntox
104 changes: 30 additions & 74 deletions client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ int handle_pong_frame()

if(ping_mode)
{
state = CLIENT_STATE_SEND_PING;
state = CLIENT_STATE_SHUTDOWN;
}
return 0;
}
Expand Down Expand Up @@ -279,14 +279,10 @@ int do_client_loop(uint8_t *tox_id_str)
unsigned char tox_packet_buf[PROTOCOL_MAX_PACKET_SIZE];
unsigned char tox_id[TOX_ADDRESS_SIZE];
uint32_t friendnumber = 0;
TOX_CONNECTION last_friend_connection_status = TOX_CONNECTION_NONE;
time_t last_friend_connection_status_received = 0;
time_t connection_lost_timestamp = 0;
struct timeval tv;
fd_set fds;
static time_t invitation_sent_time = 0;
uint32_t invitations_sent = 0;
TOX_ERR_FRIEND_QUERY friend_query_error;
TOX_ERR_FRIEND_CUSTOM_PACKET custom_packet_error;

client_tunnel.sockfd = 0;
Expand All @@ -310,12 +306,12 @@ int do_client_loop(uint8_t *tox_id_str)

while(1)
{
/* Let tox do its stuff */
tox_iterate(tox, NULL);
/* Let tox do its stuff */
tox_iterate(tox, NULL);

switch(state)
{
/*
/*
* Send friend request
*/
case CLIENT_STATE_INITIAL:
Expand Down Expand Up @@ -372,17 +368,7 @@ int do_client_loop(uint8_t *tox_id_str)
break;
case CLIENT_STATE_SENTREQUEST:
{
TOX_CONNECTION friend_connection_status;
friend_connection_status = tox_friend_get_connection_status(tox, friendnumber, &friend_query_error);
if(friend_query_error != TOX_ERR_FRIEND_QUERY_OK)
{
log_printf(L_DEBUG, "tox_friend_get_connection_status: error %u", friend_query_error);
}
else
{
last_friend_connection_status_received = time(NULL);
last_friend_connection_status = friend_connection_status;

if(friend_connection_status != TOX_CONNECTION_NONE)
{
const char* status = readable_connection_status(friend_connection_status);
Expand All @@ -391,7 +377,8 @@ int do_client_loop(uint8_t *tox_id_str)
}
else
{
if(1 && (time(NULL) - invitation_sent_time > 45))
const int INVITATION_SEND_INTERVAL = 90;
if (time(NULL) - invitation_sent_time > INVITATION_SEND_INTERVAL)
{
TOX_ERR_FRIEND_DELETE error = 0;

Expand Down Expand Up @@ -501,7 +488,7 @@ int do_client_loop(uint8_t *tox_id_str)
tv.tv_sec = 0;
tv.tv_usec = 20000;
fds = client_master_fdset;

/* Handle accepting new connections */
if(!client_pipe_mode &&
client_tunnel.sockfd <= 0) /* Don't accept if we're already waiting to establish a tunnel */
Expand Down Expand Up @@ -598,69 +585,38 @@ int do_client_loop(uint8_t *tox_id_str)
fds = client_master_fdset;

/* Check friend connection status changes */
/* TODO: learned about tox_friend_connection_status_cb after writing this... */
/* TODO: also check friend status tox_callback_friend_status */
if(time(NULL) - last_friend_connection_status_received > 15)
if(friend_connection_status == TOX_CONNECTION_NONE)
{
state = CLIENT_STATE_CONNECTION_LOST;
}
}
break;
case CLIENT_STATE_CONNECTION_LOST:
{
{
TOX_CONNECTION friend_connection_status;
friend_connection_status = tox_friend_get_connection_status(tox, friendnumber, &friend_query_error);
if(friend_query_error != TOX_ERR_FRIEND_QUERY_OK)
if(friend_connection_status == TOX_CONNECTION_NONE)
{
log_printf(L_DEBUG, "tox_friend_get_connection_status: error %u\n", friend_query_error);
/* https://github.com/TokTok/c-toxcore/blob/acb6b2d8543c8f2ea0c2e60dc046767cf5cc0de8/toxcore/tox.h#L1267 */
TOX_ERR_FRIEND_DELETE tox_delete_error;

log_printf(L_WARNING, "Lost connection to server, closing all tunnels and re-adding friend\n");
client_close_all_connections();
tox_friend_delete(tox, friendnumber, &tox_delete_error);
if(tox_delete_error)
{
log_printf(L_ERROR, "Error when deleting server from friend list: %d\n", tox_delete_error);
}
state = CLIENT_STATE_INITIAL;
}
else
{
if(friend_connection_status != last_friend_connection_status)
{
const char* status = readable_connection_status(friend_connection_status);
log_printf(L_INFO, "Friend connection status changed to: %s (%d)\n", status, friend_connection_status);

if(friend_connection_status == TOX_CONNECTION_NONE)
{
state = CLIENT_STATE_CONNECTION_LOST;
connection_lost_timestamp = time(NULL);
}
}

last_friend_connection_status_received = time(NULL);
last_friend_connection_status = friend_connection_status;
state = CLIENT_STATE_FORWARDING;
}
}
}
break;
case CLIENT_STATE_CONNECTION_LOST:
{
TOX_CONNECTION friend_connection_status;
friend_connection_status = tox_friend_get_connection_status(tox, friendnumber, &friend_query_error);
if(friend_query_error != TOX_ERR_FRIEND_QUERY_OK)
{
log_printf(L_DEBUG, "tox_friend_get_connection_status: error %u\n", friend_query_error);
}
else
{
if(friend_connection_status == TOX_CONNECTION_NONE)
{
/* https://github.com/TokTok/c-toxcore/blob/acb6b2d8543c8f2ea0c2e60dc046767cf5cc0de8/toxcore/tox.h#L1267 */
TOX_ERR_FRIEND_DELETE tox_delete_error;

log_printf(L_WARNING, "Lost connection to server, closing all tunnels and re-adding friend\n");
client_close_all_connections();
tox_friend_delete(tox, friendnumber, &tox_delete_error);
if(tox_delete_error)
{
log_printf(L_ERROR, "Error when deleting server from friend list: %d\n", tox_delete_error);
}
state = CLIENT_STATE_INITIAL;
}
else
{
state = CLIENT_STATE_FORWARDING;
}
}
}
break;
case 0xffffffff:
log_printf(L_ERROR, "You forgot a break statement\n");
case 0xffffffff:
log_printf(L_ERROR, "You forgot a break statement\n");
case CLIENT_STATE_SHUTDOWN:
exit(0);
break;
Expand Down
1 change: 0 additions & 1 deletion gitversion.h
View file
Open in desktop

This file was deleted.

Loading