Eric House
f9cebfe444
track bytes sent per device rather than per game
2013-06-27 06:23:15 -07:00
Eric House
b31858ee5e
log rather than assert when hostid changes -- though I'm not seeing
...
this now that the relay doesn't send packets to the wrong device
2013-06-26 00:42:55 -07:00
Eric House
0bb4f5b0f5
fix occasional memory leak
2013-06-26 00:41:16 -07:00
Eric House
8324b9c770
fix compile error by making HELP another command.
2013-06-26 00:39:58 -07:00
Eric House
9138cd15b7
fix problems with devices reconnecting when their ACKs didn't arrive
...
and their slots are empty or have been reassigned: basically we check
if a device goes where it expects, and if not treat it as a new
connection rather than a reconnect, meaning its hostid may change.
Existing device code seems ok with that -- and at any rate I don't
think ACKs get dropped much in the wild.
2013-06-26 00:38:34 -07:00
Eric House
909640c82f
cleanup/improve logging
2013-06-26 00:36:02 -07:00
Eric House
d7f8e8e198
rq is hanging, so set timeouts on its blocking sockets
2013-06-26 00:27:55 -07:00
Eric House
d801b23a87
add missing config option
2013-06-25 23:40:46 -07:00
Eric House
a1d272bf4f
log sockets associated with packets
2013-06-25 22:54:13 -07:00
Eric House
649969bc30
send ALL_HERE to all players
2013-06-25 22:52:13 -07:00
Eric House
f1a257a2aa
Merge branch 'android_branch' into local_fix_relay
2013-06-25 21:44:39 -07:00
Eric House
79293503fd
Merge branch 'from_beta_60' into android_branch
...
Conflicts:
xwords4/android/XWords4/AndroidManifest.xml
xwords4/android/XWords4/project.properties
xwords4/android/XWords4/res/raw/changes
2013-06-25 21:25:03 -07:00
Eric House
8cb89976cb
new quickie release to fix Play Store filtering out devices without
...
phones -- or so I think. Make SMS optional, and up version strings.
2013-06-25 21:14:14 -07:00
Eric House
aa7e9bf751
fix compile when debug define turned on
2013-06-25 07:59:40 -07:00
Eric House
27e9b48b78
fix timestamp math that had newer sometimes less than older
2013-06-25 07:58:15 -07:00
Eric House
7967966982
Merge remote-tracking branch 'origin/android_branch' into local_fix_relay
...
Conflicts:
xwords4/linux/linuxmain.c
xwords4/linux/main.h
2013-06-25 06:18:43 -07:00
Eric House
5612bb000b
quick hack to allow testing intermix of chat with normal moves
2013-06-24 18:37:49 -07:00
Eric House
5842654418
fix pattern
2013-06-24 07:30:38 -07:00
Eric House
aca3a96b54
fix pattern so ended games are detected
2013-06-24 07:18:53 -07:00
Eric House
519f90a69a
go with non-blocking sockets for tcp connections, adding the ability
...
to reassemble packets that arrive in separate recv() calls.
2013-06-24 07:09:57 -07:00
Eric House
d4cf37d2ef
fix misspelling
2013-06-24 07:05:09 -07:00
Eric House
bc6922cb8b
add option to split tcp packets to test whether relay can handle reassembly.
2013-06-24 06:33:06 -07:00
Eric House
ed16437f9a
don't refuse to store message when devid isn't available
2013-06-23 19:07:45 -07:00
Eric House
d14688a6a0
fix almost-infinite loop; assert no dup devids
2013-06-22 22:24:18 -07:00
Eric House
5dadbfdad3
drop messages without enough delivery info
2013-06-22 06:01:42 -07:00
Eric House
acd7c8519f
give timers ids so can be tracked in logs
2013-06-22 05:56:27 -07:00
Eric House
07d6851a26
logging changes for debugging -- main not belong in main branch
2013-06-22 05:55:38 -07:00
Eric House
c1cc11866f
tweak logging
2013-06-22 05:54:32 -07:00
Eric House
25bf0e7191
assertion: should never have two recs for same socket
2013-06-22 05:53:54 -07:00
Eric House
5d20ef872e
cleanup
2013-06-22 05:53:32 -07:00
Eric House
6d22c3ab86
tweak logging
2013-06-22 05:51:29 -07:00
Eric House
6027c94a43
don't pass uninitialized variables to logf
2013-06-21 07:26:11 -07:00
Eric House
b1ef09625e
pair delete[] with new[]
2013-06-21 07:25:41 -07:00
Eric House
c587848349
cleanup
2013-06-21 06:59:44 -07:00
Eric House
5e22508ff7
kill existing xwords instances as part of --clean-start
2013-06-21 06:58:20 -07:00
Eric House
8b8d22a7ba
fix compile error: move function back to being inline since header
...
can't be readily included from .h file
2013-06-21 06:14:10 -07:00
Eric House
2a35fac1e8
rather than invalidating socket in AddrRec when it's closed, add a
...
timestamp set when it's opened. Older copies with the same socket can
be tested against the cannonical copy maintained by tpool and sending
avoided when the timestamp shows the endpoint has likely changed.
Change tpool's list of sockets to a map for faster lookup, and get rid
of similar structure in udpqueue.
2013-06-21 06:05:26 -07:00
Eric House
6446819466
use nice to give the relay a fighting chance
2013-06-21 05:41:23 -07:00
Eric House
11d299606e
test for socket == -1 (invalidated) before sending
2013-06-20 07:10:09 -07:00
Eric House
46bd4d0047
inval tcp sockets in return addresses of packets waiting processing
...
when they're closed to prevent attempting to write replies to the
wrong device should the socket be reopened.
2013-06-20 07:07:56 -07:00
Eric House
5bec10048b
add --clean-start option to speed testing
2013-06-20 06:45:51 -07:00
Eric House
985f7bfea0
tweak: don't restart whole loop on unlikely random result
2013-06-19 07:27:34 -07:00
Eric House
ecef687471
drop message, rather than asserting, if device id isn't in db.
2013-06-17 07:52:58 -07:00
Eric House
3e9dfb9a9d
allow a thread to get a cidlock it already has.
2013-06-17 07:26:54 -07:00
Eric House
950e754ca2
cleanup
2013-06-17 07:26:10 -07:00
Eric House
a546c025d5
Rather than queuing sockets needing reading, read them immediately and
...
queue the packets for processing. Add ids so they can be tracked in
the logs. In addition to making tcp and udp packet processing more
similar this fixes the case where a read is delayed until after the
client has closed the connection (and so returns an error.)
2013-06-17 07:25:25 -07:00
Eric House
1928554444
add asserts and clarifying comments
2013-06-17 06:54:38 -07:00
Eric House
7ce939f5c0
pass rather than hard-coding column name
2013-06-17 06:48:22 -07:00
Eric House
5da4936e43
report unexpected received packet size as an error
2013-06-17 06:42:21 -07:00
Eric House
e89fd3e8cc
fix names to make units clear -- no code change
2013-06-10 06:38:42 -07:00
