diff options
author | irungentoo <irungentoo@gmail.com> | 2013-09-02 15:59:28 -0400 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2013-09-02 15:59:28 -0400 |
commit | a4bf25801d510d606674afabf073f5eedf1b0efc (patch) | |
tree | cbfb093cdb2c694a861bdf86f73bcd3d3d8e676a /toxcore/network.h | |
parent | 25480852ac1cb868c2138eb7be5decc2b8271682 (diff) | |
parent | 61880ab9380f3a71ae1f51df7b6f4836059c041f (diff) |
Merge branch 'master' of https://github.com/JamoBox/ProjectTox-Core into JamoBox-master
Diffstat (limited to 'toxcore/network.h')
-rw-r--r-- | toxcore/network.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/toxcore/network.h b/toxcore/network.h index 3a1c75f8..ca79a81b 100644 --- a/toxcore/network.h +++ b/toxcore/network.h | |||
@@ -128,10 +128,10 @@ typedef struct { | |||
128 | 128 | ||
129 | } Networking_Core; | 129 | } Networking_Core; |
130 | 130 | ||
131 | /* return current time in milleseconds since the epoch. */ | 131 | /* return current time in milleseconds since the epoch. */ |
132 | uint64_t current_time(void); | 132 | uint64_t current_time(void); |
133 | 133 | ||
134 | /* return a random number. | 134 | /* return a random number. |
135 | * NOTE: this function should probably not be used where cryptographic randomness is absolutely necessary. | 135 | * NOTE: this function should probably not be used where cryptographic randomness is absolutely necessary. |
136 | */ | 136 | */ |
137 | uint32_t random_int(void); | 137 | uint32_t random_int(void); |
@@ -153,12 +153,12 @@ void networking_registerhandler(Networking_Core *net, uint8_t byte, packet_handl | |||
153 | void networking_poll(Networking_Core *net); | 153 | void networking_poll(Networking_Core *net); |
154 | 154 | ||
155 | /* Initialize networking. | 155 | /* Initialize networking. |
156 | * bind to ip and port. | 156 | * bind to ip and port. |
157 | * ip must be in network order EX: 127.0.0.1 = (7F000001). | 157 | * ip must be in network order EX: 127.0.0.1 = (7F000001). |
158 | * port is in host byte order (this means don't worry about it). | 158 | * port is in host byte order (this means don't worry about it). |
159 | * | 159 | * |
160 | * returns 0 if no problems. | 160 | * return 0 if no problems. |
161 | * returns -1 if there were problems. | 161 | * return -1 if there were problems. |
162 | */ | 162 | */ |
163 | Networking_Core *new_networking(IP ip, uint16_t port); | 163 | Networking_Core *new_networking(IP ip, uint16_t port); |
164 | 164 | ||