mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-22 17:51:53 +00:00
Code Releases Activity

SNMP: Handle unresponsive master agent

Browse Source
This commit is contained in:
Vojtech Vilimek 2024-08-15 11:52:38 +02:00
parent e10f21aa3a
commit c41a9e044b
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
proto/snmp/snmp.c
View File

@ -207,7 +207,6 @@ snmp_set_state(struct snmp_proto *p, enum snmp_proto_state state)
if (cf->trans_type == SNMP_TRANS_TCP) if (cf->trans_type == SNMP_TRANS_TCP)
{ {
s->type = SK_TCP_ACTIVE; s->type = SK_TCP_ACTIVE;
//s->saddr = ipa_from_ip4(p->local_ip);
s->daddr = p->remote_ip; s->daddr = p->remote_ip;
s->dport = p->remote_port; s->dport = p->remote_port;
s->rbsize = SNMP_RX_BUFFER_SIZE; s->rbsize = SNMP_RX_BUFFER_SIZE;
@ -221,7 +220,6 @@ snmp_set_state(struct snmp_proto *p, enum snmp_proto_state state)
s->tbsize = SNMP_TX_BUFFER_SIZE; s->tbsize = SNMP_TX_BUFFER_SIZE;
} }
/* s->tos = IP_PREC_INTERNET_CONTROL */
s->tx_hook = snmp_connected; s->tx_hook = snmp_connected;
s->err_hook = snmp_sock_err; s->err_hook = snmp_sock_err;
@ -262,6 +260,9 @@ snmp_set_state(struct snmp_proto *p, enum snmp_proto_state state)
p->sock->tx_hook = snmp_tx; p->sock->tx_hook = snmp_tx;
snmp_register_mibs(p); snmp_register_mibs(p);
// TODO timer for CONN
return PS_START; return PS_START;
case SNMP_CONN: case SNMP_CONN:

1
proto/snmp/snmp.h
View File

@ -136,6 +136,7 @@ struct snmp_proto {
struct mib_tree *mib_tree; struct mib_tree *mib_tree;
int verbose; int verbose;
uint pings;
u32 ignore_ping_id; u32 ignore_ping_id;
}; };

16
proto/snmp/subagent.c
View File

@ -781,13 +781,21 @@ parse_response(struct snmp_proto *p, byte *res)
uint pkt_size = LOAD_U32(h->payload); uint pkt_size = LOAD_U32(h->payload);
if (p->ignore_ping_id && LOAD_U32(h->packet_id) == p->ignore_ping_id)
{
p->pings--;
p->ignore_ping_id = 0;
}
/* Number of agentx-Ping-PDU without response */
if (p->pings > 5)
snmp_reset(p);
switch (r->error) switch (r->error)
{ {
case AGENTX_RES_NO_ERROR: case AGENTX_RES_NO_ERROR:
if (p->verbose || LOAD_U32(h->packet_id) != p->ignore_ping_id) if (p->verbose || LOAD_U32(h->packet_id) != p->ignore_ping_id)
TRACE(D_PACKETS, "SNMP received agentx-Response-PDU"); TRACE(D_PACKETS, "SNMP received agentx-Response-PDU");
if (LOAD_U32(h->packet_id) == p->ignore_ping_id)
p->ignore_ping_id = 0;
do_response(p, res); do_response(p, res);
break; break;
@ -796,8 +804,6 @@ parse_response(struct snmp_proto *p, byte *res)
case AGENTX_RES_REQUEST_DENIED: case AGENTX_RES_REQUEST_DENIED:
case AGENTX_RES_UNKNOWN_REGISTER: case AGENTX_RES_UNKNOWN_REGISTER:
TRACE(D_PACKETS, "SNMP received agentx-Response-PDU with error %u", r->error); TRACE(D_PACKETS, "SNMP received agentx-Response-PDU with error %u", r->error);
if (LOAD_U32(h->packet_id) == p->ignore_ping_id)
p->ignore_ping_id = 0;
snmp_register_ack(p, r); snmp_register_ack(p, r);
break; break;
@ -1361,6 +1367,8 @@ snmp_ping(struct snmp_proto *p)
/* sending only header */ /* sending only header */
uint s = update_packet_size(h, (byte *) h + AGENTX_HEADER_SIZE); uint s = update_packet_size(h, (byte *) h + AGENTX_HEADER_SIZE);
if (p->packet_id)
p->pings++;
sk_send(sk, s); sk_send(sk, s);
} }