mirror of
https://github.com/ntop/n2n.git
synced 2024-09-20 00:51:10 +02:00
added MAC to management port output
This commit is contained in:
parent
da870876c8
commit
6fc9890e55
12
src/sn.c
12
src/sn.c
|
@ -296,6 +296,8 @@ static int process_mgmt(n2n_sn_t * sss,
|
||||||
uint32_t num_edges=0;
|
uint32_t num_edges=0;
|
||||||
ssize_t r;
|
ssize_t r;
|
||||||
struct sn_community *community, *tmp;
|
struct sn_community *community, *tmp;
|
||||||
|
struct peer_info * peer, *tmpPeer;
|
||||||
|
macstr_t mac_buf;
|
||||||
|
|
||||||
traceEvent(TRACE_DEBUG, "process_mgmt");
|
traceEvent(TRACE_DEBUG, "process_mgmt");
|
||||||
|
|
||||||
|
@ -347,11 +349,15 @@ static int process_mgmt(n2n_sn_t * sss,
|
||||||
ressize += snprintf(resbuf+ressize, N2N_SN_PKTBUF_SIZE-ressize,
|
ressize += snprintf(resbuf+ressize, N2N_SN_PKTBUF_SIZE-ressize,
|
||||||
" [%s]",
|
" [%s]",
|
||||||
community->community);
|
community->community);
|
||||||
|
HASH_ITER(hh, community->edges, peer, tmpPeer) {
|
||||||
|
ressize += snprintf(resbuf+ressize, N2N_SN_PKTBUF_SIZE-ressize,
|
||||||
|
" {%s}",
|
||||||
|
macaddr_str(mac_buf, peer->mac_addr));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
ressize += snprintf(resbuf+ressize, N2N_SN_PKTBUF_SIZE-ressize,
|
ressize += snprintf(resbuf+ressize, N2N_SN_PKTBUF_SIZE-ressize,
|
||||||
"\n");
|
"\n");
|
||||||
|
|
||||||
|
|
||||||
r = sendto(sss->mgmt_sock, resbuf, ressize, 0/*flags*/,
|
r = sendto(sss->mgmt_sock, resbuf, ressize, 0/*flags*/,
|
||||||
(struct sockaddr *)sender_sock, sizeof(struct sockaddr_in));
|
(struct sockaddr *)sender_sock, sizeof(struct sockaddr_in));
|
||||||
|
|
||||||
|
@ -495,8 +501,8 @@ static int process_udp(n2n_sn_t * sss,
|
||||||
if ( (ret = packet_header_decrypt (udp_buf, udp_size, comm->community, comm->header_encryption_ctx,
|
if ( (ret = packet_header_decrypt (udp_buf, udp_size, comm->community, comm->header_encryption_ctx,
|
||||||
comm->header_iv_ctx, &checksum)) ) {
|
comm->header_iv_ctx, &checksum)) ) {
|
||||||
if (checksum != pearson_hash_16 (udp_buf, udp_size)) {
|
if (checksum != pearson_hash_16 (udp_buf, udp_size)) {
|
||||||
// !!! traceEvent(TRACE_DEBUG, "process_udp dropped packet due to checksum error.");
|
traceEvent(TRACE_DEBUG, "process_udp dropped packet due to checksum error.");
|
||||||
// !!! return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
if (comm->header_encryption == HEADER_ENCRYPTION_UNKNOWN) {
|
if (comm->header_encryption == HEADER_ENCRYPTION_UNKNOWN) {
|
||||||
traceEvent (TRACE_INFO, "process_udp locked community '%s' to using "
|
traceEvent (TRACE_INFO, "process_udp locked community '%s' to using "
|
||||||
|
|
|
@ -299,6 +299,8 @@ static int process_mgmt(n2n_sn_t *sss,
|
||||||
uint32_t num_edges = 0;
|
uint32_t num_edges = 0;
|
||||||
ssize_t r;
|
ssize_t r;
|
||||||
struct sn_community *community, *tmp;
|
struct sn_community *community, *tmp;
|
||||||
|
struct peer_info * peer, *tmpPeer;
|
||||||
|
macstr_t mac_buf;
|
||||||
|
|
||||||
traceEvent(TRACE_DEBUG, "process_mgmt");
|
traceEvent(TRACE_DEBUG, "process_mgmt");
|
||||||
|
|
||||||
|
@ -345,6 +347,21 @@ static int process_mgmt(n2n_sn_t *sss,
|
||||||
"last reg %lu sec ago\n",
|
"last reg %lu sec ago\n",
|
||||||
(long unsigned int)(now - sss->stats.last_reg_super));
|
(long unsigned int)(now - sss->stats.last_reg_super));
|
||||||
|
|
||||||
|
ressize += snprintf(resbuf+ressize, N2N_SN_PKTBUF_SIZE-ressize,
|
||||||
|
"cur_cmnts");
|
||||||
|
HASH_ITER(hh, sss->communities, community, tmp) {
|
||||||
|
ressize += snprintf(resbuf+ressize, N2N_SN_PKTBUF_SIZE-ressize,
|
||||||
|
" [%s]",
|
||||||
|
community->community);
|
||||||
|
HASH_ITER(hh, community->edges, peer, tmpPeer) {
|
||||||
|
ressize += snprintf(resbuf+ressize, N2N_SN_PKTBUF_SIZE-ressize,
|
||||||
|
" {%s}",
|
||||||
|
macaddr_str(mac_buf, peer->mac_addr));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ressize += snprintf(resbuf+ressize, N2N_SN_PKTBUF_SIZE-ressize,
|
||||||
|
"\n");
|
||||||
|
|
||||||
r = sendto(sss->mgmt_sock, resbuf, ressize, 0 /*flags*/,
|
r = sendto(sss->mgmt_sock, resbuf, ressize, 0 /*flags*/,
|
||||||
(struct sockaddr *)sender_sock, sizeof(struct sockaddr_in));
|
(struct sockaddr *)sender_sock, sizeof(struct sockaddr_in));
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user