mirror of
https://github.com/ntop/n2n.git
synced 2024-09-20 00:51:10 +02:00
Remove unused field in peer_info
This commit is contained in:
parent
1d03f9ba59
commit
365dd29b12
1
n2n.h
1
n2n.h
|
@ -170,7 +170,6 @@ typedef char macstr_t[N2N_MACSTR_SIZE];
|
||||||
|
|
||||||
struct peer_info {
|
struct peer_info {
|
||||||
n2n_mac_t mac_addr;
|
n2n_mac_t mac_addr;
|
||||||
n2n_community_t community_name;
|
|
||||||
n2n_sock_t sock;
|
n2n_sock_t sock;
|
||||||
int timeout;
|
int timeout;
|
||||||
time_t last_seen;
|
time_t last_seen;
|
||||||
|
|
14
sn.c
14
sn.c
|
@ -147,7 +147,6 @@ static int update_edge(n2n_sn_t * sss,
|
||||||
|
|
||||||
scan = (struct peer_info*)calloc(1, sizeof(struct peer_info)); /* deallocated in purge_expired_registrations */
|
scan = (struct peer_info*)calloc(1, sizeof(struct peer_info)); /* deallocated in purge_expired_registrations */
|
||||||
|
|
||||||
memcpy(scan->community_name, comm->community, sizeof(n2n_community_t));
|
|
||||||
memcpy(&(scan->mac_addr), edgeMac, sizeof(n2n_mac_t));
|
memcpy(&(scan->mac_addr), edgeMac, sizeof(n2n_mac_t));
|
||||||
memcpy(&(scan->sock), sender_sock, sizeof(n2n_sock_t));
|
memcpy(&(scan->sock), sender_sock, sizeof(n2n_sock_t));
|
||||||
|
|
||||||
|
@ -158,10 +157,7 @@ static int update_edge(n2n_sn_t * sss,
|
||||||
sock_to_cstr(sockbuf, sender_sock));
|
sock_to_cstr(sockbuf, sender_sock));
|
||||||
} else {
|
} else {
|
||||||
/* Known */
|
/* Known */
|
||||||
if((0 != memcmp(comm, scan->community_name, sizeof(n2n_community_t))) ||
|
if(!sock_equal(sender_sock, &(scan->sock))) {
|
||||||
(!sock_equal(sender_sock, &(scan->sock))))
|
|
||||||
{
|
|
||||||
memcpy(scan->community_name, comm, sizeof(n2n_community_t));
|
|
||||||
memcpy(&(scan->sock), sender_sock, sizeof(n2n_sock_t));
|
memcpy(&(scan->sock), sender_sock, sizeof(n2n_sock_t));
|
||||||
|
|
||||||
traceEvent(TRACE_INFO, "update_edge updated %s ==> %s",
|
traceEvent(TRACE_INFO, "update_edge updated %s ==> %s",
|
||||||
|
@ -925,18 +921,18 @@ static void dump_registrations(int signo) {
|
||||||
traceEvent(TRACE_NORMAL, "====================================");
|
traceEvent(TRACE_NORMAL, "====================================");
|
||||||
|
|
||||||
HASH_ITER(hh, sss_node.communities, comm, ctmp) {
|
HASH_ITER(hh, sss_node.communities, comm, ctmp) {
|
||||||
|
traceEvent(TRACE_NORMAL, "Dumping community: %s", comm->community);
|
||||||
|
|
||||||
HASH_ITER(hh, comm->edges, list, tmp) {
|
HASH_ITER(hh, comm->edges, list, tmp) {
|
||||||
if(list->sock.family == AF_INET)
|
if(list->sock.family == AF_INET)
|
||||||
traceEvent(TRACE_NORMAL, "[id: %u][MAC: %s][edge: %u.%u.%u.%u:%u][community: %s][last seen: %u sec ago]",
|
traceEvent(TRACE_NORMAL, "[id: %u][MAC: %s][edge: %u.%u.%u.%u:%u][last seen: %u sec ago]",
|
||||||
++num, macaddr_str(buf, list->mac_addr),
|
++num, macaddr_str(buf, list->mac_addr),
|
||||||
list->sock.addr.v4[0], list->sock.addr.v4[1], list->sock.addr.v4[2], list->sock.addr.v4[3],
|
list->sock.addr.v4[0], list->sock.addr.v4[1], list->sock.addr.v4[2], list->sock.addr.v4[3],
|
||||||
list->sock.port,
|
list->sock.port,
|
||||||
(char*)list->community_name,
|
|
||||||
now-list->last_seen);
|
now-list->last_seen);
|
||||||
else
|
else
|
||||||
traceEvent(TRACE_NORMAL, "[id: %u][MAC: %s][edge: IPv6:%u][community: %s][last seen: %u sec ago]",
|
traceEvent(TRACE_NORMAL, "[id: %u][MAC: %s][edge: IPv6:%u][last seen: %u sec ago]",
|
||||||
++num, macaddr_str(buf, list->mac_addr), list->sock.port,
|
++num, macaddr_str(buf, list->mac_addr), list->sock.port,
|
||||||
(char*)list->community_name,
|
|
||||||
now-list->last_seen);
|
now-list->last_seen);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user