StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Const-correctness for TCP_server.c

Browse Source
This commit is contained in:
Marc Schütz 2014-06-30 21:52:07 +02:00
parent 000692fca0
commit ece7e535f3
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
toxcore/TCP_server.c
View File

@ -97,7 +97,7 @@ static int realloc_connection(TCP_Server *TCP_server, uint32_t num)
/* return index corresponding to connection with peer on success /* return index corresponding to connection with peer on success
* return -1 on failure. * return -1 on failure.
*/ */
static int get_TCP_connection_index(TCP_Server *TCP_server, uint8_t *public_key) static int get_TCP_connection_index(const TCP_Server *TCP_server, const uint8_t *public_key)
{ {
return bs_list_find(&TCP_server->accepted_key_list, public_key); return bs_list_find(&TCP_server->accepted_key_list, public_key);
} }
@ -110,7 +110,7 @@ static int kill_accepted(TCP_Server *TCP_server, int index);
* return index on success * return index on success
* return -1 on failure * return -1 on failure
*/ */
static int add_accepted(TCP_Server *TCP_server, TCP_Secure_Connection *con) static int add_accepted(TCP_Server *TCP_server, const TCP_Secure_Connection *con)
{ {
int index = get_TCP_connection_index(TCP_server, con->public_key); int index = get_TCP_connection_index(TCP_server, con->public_key);
@ -249,7 +249,7 @@ int read_TCP_packet(sock_t sock, uint8_t *data, uint16_t length)
* return 0 if could not read any packet. * return 0 if could not read any packet.
* return -1 on failure (connection must be killed). * return -1 on failure (connection must be killed).
*/ */
int read_packet_TCP_secure_connection(sock_t sock, uint16_t *next_packet_length, uint8_t *shared_key, int read_packet_TCP_secure_connection(sock_t sock, uint16_t *next_packet_length, const uint8_t *shared_key,
uint8_t *recv_nonce, uint8_t *data, uint16_t max_len) uint8_t *recv_nonce, uint8_t *data, uint16_t max_len)
{ {
if (*next_packet_length == 0) { if (*next_packet_length == 0) {
@ -318,7 +318,7 @@ static int send_pending_data(TCP_Secure_Connection *con)
* return 0 if could not send packet. * return 0 if could not send packet.
* return -1 on failure (connection must be killed). * return -1 on failure (connection must be killed).
*/ */
static int write_packet_TCP_secure_connection(TCP_Secure_Connection *con, uint8_t *data, uint16_t length) static int write_packet_TCP_secure_connection(TCP_Secure_Connection *con, const uint8_t *data, uint16_t length)
{ {
if (length + crypto_box_MACBYTES > MAX_PACKET_SIZE) if (length + crypto_box_MACBYTES > MAX_PACKET_SIZE)
return -1; return -1;
@ -389,7 +389,7 @@ static int kill_accepted(TCP_Server *TCP_server, int index)
/* return 1 if everything went well. /* return 1 if everything went well.
* return -1 if the connection must be killed. * return -1 if the connection must be killed.
*/ */
static int handle_TCP_handshake(TCP_Secure_Connection *con, uint8_t *data, uint16_t length, uint8_t *self_secret_key) static int handle_TCP_handshake(TCP_Secure_Connection *con, const uint8_t *data, uint16_t length, const uint8_t *self_secret_key)
{ {
if (length != TCP_CLIENT_HANDSHAKE_SIZE) if (length != TCP_CLIENT_HANDSHAKE_SIZE)
return -1; return -1;
@ -435,7 +435,7 @@ static int handle_TCP_handshake(TCP_Secure_Connection *con, uint8_t *data, uint1
* return 0 if we didn't get it yet. * return 0 if we didn't get it yet.
* return -1 if the connection must be killed. * return -1 if the connection must be killed.
*/ */
static int read_connection_handshake(TCP_Secure_Connection *con, uint8_t *self_secret_key) static int read_connection_handshake(TCP_Secure_Connection *con, const uint8_t *self_secret_key)
{ {
uint8_t data[TCP_CLIENT_HANDSHAKE_SIZE]; uint8_t data[TCP_CLIENT_HANDSHAKE_SIZE];
int len = 0; int len = 0;
@ -451,7 +451,7 @@ static int read_connection_handshake(TCP_Secure_Connection *con, uint8_t *self_s
* return 0 if could not send packet. * return 0 if could not send packet.
* return -1 on failure (connection must be killed). * return -1 on failure (connection must be killed).
*/ */
static int send_routing_response(TCP_Secure_Connection *con, uint8_t rpid, uint8_t *public_key) static int send_routing_response(TCP_Secure_Connection *con, uint8_t rpid, const uint8_t *public_key)
{ {
uint8_t data[1 + 1 + crypto_box_PUBLICKEYBYTES]; uint8_t data[1 + 1 + crypto_box_PUBLICKEYBYTES];
data[0] = TCP_PACKET_ROUTING_RESPONSE; data[0] = TCP_PACKET_ROUTING_RESPONSE;
@ -484,7 +484,7 @@ static int send_disconnect_notification(TCP_Secure_Connection *con, uint8_t id)
/* return 0 on success. /* return 0 on success.
* return -1 on failure (connection must be killed). * return -1 on failure (connection must be killed).
*/ */
static int handle_TCP_routing_req(TCP_Server *TCP_server, uint32_t con_id, uint8_t *public_key) static int handle_TCP_routing_req(TCP_Server *TCP_server, uint32_t con_id, const uint8_t *public_key)
{ {
uint32_t i; uint32_t i;
uint32_t index = ~0; uint32_t index = ~0;
@ -562,7 +562,7 @@ static int handle_TCP_routing_req(TCP_Server *TCP_server, uint32_t con_id, uint8
/* return 0 on success. /* return 0 on success.
* return -1 on failure (connection must be killed). * return -1 on failure (connection must be killed).
*/ */
static int handle_TCP_oob_send(TCP_Server *TCP_server, uint32_t con_id, uint8_t *public_key, uint8_t *data, static int handle_TCP_oob_send(TCP_Server *TCP_server, uint32_t con_id, const uint8_t *public_key, const uint8_t *data,
uint16_t length) uint16_t length)
{ {
if (length == 0 || length > TCP_MAX_OOB_DATA_LENGTH) if (length == 0 || length > TCP_MAX_OOB_DATA_LENGTH)
@ -645,7 +645,7 @@ static int handle_onion_recv_1(void *object, IP_Port dest, const uint8_t *data,
/* return 0 on success /* return 0 on success
* return -1 on failure * return -1 on failure
*/ */
static int handle_TCP_packet(TCP_Server *TCP_server, uint32_t con_id, uint8_t *data, uint16_t length) static int handle_TCP_packet(TCP_Server *TCP_server, uint32_t con_id, const uint8_t *data, uint16_t length)
{ {
if (length == 0) if (length == 0)
return -1; return -1;
@ -764,7 +764,7 @@ static int handle_TCP_packet(TCP_Server *TCP_server, uint32_t con_id, uint8_t *d
} }
static int confirm_TCP_connection(TCP_Server *TCP_server, TCP_Secure_Connection *con, uint8_t *data, uint16_t length) static int confirm_TCP_connection(TCP_Server *TCP_server, TCP_Secure_Connection *con, const uint8_t *data, uint16_t length)
{ {
int index = add_accepted(TCP_server, con); int index = add_accepted(TCP_server, con);
@ -838,8 +838,8 @@ static sock_t new_listening_TCP_socket(int family, uint16_t port)
return sock; return sock;
} }
TCP_Server *new_TCP_server(uint8_t ipv6_enabled, uint16_t num_sockets, uint16_t *ports, uint8_t *public_key, TCP_Server *new_TCP_server(uint8_t ipv6_enabled, uint16_t num_sockets, const uint16_t *ports, const uint8_t *public_key,
uint8_t *secret_key, Onion *onion) const uint8_t *secret_key, Onion *onion)
{ {
if (num_sockets == 0 || ports == NULL) if (num_sockets == 0 || ports == NULL)
return NULL; return NULL;

6
toxcore/TCP_server.h
View File

@ -133,8 +133,8 @@ typedef struct {
/* Create new TCP server instance. /* Create new TCP server instance.
*/ */
TCP_Server *new_TCP_server(uint8_t ipv6_enabled, uint16_t num_sockets, uint16_t *ports, uint8_t *public_key, TCP_Server *new_TCP_server(uint8_t ipv6_enabled, uint16_t num_sockets, const uint16_t *ports, const uint8_t *public_key,
uint8_t *secret_key, Onion *onion); const uint8_t *secret_key, Onion *onion);
/* Run the TCP_server /* Run the TCP_server
*/ */
@ -164,7 +164,7 @@ int read_TCP_packet(sock_t sock, uint8_t *data, uint16_t length);
* return 0 if could not read any packet. * return 0 if could not read any packet.
* return -1 on failure (connection must be killed). * return -1 on failure (connection must be killed).
*/ */
int read_packet_TCP_secure_connection(sock_t sock, uint16_t *next_packet_length, uint8_t *shared_key, int read_packet_TCP_secure_connection(sock_t sock, uint16_t *next_packet_length, const uint8_t *shared_key,
uint8_t *recv_nonce, uint8_t *data, uint16_t max_len); uint8_t *recv_nonce, uint8_t *data, uint16_t max_len);