summaryrefslogtreecommitdiff
path: root/toxcore/network.c
diff options
context:
space:
mode:
authorirungentoo <irungentoo@gmail.com>2013-09-02 15:59:28 -0400
committerirungentoo <irungentoo@gmail.com>2013-09-02 15:59:28 -0400
commita4bf25801d510d606674afabf073f5eedf1b0efc (patch)
treecbfb093cdb2c694a861bdf86f73bcd3d3d8e676a /toxcore/network.c
parent25480852ac1cb868c2138eb7be5decc2b8271682 (diff)
parent61880ab9380f3a71ae1f51df7b6f4836059c041f (diff)
Merge branch 'master' of https://github.com/JamoBox/ProjectTox-Core into JamoBox-master
Diffstat (limited to 'toxcore/network.c')
-rw-r--r--toxcore/network.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/toxcore/network.c b/toxcore/network.c
index 592f8e45..9e329949 100644
--- a/toxcore/network.c
+++ b/toxcore/network.c
@@ -23,7 +23,7 @@
23 23
24#include "network.h" 24#include "network.h"
25 25
26/* return current UNIX time in microseconds (us). */ 26/* return current UNIX time in microseconds (us). */
27uint64_t current_time(void) 27uint64_t current_time(void)
28{ 28{
29 uint64_t time; 29 uint64_t time;
@@ -44,7 +44,7 @@ uint64_t current_time(void)
44#endif 44#endif
45} 45}
46 46
47/* return a random number. 47/* return a random number.
48 * NOTE: This function should probably not be used where cryptographic randomness is absolutely necessary. 48 * NOTE: This function should probably not be used where cryptographic randomness is absolutely necessary.
49 */ 49 */
50uint32_t random_int(void) 50uint32_t random_int(void)
@@ -153,8 +153,8 @@ static void at_shutdown(void)
153 * ip must be in network order EX: 127.0.0.1 = (7F000001). 153 * ip must be in network order EX: 127.0.0.1 = (7F000001).
154 * port is in host byte order (this means don't worry about it). 154 * port is in host byte order (this means don't worry about it).
155 * 155 *
156 * returns Networking_Core object if no problems 156 * return Networking_Core object if no problems
157 * returns NULL if there are problems. 157 * return NULL if there are problems.
158 */ 158 */
159Networking_Core *new_networking(IP ip, uint16_t port) 159Networking_Core *new_networking(IP ip, uint16_t port)
160{ 160{