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

TCP_client callbacks now have a per connection number that can be set.

Browse Source
This commit is contained in:
irungentoo 2014-05-13 18:09:38 -04:00
parent a05ab89dbf
commit 6b1578af3d
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
2 changed files with 44 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
toxcore/TCP_client.c
View File

@ -189,8 +189,8 @@ void routing_response_handler(TCP_Client_Connection *con, int (*response_callbac
con->response_callback_object = object; con->response_callback_object = object;
} }
void routing_status_handler(TCP_Client_Connection *con, int (*status_callback)(void *object, uint8_t connection_id, void routing_status_handler(TCP_Client_Connection *con, int (*status_callback)(void *object, uint32_t number,
uint8_t status), void *object) uint8_t connection_id, uint8_t status), void *object)
{ {
con->status_callback = status_callback; con->status_callback = status_callback;
con->status_callback_object = object; con->status_callback_object = object;
@ -214,8 +214,27 @@ int send_data(TCP_Client_Connection *con, uint8_t con_id, uint8_t *data, uint16_
return write_packet_TCP_secure_connection(con, packet, sizeof(packet)); return write_packet_TCP_secure_connection(con, packet, sizeof(packet));
} }
void routing_data_handler(TCP_Client_Connection *con, int (*data_callback)(void *object, uint8_t connection_id, /* Set the number that will be used as an argument in the callbacks related to con_id.
uint8_t *data, uint16_t length), void *object) *
* When not set by this function, the number is ~0.
*
* return 0 on success.
* return -1 on failure.
*/
int set_tcp_connection_number(TCP_Client_Connection *con, uint8_t con_id, uint32_t number)
{
if (con_id >= NUM_CLIENT_CONNECTIONS)
return -1;
if (con->connections[con_id].status == 0)
return -1;
con->connections[con_id].number = number;
return 0;
}
void routing_data_handler(TCP_Client_Connection *con, int (*data_callback)(void *object, uint32_t number,
uint8_t connection_id, uint8_t *data, uint16_t length), void *object)
{ {
con->data_callback = data_callback; con->data_callback = data_callback;
con->data_callback_object = object; con->data_callback_object = object;
@ -350,6 +369,7 @@ static int handle_TCP_packet(TCP_Client_Connection *conn, uint8_t *data, uint16_
return -1; return -1;
conn->connections[con_id].status = 1; conn->connections[con_id].status = 1;
conn->connections[con_id].number = ~0;
memcpy(conn->connections[con_id].public_key, data + 2, crypto_box_PUBLICKEYBYTES); memcpy(conn->connections[con_id].public_key, data + 2, crypto_box_PUBLICKEYBYTES);
if (conn->response_callback) if (conn->response_callback)
@ -373,7 +393,8 @@ static int handle_TCP_packet(TCP_Client_Connection *conn, uint8_t *data, uint16_
conn->connections[con_id].status = 2; conn->connections[con_id].status = 2;
if (conn->status_callback) if (conn->status_callback)
conn->status_callback(conn->status_callback_object, con_id, conn->connections[con_id].status); conn->status_callback(conn->status_callback_object, conn->connections[con_id].number, con_id,
conn->connections[con_id].status);
return 0; return 0;
} }
@ -393,7 +414,8 @@ static int handle_TCP_packet(TCP_Client_Connection *conn, uint8_t *data, uint16_
conn->connections[con_id].status = 1; conn->connections[con_id].status = 1;
if (conn->status_callback) if (conn->status_callback)
conn->status_callback(conn->status_callback_object, con_id, conn->connections[con_id].status); conn->status_callback(conn->status_callback_object, conn->connections[con_id].number, con_id,
conn->connections[con_id].status);
return 0; return 0;
} }
@ -438,7 +460,7 @@ static int handle_TCP_packet(TCP_Client_Connection *conn, uint8_t *data, uint16_
uint8_t con_id = data[0] - NUM_RESERVED_PORTS; uint8_t con_id = data[0] - NUM_RESERVED_PORTS;
if (conn->data_callback) if (conn->data_callback)
conn->data_callback(conn->data_callback_object, con_id, data + 1, length - 1); conn->data_callback(conn->data_callback_object, conn->connections[con_id].number, con_id, data + 1, length - 1);
} }
} }

21
toxcore/TCP_client.h
View File

@ -59,12 +59,13 @@ typedef struct {
struct { struct {
uint8_t status; /* 0 if not used, 1 if other is offline, 2 if other is online. */ uint8_t status; /* 0 if not used, 1 if other is offline, 2 if other is online. */
uint8_t public_key[crypto_box_PUBLICKEYBYTES]; uint8_t public_key[crypto_box_PUBLICKEYBYTES];
uint32_t number;
} connections[NUM_CLIENT_CONNECTIONS]; } connections[NUM_CLIENT_CONNECTIONS];
int (*response_callback)(void *object, uint8_t connection_id, uint8_t *public_key); int (*response_callback)(void *object, uint8_t connection_id, uint8_t *public_key);
void *response_callback_object; void *response_callback_object;
int (*status_callback)(void *object, uint8_t connection_id, uint8_t status); int (*status_callback)(void *object, uint32_t number, uint8_t connection_id, uint8_t status);
void *status_callback_object; void *status_callback_object;
int (*data_callback)(void *object, uint8_t connection_id, uint8_t *data, uint16_t length); int (*data_callback)(void *object, uint32_t number, uint8_t connection_id, uint8_t *data, uint16_t length);
void *data_callback_object; void *data_callback_object;
int (*onion_callback)(void *object, uint8_t *data, uint16_t length); int (*onion_callback)(void *object, uint8_t *data, uint16_t length);
@ -99,16 +100,24 @@ void onion_response_handler(TCP_Client_Connection *con, int (*onion_callback)(vo
int send_routing_request(TCP_Client_Connection *con, uint8_t *public_key); int send_routing_request(TCP_Client_Connection *con, uint8_t *public_key);
void routing_response_handler(TCP_Client_Connection *con, int (*response_callback)(void *object, uint8_t connection_id, void routing_response_handler(TCP_Client_Connection *con, int (*response_callback)(void *object, uint8_t connection_id,
uint8_t *public_key), void *object); uint8_t *public_key), void *object);
void routing_status_handler(TCP_Client_Connection *con, int (*status_callback)(void *object, uint8_t connection_id, void routing_status_handler(TCP_Client_Connection *con, int (*status_callback)(void *object, uint32_t number,
uint8_t status), void *object); uint8_t connection_id, uint8_t status), void *object);
/* Set the number that will be used as an argument in the callbacks related to con_id.
*
* When not set by this function, the number is ~0.
*
* return 0 on success.
* return -1 on failure.
*/
int set_tcp_connection_number(TCP_Client_Connection *con, uint8_t con_id, uint32_t number);
/* return 1 on success. /* return 1 on success.
* return 0 if could not send packet. * return 0 if could not send packet.
* return -1 on failure. * return -1 on failure.
*/ */
int send_data(TCP_Client_Connection *con, uint8_t con_id, uint8_t *data, uint16_t length); int send_data(TCP_Client_Connection *con, uint8_t con_id, uint8_t *data, uint16_t length);
void routing_data_handler(TCP_Client_Connection *con, int (*data_callback)(void *object, uint8_t connection_id, void routing_data_handler(TCP_Client_Connection *con, int (*data_callback)(void *object, uint32_t number,
uint8_t *data, uint16_t length), void *object); uint8_t connection_id, uint8_t *data, uint16_t length), void *object);
#endif #endif