kdxcxs
/
n2n
mirror of https://github.com/ntop/n2n.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

fixed segmentation fault #758 (#762)

pull/768/head
skyformat99 3 years ago
committed by GitHub
parent
e13c9a01a5
commit
586beee871
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 73
      src/n2n.c

73
src/n2n.c
View File

@ -426,50 +426,53 @@ void resolve_cancel_thread (n2n_resolve_parameter_t *param) {
uint8_t resolve_check (n2n_resolve_parameter_t *param, uint8_t requires_resolution, time_t now) { uint8_t resolve_check (n2n_resolve_parameter_t *param, uint8_t requires_resolution, time_t now) {
uint8_t ret = requires_resolution; /* if trylock fails, it still requires resolution */ uint8_t ret = requires_resolution; /* if trylock fails, it still requires resolution */
#ifdef HAVE_PTHREAD #ifdef HAVE_PTHREAD
n2n_resolve_ip_sock_t *entry, *tmp_entry; if(param != NULL) {
n2n_sock_str_t sock_buf; n2n_resolve_ip_sock_t *entry, *tmp_entry;
n2n_sock_str_t sock_buf;
// check_interval and last_check do not need to be guarded by the mutex because
// their values get changed and evaluated only here // check_interval and last_check do not need to be guarded by the mutex because
// their values get changed and evaluated only here
if((now - param->last_checked > param->check_interval) || (requires_resolution)) { if((now - param->last_checked > param->check_interval) || (requires_resolution)) {
// try to lock access // try to lock access
if(pthread_mutex_trylock(&param->access) == 0) { if(pthread_mutex_trylock(&param->access) == 0) {
// any changes? // any changes?
if(param->changed) { if(param->changed) {
// reset flag // reset flag
param->changed = 0; param->changed = 0;
// unselectively copy all socks (even those with error code, that would be the old one because // unselectively copy all socks (even those with error code, that would be the old one because
// sockets do not get overwritten in case of error in resolve_thread) from list to supernode list // sockets do not get overwritten in case of error in resolve_thread) from list to supernode list
HASH_ITER(hh, param->list, entry, tmp_entry) { HASH_ITER(hh, param->list, entry, tmp_entry) {
memcpy(entry->org_sock, &entry->sock, sizeof(n2n_sock_t)); memcpy(entry->org_sock, &entry->sock, sizeof(n2n_sock_t));
traceEvent(TRACE_INFO, "resolve_check renews ip address of supernode '%s' to %s", traceEvent(TRACE_INFO, "resolve_check renews ip address of supernode '%s' to %s",
entry->org_ip, sock_to_cstr(sock_buf, &(entry->sock))); entry->org_ip, sock_to_cstr(sock_buf, &(entry->sock)));
}
} }
}
// let the resolver thread know eventual difficulties in reaching the supernode // let the resolver thread know eventual difficulties in reaching the supernode
if(requires_resolution) { if(requires_resolution) {
param->request = 1; param->request = 1;
ret = 0; ret = 0;
} }
param->last_checked = now; param->last_checked = now;
// next appointment // next appointment
if(param->request) if(param->request)
// earlier if resolver still working on fulfilling a request // earlier if resolver still working on fulfilling a request
param->check_interval = N2N_RESOLVE_CHECK_INTERVAL / 10; param->check_interval = N2N_RESOLVE_CHECK_INTERVAL / 10;
else else
param->check_interval = N2N_RESOLVE_CHECK_INTERVAL; param->check_interval = N2N_RESOLVE_CHECK_INTERVAL;
// unlock access // unlock access
pthread_mutex_unlock(&param->access); pthread_mutex_unlock(&param->access);
}
} }
} }
#endif #endif
return ret; return ret;
} }

Write Preview
Loading…
Cancel
Save