external/DAWN
1
0
Fork 0
mirror of https://github.com/berlin-open-wireless-lab/DAWN.git synced 2025-03-09 15:40:12 +00:00
Code Issues Releases Wiki Activity

tcpsocket: free con after ustream write error and make list each safe

Browse source 
list_each is not safe against removal of list entry
This commit is contained in:
twy_2000 2020-06-15 20:55:09 +08:00
parent ada3bf3ff2
commit 8ce9394db9
1 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/network/tcpsocket.c
View file

@ -241,18 +241,19 @@ 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;
char *enc = gcrypt_encrypt_msg(msg, msglen, &length_enc);
struct network_con_s *con;
uint32_t final_len = length_enc + sizeof(final_len);
char *final_str = malloc(final_len);
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);
@ -260,6 +261,12 @@ void send_tcp(char *msg) {
if (len_ustream <= 0) {
fprintf(stderr,"Ustream error!\n");
//TODO: ERROR HANDLING!
if (con->stream.stream.write_error) {
ustream_free(&con->stream.stream);
close(con->fd.fd);
list_del(&con->list);
free(con);
}
}
}
@ -274,9 +281,8 @@ 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);
@ -284,6 +290,12 @@ void send_tcp(char *msg) {
if (len_ustream <= 0) {
//TODO: 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);
}
}
}
}