diff options
author | irungentoo <irungentoo@gmail.com> | 2013-10-28 16:01:29 -0400 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2013-10-28 16:01:29 -0400 |
commit | 415835ce3d2daa9ecd4100e76d58d93b3afa2db0 (patch) | |
tree | 755d041ea06a9b1c05fc72687c9dd5c6e98bbe73 /toxcore/network.c | |
parent | 988922bdeb94dd83e61ed387b29187ac4c9936e0 (diff) | |
parent | 2bdce934373d238778bc77a04198bd3f1481542f (diff) |
Merge branch 'master' into harden
Also removed some old, useless loading code.
Diffstat (limited to 'toxcore/network.c')
-rw-r--r-- | toxcore/network.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/toxcore/network.c b/toxcore/network.c index 640311b3..d163c0eb 100644 --- a/toxcore/network.c +++ b/toxcore/network.c | |||
@@ -277,6 +277,8 @@ void networking_registerhandler(Networking_Core *net, uint8_t byte, packet_handl | |||
277 | 277 | ||
278 | void networking_poll(Networking_Core *net) | 278 | void networking_poll(Networking_Core *net) |
279 | { | 279 | { |
280 | unix_time_update(); | ||
281 | |||
280 | IP_Port ip_port; | 282 | IP_Port ip_port; |
281 | uint8_t data[MAX_UDP_PACKET_SIZE]; | 283 | uint8_t data[MAX_UDP_PACKET_SIZE]; |
282 | uint32_t length; | 284 | uint32_t length; |