external/DAWN
1
0
Fork 0
mirror of https://github.com/berlin-open-wireless-lab/DAWN.git synced 2025-02-14 17:51:51 +00:00
Code Issues Releases Wiki Activity

tcpsocket: free con after ustream write error and make list each safe list_each is not safe against removal of list entry

Browse source
This commit is contained in:
twy_2000 2020-06-18 22:32:26 +08:00 committed by Polynomialdivision
parent a6d0ea3d1d
commit 0f63e00c43
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/network/tcpsocket.c
View file

@ -241,6 +241,7 @@ int add_tcp_conncection(char *ipv4, int port) {
void send_tcp(char *msg) {
print_tcp_array();
struct network_con_s *con, *tmp;
if (network_config.use_symm_enc) {
int length_enc;
size_t msglen = strlen(msg)+1;
@ -250,7 +251,6 @@ void send_tcp(char *msg) {
return;
}
struct network_con_s *con;
uint32_t final_len = length_enc + sizeof(final_len);
char *final_str = malloc(final_len);
if (!final_str){
@ -261,14 +261,20 @@ void send_tcp(char *msg) {
uint32_t *msg_header = (uint32_t *)final_str;
*msg_header = htonl(final_len);
memcpy(final_str+sizeof(final_len), enc, length_enc);
list_for_each_entry(con, &tcp_sock_list, list)
list_for_each_entry_safe(con, tmp, &tcp_sock_list, list)
{
if (con->connected) {
int len_ustream = ustream_write(&con->stream.stream, final_str, final_len, 0);
printf("Ustream send: %d\n", len_ustream);
if (len_ustream <= 0) {
fprintf(stderr,"Ustream error!\n");
//TODO: ERROR HANDLING!
//ERROR HANDLING!
if (con->stream.stream.write_error) {
ustream_free(&con->stream.stream);
close(con->fd.fd);
list_del(&con->list);
free(con);
}
}
}
@ -287,16 +293,21 @@ void send_tcp(char *msg) {
uint32_t *msg_header = (uint32_t *)final_str;
*msg_header = htonl(final_len);
memcpy(final_str+sizeof(final_len), msg, msglen);
struct network_con_s *con;
list_for_each_entry(con, &tcp_sock_list, list)
list_for_each_entry_safe(con, tmp, &tcp_sock_list, list)
{
if (con->connected) {
int len_ustream = ustream_write(&con->stream.stream, final_str, final_len, 0);
printf("Ustream send: %d\n", len_ustream);
if (len_ustream <= 0) {
//TODO: ERROR HANDLING!
//ERROR HANDLING!
fprintf(stderr,"Ustream error!\n");
if (con->stream.stream.write_error) {
ustream_free(&con->stream.stream);
close(con->fd.fd);
list_del(&con->list);
free(con);
}
}
}
}