mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-03-21 22:07:03 +00:00
Code Releases Activity

SNMP: Refactoring - Comments, Logging

Browse Source
This commit is contained in:
Vojtech Vilimek 2023-10-18 18:06:24 +02:00
parent 7b79f55ae9
commit 728e968ba7
7 changed files with 203 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
proto/snmp/bgp_mib.c
View File

@ -166,7 +166,7 @@ snmp_bgp_notify_backward_trans(struct snmp_proto *p, struct bgp_proto *bgp)
void void
snmp_bgp_register(struct snmp_proto *p) snmp_bgp_register(struct snmp_proto *p)
{ {
snmp_log("snmp_bgp_register()"); //snmp_log("snmp_bgp_register()");
//u32 bgp_mib_prefix[] = {1, 15, 1}; //u32 bgp_mib_prefix[] = {1, 15, 1};
u32 bgp_mib_prefix[] = { 1, 15 }; u32 bgp_mib_prefix[] = { 1, 15 };
@ -568,7 +568,7 @@ oid_state_compare(const struct oid *oid, u8 state)
static struct oid * static struct oid *
update_bgp_oid(struct oid *oid, u8 state) update_bgp_oid(struct oid *oid, u8 state)
{ {
snmp_log("update_bgp_oid()"); //snmp_log("update_bgp_oid()");
if (state == BGP_INTERNAL_END || state == BGP_INTERNAL_INVALID || if (state == BGP_INTERNAL_END || state == BGP_INTERNAL_INVALID ||
state == BGP_INTERNAL_NO_VALUE) state == BGP_INTERNAL_NO_VALUE)
return oid; return oid;
@ -589,7 +589,7 @@ update_bgp_oid(struct oid *oid, u8 state)
return oid; return oid;
} }
snmp_log("update work"); //snmp_log("update work");
switch (state) switch (state)
{ {
case BGP_INTERNAL_BGP: case BGP_INTERNAL_BGP:
@ -730,7 +730,7 @@ bgp_find_dynamic_oid(struct snmp_proto *p, struct oid *o_start, const struct oid
ASSUME(o_start != NULL); ASSUME(o_start != NULL);
ASSUME(o_end != NULL); ASSUME(o_end != NULL);
snmp_log("bgp_find_dynamic_oid()"); //snmp_log("bgp_find_dynamic_oid()");
ip4_addr ip4 = ip4_from_oid(o_start); ip4_addr ip4 = ip4_from_oid(o_start);
ip4_addr dest; ip4_addr dest;
@ -746,22 +746,22 @@ bgp_find_dynamic_oid(struct snmp_proto *p, struct oid *o_start, const struct oid
ip4_from_u32(UINT32_MAX); ip4_from_u32(UINT32_MAX);
} }
snmp_log("ip addresses build (ip4) %I (dest) %I", ipa_from_ip4(ip4), ipa_from_ip4(dest)); //snmp_log("ip addresses build (ip4) %I (dest) %I", ipa_from_ip4(ip4), ipa_from_ip4(dest));
net_addr net; net_addr net;
net_fill_ip4(&net, ip4, IP4_MAX_PREFIX_LENGTH); net_fill_ip4(&net, ip4, IP4_MAX_PREFIX_LENGTH);
snmp_log("dynamic part of BGP mib"); //snmp_log("dynamic part of BGP mib");
struct f_trie_walk_state ws; struct f_trie_walk_state ws;
trie_walk_init(&ws, p->bgp_trie, NULL, 0); trie_walk_init(&ws, p->bgp_trie, NULL, 0);
snmp_log("walk init"); //snmp_log("walk init");
if (trie_walk_next(&ws, &net)) if (trie_walk_next(&ws, &net))
{ {
snmp_log("trie_walk_next() returned true"); //snmp_log("trie_walk_next() returned true");
/* /*
* If the o_end is empty, then there are no conditions on the ip4 address. * If the o_end is empty, then there are no conditions on the ip4 address.
@ -769,7 +769,7 @@ bgp_find_dynamic_oid(struct snmp_proto *p, struct oid *o_start, const struct oid
int cmp = ip4_compare(net4_prefix(&net), dest); int cmp = ip4_compare(net4_prefix(&net), dest);
if (cmp < 0 || (cmp == 0 && snmp_is_oid_empty(o_end))) if (cmp < 0 || (cmp == 0 && snmp_is_oid_empty(o_end)))
{ {
snmp_log("ip4_less() returned true"); //snmp_log("ip4_less() returned true");
// TODO repair // TODO repair
struct oid *o = snmp_oid_duplicate(p->pool, o_start); struct oid *o = snmp_oid_duplicate(p->pool, o_start);
@ -778,39 +778,37 @@ bgp_find_dynamic_oid(struct snmp_proto *p, struct oid *o_start, const struct oid
return o; return o;
} }
else else
snmp_log("ip4_less() returned false for %I >= %I", net4_prefix(&net), dest); {}//snmp_log("ip4_less() returned false for %I >= %I", net4_prefix(&net), dest);
} }
else else
snmp_log("trie_walk_next() returned false, cleaning"); {}//snmp_log("trie_walk_next() returned false, cleaning");
return NULL; return NULL;
} }
static struct oid * static struct oid *
search_bgp_dynamic(struct snmp_proto *p, struct oid *o_start, struct oid *o_end, uint contid search_bgp_dynamic(struct snmp_proto *p, struct oid *o_start, struct oid *o_end, uint contid
UNUSED, u8 current_state) UNUSED, u8 next_state)
{ {
snmp_log("search_bgp_dynamic() dynamic part Yaaay!"); //snmp_log("search_bgp_dynamic() dynamic part Yaaay!");
/* TODO can be remove after implementing all BGP4-MIB::bgpPeerTable columns */
u8 next_state = current_state;
struct oid *o_copy = o_start; struct oid *o_copy = o_start;
do do
{ {
snmp_log("do-while state %u", next_state); //snmp_log("do-while state %u", next_state);
snmp_oid_dump(o_start); //snmp_oid_dump(o_start);
o_start = o_copy = update_bgp_oid(o_copy, next_state); o_start = o_copy = update_bgp_oid(o_copy, next_state);
o_start = bgp_find_dynamic_oid(p, o_start, o_end, next_state); o_start = bgp_find_dynamic_oid(p, o_start, o_end, next_state);
snmp_log("found"); //snmp_log("found");
snmp_oid_dump(o_start); //snmp_oid_dump(o_start);
next_state = snmp_bgp_next_state(next_state); next_state = snmp_bgp_next_state(next_state);
/* The search in next state is done from beginning. */ /* The search in next state is done from beginning. */
o_start->ids[5] = o_start->ids[6] = o_start->ids[7] = o_start->ids[8] = 0; o_start->ids[5] = o_start->ids[6] = o_start->ids[7] = o_start->ids[8] = 0;
o_start->include = 1; o_start->include = 1;
snmp_log("looping"); //snmp_log("looping");
} while (o_start == NULL && next_state < BGP_INTERNAL_END); } while (o_start == NULL && next_state < BGP_INTERNAL_END);
return o_start; return o_start;
@ -835,7 +833,7 @@ snmp_bgp_find_next_oid(struct snmp_proto *p, struct oid *oid, uint UNUSED contid
int match = trie_walk_init(&ws, p->bgp_trie, &net, 1); int match = trie_walk_init(&ws, p->bgp_trie, &net, 1);
snmp_log("match %d include %u", match, oid->include); //snmp_log("match %d include %u", match, oid->include);
if (match && oid->include) if (match && oid->include)
{ {
oid->include = 0; oid->include = 0;
@ -845,14 +843,14 @@ snmp_bgp_find_next_oid(struct snmp_proto *p, struct oid *oid, uint UNUSED contid
/* We skip the first match as we should not include ip address in oid */ /* We skip the first match as we should not include ip address in oid */
if (match) if (match)
{ {
snmp_log("continue"); //snmp_log("continue");
trie_walk_next(&ws, &net); trie_walk_next(&ws, &net);
} }
if (trie_walk_next(&ws, &net)) if (trie_walk_next(&ws, &net))
{ {
snmp_oid_dump(oid); //snmp_oid_dump(oid);
snmp_log("setting up"); //snmp_log("setting up");
u32 res = ipa_to_u32(net_prefix(&net)); u32 res = ipa_to_u32(net_prefix(&net));
ASSUME(oid->n_subid == 9); ASSUME(oid->n_subid == 9);
@ -863,7 +861,7 @@ snmp_bgp_find_next_oid(struct snmp_proto *p, struct oid *oid, uint UNUSED contid
return 1; return 1;
} }
snmp_log("bad"); //snmp_log("bad");
return 0; return 0;
} }
@ -871,26 +869,26 @@ static enum snmp_search_res
snmp_bgp_search_dynamic(struct snmp_proto *p, struct oid **searched, const struct oid *o_end, uint UNUSED contid, u8 next_state) snmp_bgp_search_dynamic(struct snmp_proto *p, struct oid **searched, const struct oid *o_end, uint UNUSED contid, u8 next_state)
{ {
struct oid *oid = *searched; struct oid *oid = *searched;
snmp_log(" **searched = 0x%p *oid = 0x%p", searched, oid); //snmp_log(" **searched = 0x%p *oid = 0x%p", searched, oid);
snmp_oid_dump(*searched); //snmp_oid_dump(*searched);
snmp_oid_dump(oid); //snmp_oid_dump(oid);
u8 end_state = MIN(snmp_bgp_state(o_end), BGP_INTERNAL_PEER_TABLE_END); u8 end_state = MIN(snmp_bgp_state(o_end), BGP_INTERNAL_PEER_TABLE_END);
snmp_log("before assumption %s [%u] < %u INTERNAL_END", debug_bgp_states[end_state], end_state, BGP_INTERNAL_END); //snmp_log("before assumption %s [%u] < %u INTERNAL_END", debug_bgp_states[end_state], end_state, BGP_INTERNAL_END);
ASSUME(end_state <= BGP_INTERNAL_END); ASSUME(end_state <= BGP_INTERNAL_END);
snmp_log("before assupmtion oid 0x%p != NULL (0x0)", oid); //snmp_log("before assupmtion oid 0x%p != NULL (0x0)", oid);
ASSUME(oid != NULL); ASSUME(oid != NULL);
oid = update_bgp_oid(oid, next_state); oid = update_bgp_oid(oid, next_state);
snmp_log("update bgp oid to state %s [%d]", debug_bgp_states[next_state], next_state); //snmp_log("update bgp oid to state %s [%d]", debug_bgp_states[next_state], next_state);
snmp_oid_dump(*searched); //snmp_oid_dump(*searched);
snmp_oid_dump(oid); //snmp_oid_dump(oid);
int found; int found;
while (!(found = snmp_bgp_find_next_oid(p, oid, contid)) && next_state <= end_state) while (!(found = snmp_bgp_find_next_oid(p, oid, contid)) && next_state <= end_state)
{ {
snmp_log("loop"); //snmp_log("loop");
next_state = snmp_bgp_next_state(next_state); next_state = snmp_bgp_next_state(next_state);
if (next_state == BGP_INTERNAL_IDENTIFIER) if (next_state == BGP_INTERNAL_IDENTIFIER)
@ -915,7 +913,7 @@ snmp_bgp_search2(struct snmp_proto *p, struct oid **searched, const struct oid *
enum snmp_search_res r = SNMP_SEARCH_END_OF_VIEW; enum snmp_search_res r = SNMP_SEARCH_END_OF_VIEW;
u8 bgp_state = snmp_bgp_state(*searched); u8 bgp_state = snmp_bgp_state(*searched);
u8 state; u8 state;
snmp_log("snmp_bgp_search2() with state %s [%d]", debug_bgp_states[bgp_state], bgp_state); //snmp_log("snmp_bgp_search2() with state %s [%d]", debug_bgp_states[bgp_state], bgp_state);
if (bgp_state == BGP_INTERNAL_END) if (bgp_state == BGP_INTERNAL_END)
{ {
@ -936,7 +934,7 @@ snmp_bgp_search2(struct snmp_proto *p, struct oid **searched, const struct oid *
if (is_dynamic(state) && !is_dynamic(bgp_state)) if (is_dynamic(state) && !is_dynamic(bgp_state))
{ {
snmp_log("searching a dynamic successor of static state"); //snmp_log("searching a dynamic successor of static state");
for (uint i = 5; i < MIN(9, (*searched)->n_subid); i++) for (uint i = 5; i < MIN(9, (*searched)->n_subid); i++)
(*searched)->ids[i] = 0; (*searched)->ids[i] = 0;
r = snmp_bgp_search_dynamic(p, searched, o_end, contid, state); r = snmp_bgp_search_dynamic(p, searched, o_end, contid, state);
@ -946,7 +944,7 @@ snmp_bgp_search2(struct snmp_proto *p, struct oid **searched, const struct oid *
if (is_dynamic(bgp_state)) if (is_dynamic(bgp_state))
{ {
snmp_log("searching the dynamic states (peers)"); //snmp_log("searching the dynamic states (peers)");
r = snmp_bgp_search_dynamic(p, searched, o_end, contid, bgp_state); r = snmp_bgp_search_dynamic(p, searched, o_end, contid, bgp_state);
if (r != SNMP_SEARCH_END_OF_VIEW) if (r != SNMP_SEARCH_END_OF_VIEW)
@ -956,7 +954,7 @@ snmp_bgp_search2(struct snmp_proto *p, struct oid **searched, const struct oid *
state = snmp_bgp_next_state(bgp_state); state = snmp_bgp_next_state(bgp_state);
if (state <= BGP_INTERNAL_IDENTIFIER) if (state <= BGP_INTERNAL_IDENTIFIER)
{ {
snmp_log("returning the local identifier"); //snmp_log("returning the local identifier");
*searched = update_bgp_oid(*searched, state); *searched = update_bgp_oid(*searched, state);
return SNMP_SEARCH_OK; return SNMP_SEARCH_OK;
} }
@ -964,7 +962,7 @@ snmp_bgp_search2(struct snmp_proto *p, struct oid **searched, const struct oid *
// TODO add route table // TODO add route table
/* end not found */ /* end not found */
snmp_log("reached unguarded code, returning END_OF_VIEW"); //snmp_log("reached unguarded code, returning END_OF_VIEW");
return SNMP_SEARCH_END_OF_VIEW; return SNMP_SEARCH_END_OF_VIEW;
} }
@ -979,7 +977,7 @@ snmp_bgp_search(struct snmp_proto *p, struct oid *o_start, struct oid *o_end, ui
if (o_start->include && snmp_bgp_has_value(start_state) && if (o_start->include && snmp_bgp_has_value(start_state) &&
!is_dynamic(start_state) && o_start->n_subid == 3) !is_dynamic(start_state) && o_start->n_subid == 3)
{ {
snmp_log("snmp_bgp_search() first search element (due to include field) returned"); //snmp_log("snmp_bgp_search() first search element (due to include field) returned");
/* We disable including for next time searching. */ /* We disable including for next time searching. */
o_start->include = 0; o_start->include = 0;
return o_start; return o_start;
@ -987,7 +985,7 @@ snmp_bgp_search(struct snmp_proto *p, struct oid *o_start, struct oid *o_end, ui
else if (o_start->include && snmp_bgp_has_value(start_state) && else if (o_start->include && snmp_bgp_has_value(start_state) &&
is_dynamic(start_state)) is_dynamic(start_state))
{ {
snmp_log("snmp_bgp_search() first search element matched dynamic entry!"); //snmp_log("snmp_bgp_search() first search element matched dynamic entry!");
return search_bgp_dynamic(p, o_start, o_end, contid, start_state); return search_bgp_dynamic(p, o_start, o_end, contid, start_state);
} }
@ -998,7 +996,7 @@ snmp_bgp_search(struct snmp_proto *p, struct oid *o_start, struct oid *o_end, ui
if (!is_dynamic(next_state)) if (!is_dynamic(next_state))
{ {
o_start = update_bgp_oid(o_start, next_state); o_start = update_bgp_oid(o_start, next_state);
snmp_log("next state is also not dynamic"); //snmp_log("next state is also not dynamic");
return o_start; return o_start;
} }
@ -1026,7 +1024,7 @@ bgp_fill_dynamic(struct snmp_proto UNUSED *p, struct agentx_varbind *vb,
return pkt; return pkt;
} }
snmp_log(" -> ip addr %I", addr); //snmp_log(" -> ip addr %I", addr);
// TODO XXX deal with possible change of (remote) ip; BGP should restart and // TODO XXX deal with possible change of (remote) ip; BGP should restart and
// disappear // disappear
struct snmp_bgp_peer *pe = HASH_FIND(p->bgp_hash, SNMP_HASH, addr); struct snmp_bgp_peer *pe = HASH_FIND(p->bgp_hash, SNMP_HASH, addr);
@ -1040,7 +1038,7 @@ bgp_fill_dynamic(struct snmp_proto UNUSED *p, struct agentx_varbind *vb,
ipa_equal(addr, ((struct bgp_proto *) proto)->remote_ip)) ipa_equal(addr, ((struct bgp_proto *) proto)->remote_ip))
{ {
bgp_proto = (struct bgp_proto *) proto; bgp_proto = (struct bgp_proto *) proto;
snmp_log("bgp_dynamic_fill() using bgp_proto %p", bgp_proto); //snmp_log("bgp_dynamic_fill() using bgp_proto %p", bgp_proto);
} }
/* We did not found binded BGP protocol. */ /* We did not found binded BGP protocol. */
else else
@ -1223,12 +1221,13 @@ static byte *
bgp_fill_static(struct snmp_proto *p, struct agentx_varbind *vb, byte *pkt, uint size bgp_fill_static(struct snmp_proto *p, struct agentx_varbind *vb, byte *pkt, uint size
UNUSED, uint contid UNUSED, int byte_ord UNUSED, u8 state) UNUSED, uint contid UNUSED, int byte_ord UNUSED, u8 state)
{ {
snmp_log("snmp bgp_fill_static ()\n"); ASSUME((void *) pkt == (void *) vb);
snmp_log("bgp_fill_static: vb->type %u, ptk %02x", vb->type, *((u32 *) pkt)); //snmp_log("snmp bgp_fill_static ()\n");
//snmp_log("bgp_fill_static: vb->type %u, ptk %02x", vb->type, *((u32 *) pkt));
struct oid *oid = &vb->name; struct oid *oid = &vb->name;
snmp_oid_dump(oid); //snmp_oid_dump(oid);
snmp_log("bgp_fill_static"); //snmp_log("bgp_fill_static");
/* /*
* snmp_bgp_state() check only prefix. To be sure on OID equivalence we need to * snmp_bgp_state() check only prefix. To be sure on OID equivalence we need to
@ -1268,11 +1267,12 @@ UNUSED, uint contid UNUSED, int byte_ord UNUSED, u8 state)
#if 0 #if 0
snmp_log("bgp_fill_static: type %u packet %p", vb->type, pkt); snmp_log("bgp_fill_static: type %u packet %p", vb->type, pkt);
snmp_oid_dump(oid); //snmp_oid_dump(oid);
snmp_log("snmp ended with non empty pkt %u starting from %p to %p\n", pkt - /*snmp_log("snmp ended with non empty pkt %u starting from %p to %p\n", pkt -
temp, temp, pkt); temp, temp, pkt);
snmp_dump_packet(temp, pkt - temp); */
//snmp_dump_packet(temp, pkt - temp);
#endif #endif
return pkt; return pkt;
} }

17
proto/snmp/config.Y
View File

@ -90,7 +90,7 @@ snmp_context:
/* empty */ { /* empty */ {
if (!this_bond) if (!this_bond)
{ {
log(L_INFO "snmp_context no string alloc"); //log(L_INFO "snmp_context no string alloc");
this_bond = cfg_alloc(sizeof(struct snmp_bond)); this_bond = cfg_alloc(sizeof(struct snmp_bond));
} }
@ -99,7 +99,7 @@ snmp_context:
| CONTEXT DEFAULT { | CONTEXT DEFAULT {
if (!this_bond) if (!this_bond)
{ {
log(L_INFO "snmp_context CONTEXT DEFAULT alloc"); //log(L_INFO "snmp_context CONTEXT DEFAULT alloc");
this_bond = cfg_alloc(sizeof(struct snmp_bond)); this_bond = cfg_alloc(sizeof(struct snmp_bond));
} }
this_bond->context = NULL; this_bond->context = NULL;
@ -107,29 +107,30 @@ snmp_context:
| CONTEXT text { | CONTEXT text {
if(!this_bond) if(!this_bond)
{ {
log(L_INFO "snmp_context CONTEXT text alloc"); //log(L_INFO "snmp_context CONTEXT text alloc");
this_bond = cfg_alloc(sizeof(struct snmp_bond)); this_bond = cfg_alloc(sizeof(struct snmp_bond));
} }
this_bond->context = $2; this_bond->context = $2;
SNMP_CFG->contexts++; SNMP_CFG->contexts++;
log(L_INFO "storing context %s to bond at 0x%p", $2, this_bond); //log(L_INFO "storing context %s to bond at 0x%p", $2, this_bond);
} }
; ;
snmp_bgp_bond: BGP symbol snmp_context snmp_bgp_bond: BGP symbol snmp_context
{ {
/* the snmp_context rule sets the correct value of this_bond */ /* the snmp_context rule sets the correct value of this_bond */
log(L_INFO "this_bond (at 0x%p) has value %s", this_bond, /*log(L_INFO "this_bond (at 0x%p) has value %s", this_bond,
(this_bond->context) ? this_bond->context : "<no_val>"); (this_bond->context) ? this_bond->context : "<no_val>");
*/
if (!this_bond) if (!this_bond)
{ {
log(L_INFO "snmp_bgp_bond BGP symbol ... alloc"); //log(L_INFO "snmp_bgp_bond BGP symbol ... alloc");
this_bond = cfg_alloc(sizeof(struct snmp_bond)); this_bond = cfg_alloc(sizeof(struct snmp_bond));
log(L_INFO "Unexpedted alloc in snmp_bgp_bond rule"); //log(L_INFO "Unexpedted alloc in snmp_bgp_bond rule");
} }
else else
{ {
log(L_INFO, "working with this_bond (at 0x%p)", this_bond); //log(L_INFO, "working with this_bond (at 0x%p)", this_bond);
} }
this_bond->type = SNMP_BGP; this_bond->type = SNMP_BGP;

42
proto/snmp/snmp.c
View File

@ -106,14 +106,11 @@ snmp_init(struct proto_config *CF)
p->bgp_local_as = cf->bgp_local_as; p->bgp_local_as = cf->bgp_local_as;
p->bgp_local_id = cf->bgp_local_id; p->bgp_local_id = cf->bgp_local_id;
snmp_log("changing proto_snmp state to INIT"); snmp_log("changing state to INIT");
p->state = SNMP_INIT; p->state = SNMP_INIT;
p->timeout = cf->timeout; p->timeout = cf->timeout;
snmp_log("snmp_init() lip: %I:%u rip: %I:%u",
cf->local_ip, cf->local_port, cf->remote_ip, cf->remote_port);
/* used when assigning the context ids in s_cont_create() */ /* used when assigning the context ids in s_cont_create() */
p->context_max = 1; p->context_max = 1;
p->context_id_map = NULL; p->context_id_map = NULL;
@ -179,7 +176,7 @@ void
snmp_connected(sock *sk) snmp_connected(sock *sk)
{ {
struct snmp_proto *p = sk->data; struct snmp_proto *p = sk->data;
snmp_log("snmp_connected() connection created"); snmp_log("connection created");
p->state = SNMP_OPEN; p->state = SNMP_OPEN;
@ -203,9 +200,9 @@ snmp_reconnect(timer *tm)
} }
static void static void
snmp_sock_err(sock *sk, int err) snmp_sock_err(sock *sk, int UNUSED err)
{ {
snmp_log("snmp_sock_err() %s - err no: %d", strerror(err), err); snmp_log("socket error '%s' (errno: %d)", strerror(err), err);
struct snmp_proto *p = sk->data; struct snmp_proto *p = sk->data;
p->errs++; p->errs++;
@ -215,7 +212,7 @@ snmp_sock_err(sock *sk, int err)
rfree(p->sock); rfree(p->sock);
p->sock = NULL; p->sock = NULL;
snmp_log("changing proto_snmp state to LOCKED"); snmp_log("changing state to LOCKED");
p->state = SNMP_LOCKED; p->state = SNMP_LOCKED;
p->startup_timer->hook = snmp_startup_timeout; p->startup_timer->hook = snmp_startup_timeout;
@ -226,7 +223,7 @@ snmp_sock_err(sock *sk, int err)
static void static void
snmp_start_locked(struct object_lock *lock) snmp_start_locked(struct object_lock *lock)
{ {
snmp_log("snmp_start_locked() - lock acquired; preparing socket"); //snmp_log("snmp_start_locked() - lock acquired; preparing socket");
struct snmp_proto *p = lock->data; struct snmp_proto *p = lock->data;
p->state = SNMP_LOCKED; p->state = SNMP_LOCKED;
@ -256,6 +253,7 @@ snmp_start_locked(struct object_lock *lock)
p->errs = 0; p->errs = 0;
} }
snmp_log("opening socket");
if (sk_open(s) < 0) if (sk_open(s) < 0)
{ {
// TODO rather set the startup timer, then reset whole SNMP proto // TODO rather set the startup timer, then reset whole SNMP proto
@ -273,7 +271,6 @@ snmp_startup(struct snmp_proto *p)
p->state != SNMP_LOCKED && p->state != SNMP_LOCKED &&
p->state != SNMP_DOWN) p->state != SNMP_DOWN)
{ {
snmp_log("startup() already in connected state %u", p->state);
return; return;
} }
@ -283,11 +280,9 @@ snmp_startup(struct snmp_proto *p)
return; return;
} }
snmp_log("snmp_startup(), praparing lock"); snmp_log("preparing object lock");
p->state = SNMP_INIT; p->state = SNMP_INIT;
/* Starting AgentX communicaiton channel. */
struct object_lock *lock; struct object_lock *lock;
lock = p->lock = olock_new(p->pool); lock = p->lock = olock_new(p->pool);
@ -299,13 +294,7 @@ snmp_startup(struct snmp_proto *p)
lock->hook = snmp_start_locked; lock->hook = snmp_start_locked;
lock->data = p; lock->data = p;
snmp_log("lock acquiring");
olock_acquire(lock); olock_acquire(lock);
/*
snmp_log("local ip: %I:%u, remote ip: %I:%u",
p->local_ip, p->local_port, p->remote_ip, p->remote_port);
*/
} }
/* this function is internal and shouldn't be used outside the snmp module */ /* this function is internal and shouldn't be used outside the snmp module */
@ -343,7 +332,7 @@ snmp_ping_timeout(timer *tm)
static int static int
snmp_start(struct proto *P) snmp_start(struct proto *P)
{ {
snmp_log("snmp_start() - starting timer (almost)"); //snmp_log("snmp_start() - starting timer (almost)");
struct snmp_proto *p = (void *) P; struct snmp_proto *p = (void *) P;
struct snmp_config *cf = (struct snmp_config *) P->cf; struct snmp_config *cf = (struct snmp_config *) P->cf;
@ -368,7 +357,7 @@ snmp_start(struct proto *P)
/* We always have at least the default context */ /* We always have at least the default context */
p->context_id_map = mb_allocz(p->pool, cf->contexts * sizeof(struct snmp_context *)); p->context_id_map = mb_allocz(p->pool, cf->contexts * sizeof(struct snmp_context *));
log(L_INFO "number of context allocated %d", cf->contexts); //log(L_INFO "number of context allocated %d", cf->contexts);
struct snmp_context *defaultc = mb_alloc(p->pool, sizeof(struct snmp_context)); struct snmp_context *defaultc = mb_alloc(p->pool, sizeof(struct snmp_context));
defaultc->context = ""; defaultc->context = "";
@ -401,14 +390,14 @@ snmp_start(struct proto *P)
if (b->context) if (b->context)
{ {
const struct snmp_context *c = snmp_cont_create(p, b->context); const struct snmp_context *c = snmp_cont_create(p, b->context);
snmp_log("creating snmp context %s with id %u, writing", b->context, c->context_id); //snmp_log("creating snmp context %s with id %u, writing", b->context, c->context_id);
p->context_id_map[c->context_id] = c; p->context_id_map[c->context_id] = c;
peer->context_id = c->context_id; peer->context_id = c->context_id;
} }
} }
} }
snmp_log("values of context cf %u proto %u", cf->contexts, p->context_max); //snmp_log("values of context cf %u proto %u", cf->contexts, p->context_max);
ASSUME(cf->contexts == p->context_max); ASSUME(cf->contexts == p->context_max);
snmp_startup(p); snmp_startup(p);
@ -482,12 +471,14 @@ snmp_show_proto_info(struct proto *P)
cli_msg(-1006, " remote ip: %I4", bcf->remote_ip); cli_msg(-1006, " remote ip: %I4", bcf->remote_ip);
cli_msg(-1006, " local port: %I4", bcf->local_port); cli_msg(-1006, " local port: %I4", bcf->local_port);
cli_msg(-1006, " remote port: %I4", bcf->remote_port); cli_msg(-1006, " remote port: %I4", bcf->remote_port);
/* /*
if (conn) { if (conn) {
cli_msg(-1006, " state: %u", conn->state); cli_msg(-1006, " state: %u", conn->state);
cli_msg(-1006, " remote as: %u", conn->remote_caps->as4_number); cli_msg(-1006, " remote as: %u", conn->remote_caps->as4_number);
} }
*/ */
cli_msg(-1006, " in updates: %u", bp->stats.rx_updates); cli_msg(-1006, " in updates: %u", bp->stats.rx_updates);
cli_msg(-1006, " out updates: %u", bp->stats.tx_updates); cli_msg(-1006, " out updates: %u", bp->stats.tx_updates);
cli_msg(-1006, " in total: %u", bp->stats.rx_messages); cli_msg(-1006, " in total: %u", bp->stats.rx_messages);
@ -532,7 +523,6 @@ snmp_postconfig(struct proto_config *CF)
static int static int
snmp_shutdown(struct proto *P) snmp_shutdown(struct proto *P)
{ {
snmp_log("snmp_shutdown()");
struct snmp_proto *p = SKIP_BACK(struct snmp_proto, p, P); struct snmp_proto *p = SKIP_BACK(struct snmp_proto, p, P);
tm_stop(p->ping_timer); tm_stop(p->ping_timer);
@ -542,12 +532,10 @@ snmp_shutdown(struct proto *P)
p->state == SNMP_CONN) p->state == SNMP_CONN)
{ {
/* We have a connection established (at leased send out Open-PDU). */ /* We have a connection established (at leased send out Open-PDU). */
snmp_log("changing state to STOP");
p->state = SNMP_STOP; p->state = SNMP_STOP;
p->startup_timer->hook = snmp_stop_timeout; p->startup_timer->hook = snmp_stop_timeout;
tm_set(p->startup_timer, current_time() + p->timeout S); tm_set(p->startup_timer, current_time() + p->timeout S);
snmp_stop_subagent(p); snmp_stop_subagent(p);
return PS_STOP; return PS_STOP;

6
proto/snmp/snmp.h
View File

@ -120,15 +120,15 @@ struct snmp_context {
struct snmp_proto { struct snmp_proto {
struct proto p; struct proto p;
struct object_lock *lock; struct object_lock *lock;
pool *pool; /* a shortcut to the procotol mem. pool */ pool *pool; /* a shortcut to the procotol mem. pool */
linpool *lp; linpool *lp; /* linpool for bgp_trie nodes */
ip_addr local_ip; ip_addr local_ip;
ip_addr remote_ip; ip_addr remote_ip;
u16 local_port; u16 local_port;
u16 remote_port; u16 remote_port;
ip_addr bgp_local_id; /* BGP4-MIB related fields */ ip_addr bgp_local_id; /* BGP4-MIB related fields */
u32 bgp_local_as; u32 bgp_local_as;
sock *sock; sock *sock;

35
proto/snmp/snmp_utils.c
View File

@ -33,8 +33,9 @@ snmp_is_oid_empty(const struct oid *oid)
uint uint
snmp_pkt_len(const byte *start, const byte *end) snmp_pkt_len(const byte *start, const byte *end)
{ {
snmp_log("snmp_pkt_len start 0x%p end 0x%p res %u", start, end, (end - start) /*snmp_log("snmp_pkt_len start 0x%p end 0x%p res %u", start, end, (end - start)
- AGENTX_HEADER_SIZE); - AGENTX_HEADER_SIZE);
*/
return (end - start) - AGENTX_HEADER_SIZE; return (end - start) - AGENTX_HEADER_SIZE;
} }
@ -304,7 +305,7 @@ snmp_put_oid(byte *buf, struct oid *oid)
byte * byte *
snmp_put_fbyte(byte *buf, u8 data) snmp_put_fbyte(byte *buf, u8 data)
{ {
// log(L_INFO "paste_fbyte()"); //log(L_INFO "paste_fbyte()");
put_u8(buf, data); put_u8(buf, data);
put_u24(++buf, 0); // PADDING put_u24(++buf, 0); // PADDING
return buf + 3; return buf + 3;
@ -320,7 +321,8 @@ snmp_oid_ip4_index(struct oid *o, uint start, ip4_addr addr)
STORE_U32(o->ids[start + 3], temp & 0xFF); STORE_U32(o->ids[start + 3], temp & 0xFF);
} }
void snmp_oid_dump(const struct oid *oid) void UNUSED
snmp_oid_dump(const struct oid *oid)
{ {
log(L_WARN "OID DUMP ========"); log(L_WARN "OID DUMP ========");
@ -441,17 +443,19 @@ snmp_register_same(struct snmp_register *r, struct agentx_header *h, u8 class)
void void
snmp_register_ack(struct snmp_proto *p, struct agentx_header *h, u8 class) snmp_register_ack(struct snmp_proto *p, struct agentx_header *h, u8 class)
{ {
snmp_log("snmp_register_ack()"); //snmp_log("snmp_register_ack()");
snmp_log("got sid: %u tid: %u pid: %u", h->session_id, h->transaction_id, /*snmp_log("got sid: %u tid: %u pid: %u", h->session_id, h->transaction_id,
h->packet_id); h->packet_id);
*/
struct snmp_register *reg; struct snmp_register *reg;
WALK_LIST(reg, p->register_queue) WALK_LIST(reg, p->register_queue)
{ {
// TODO add support for more mib trees (other than BGP) // TODO add support for more mib trees (other than BGP)
snmp_log("checking registration request sid: %u tid: %u pid: %u", /*snmp_log("checking registration request sid: %u tid: %u pid: %u",
reg->session_id, reg->transaction_id, reg->packet_id); reg->session_id, reg->transaction_id, reg->packet_id);
*/
if (snmp_register_same(reg, h, class)) if (snmp_register_same(reg, h, class))
{ {
struct snmp_registered_oid *ro = \ struct snmp_registered_oid *ro = \
@ -467,16 +471,16 @@ h->packet_id);
add_tail(&p->bgp_registered, &ro->n); add_tail(&p->bgp_registered, &ro->n);
snmp_log(" register note find %u", list_length(&p->bgp_registered)); //snmp_log(" register note find %u", list_length(&p->bgp_registered));
return; return;
} }
} }
snmp_log("unknown registration"); //snmp_log("unknown registration");
} }
void void UNUSED
snmp_dump_packet(byte *pkt, uint size) snmp_dump_packet(byte UNUSED *pkt, uint size)
{ {
snmp_log("dump"); snmp_log("dump");
for (uint i = 0; i < size; i += 4) for (uint i = 0; i < size; i += 4)
@ -519,13 +523,13 @@ snmp_varbind_type32(struct agentx_varbind *vb, uint size, enum agentx_type type,
if (size < (uint) agentx_type_size(type)) if (size < (uint) agentx_type_size(type))
{ {
snmp_log("varbind type32 returned NULL"); //snmp_log("varbind type32 returned NULL");
return NULL; return NULL;
} }
vb->type = type; vb->type = type;
u32 *data = SNMP_VB_DATA(vb); u32 *data = SNMP_VB_DATA(vb);
snmp_log("varbind type32 vb data 0x%p (from vb 0x%p)", data, (void *) vb); //snmp_log("varbind type32 vb data 0x%p (from vb 0x%p)", data, (void *) vb);
*data = val; *data = val;
return (byte *)(data + 1); return (byte *)(data + 1);
} }
@ -561,13 +565,14 @@ snmp_varbind_ip4(struct agentx_varbind *vb, uint size, ip4_addr addr)
{ {
if (size < snmp_str_size_from_len(4)) if (size < snmp_str_size_from_len(4))
{ {
snmp_log("varbind ip4 NULL"); //snmp_log("varbind ip4 NULL");
return NULL; return NULL;
} }
vb->type = AGENTX_IP_ADDRESS; vb->type = AGENTX_IP_ADDRESS;
snmp_log("snmp_varbind_ip4 vb data 0x%p (from vb 0x%p)", SNMP_VB_DATA(vb), (void /*snmp_log("snmp_varbind_ip4 vb data 0x%p (from vb 0x%p)", SNMP_VB_DATA(vb), (void
*) vb); *) vb);
*/
return snmp_put_ip4(SNMP_VB_DATA(vb), addr); return snmp_put_ip4(SNMP_VB_DATA(vb), addr);
} }
@ -576,7 +581,7 @@ snmp_varbind_nstr(struct agentx_varbind *vb, uint size, const char *str, uint le
{ {
if (size < snmp_str_size_from_len(len)) if (size < snmp_str_size_from_len(len))
{ {
snmp_log("varbind nstr NULL"); //snmp_log("varbind nstr NULL");
return NULL; return NULL;
} }

200
proto/snmp/subagent.c
View File

@ -31,7 +31,6 @@ static void snmp_mib_fill2(struct snmp_proto *p, struct oid *oid, struct snmp_pd
static uint parse_response(struct snmp_proto *p, byte *buf, uint size); static uint parse_response(struct snmp_proto *p, byte *buf, uint size);
static void do_response(struct snmp_proto *p, byte *buf, uint size); static void do_response(struct snmp_proto *p, byte *buf, uint size);
static uint parse_gets2_pdu(struct snmp_proto *p, byte *buf, uint size, uint *skip); static uint parse_gets2_pdu(struct snmp_proto *p, byte *buf, uint size, uint *skip);
static uint parse_close_pdu(struct snmp_proto *p, byte *buf, uint size);
static struct agentx_response *prepare_response(struct snmp_proto *p, struct snmp_pdu *c); static struct agentx_response *prepare_response(struct snmp_proto *p, struct snmp_pdu *c);
static void response_err_ind(struct agentx_response *res, uint err, uint ind); static void response_err_ind(struct agentx_response *res, uint err, uint ind);
static uint update_packet_size(struct snmp_proto *p, const byte *start, byte *end); static uint update_packet_size(struct snmp_proto *p, const byte *start, byte *end);
@ -86,15 +85,14 @@ open_pdu(struct snmp_proto *p, struct oid *oid)
struct snmp_pdu c = SNMP_PDU_CONTEXT(sk); struct snmp_pdu c = SNMP_PDU_CONTEXT(sk);
byte *buf = c.buffer; byte *buf = c.buffer;
/* +4 for timeout (1B with 4B alignment) */ #define TIMEOUT_SIZE 4 /* 1B timeout, 3B zero padding */
if (c.size < AGENTX_HEADER_SIZE + 4 + snmp_oid_size(oid) + if (c.size < AGENTX_HEADER_SIZE + TIMEOUT_SIZE + snmp_oid_size(oid) +
+ snmp_str_size(cf->description)) + snmp_str_size(cf->description))
{ {
snmp_manage_tbuf(p, &c); snmp_manage_tbuf(p, &c);
buf = c.buffer; buf = c.buffer;
} }
/* Function open_pdu() does not generate agentx_pkt. */
struct agentx_header *h = (struct agentx_header *) c.buffer; struct agentx_header *h = (struct agentx_header *) c.buffer;
ADVANCE(c.buffer, c.size, AGENTX_HEADER_SIZE); ADVANCE(c.buffer, c.size, AGENTX_HEADER_SIZE);
SNMP_BLANK_HEADER(h, AGENTX_OPEN_PDU); SNMP_BLANK_HEADER(h, AGENTX_OPEN_PDU);
@ -117,6 +115,7 @@ open_pdu(struct snmp_proto *p, struct oid *oid)
snmp_log("sk_send sleep"); snmp_log("sk_send sleep");
else else
snmp_log("sk_send error"); snmp_log("sk_send error");
#undef TIMEOUT_SIZE
} }
void void
@ -209,7 +208,7 @@ de_allocate_pdu(struct snmp_proto *p, struct oid *oid, u8 type)
if (size > AGENTX_HEADER_SIZE + ) if (size > AGENTX_HEADER_SIZE + )
{ {
snmp_log("de_allocate_pdu()"); //snmp_log("de_allocate_pdu()");
struct agentx_header *h; struct agentx_header *h;
SNMP_CREATE(pkt, struct agentx_header, h); SNMP_CREATE(pkt, struct agentx_header, h);
@ -222,7 +221,7 @@ de_allocate_pdu(struct snmp_proto *p, struct oid *oid, u8 type)
} }
else else
snmp_log("de_allocate_pdu(): insufficient size"); {}//snmp_log("de_allocate_pdu(): insufficient size");
} }
*/ */
@ -247,12 +246,12 @@ un_register_pdu(struct snmp_proto *p, struct oid *oid, uint len, uint index, u8
if (c.size < sz) if (c.size < sz)
{ {
snmp_log("un_register_pdu() insufficient size"); //snmp_log("un_register_pdu() insufficient size");
snmp_manage_tbuf(p, &c); snmp_manage_tbuf(p, &c);
buf = c.buffer; buf = c.buffer;
} }
snmp_log("un_register_pdu()"); //snmp_log("un_register_pdu()");
struct agentx_header *h = (struct agentx_header *) c.buffer; struct agentx_header *h = (struct agentx_header *) c.buffer;
ADVANCE(c.buffer, c.size, AGENTX_HEADER_SIZE); ADVANCE(c.buffer, c.size, AGENTX_HEADER_SIZE);
@ -261,9 +260,10 @@ un_register_pdu(struct snmp_proto *p, struct oid *oid, uint len, uint index, u8
SNMP_SESSION(h, p); SNMP_SESSION(h, p);
c.byte_ord = h->flags & AGENTX_NETWORK_BYTE_ORDER; c.byte_ord = h->flags & AGENTX_NETWORK_BYTE_ORDER;
/*
log("un_register_pdu contid %u s_cont (at 0x%p) %s", contid, sc, (sc && log("un_register_pdu contid %u s_cont (at 0x%p) %s", contid, sc, (sc &&
sc->context) ? sc->context : "<not_avail>"); sc->context) ? sc->context : "<not_avail>");
*/
SNMP_NON_DEFAULT_CONTEXT(h, c, contid); SNMP_NON_DEFAULT_CONTEXT(h, c, contid);
struct agentx_un_register_hdr *ur = (struct agentx_un_register_hdr *) c.buffer; struct agentx_un_register_hdr *ur = (struct agentx_un_register_hdr *) c.buffer;
@ -288,7 +288,7 @@ un_register_pdu(struct snmp_proto *p, struct oid *oid, uint len, uint index, u8
uint s = update_packet_size(p, buf, c.buffer); uint s = update_packet_size(p, buf, c.buffer);
snmp_log("sending (un)register %s", snmp_pkt_type[type]); //snmp_log("sending (un)register %s", snmp_pkt_type[type]);
int ret = sk_send(sk, s); int ret = sk_send(sk, s);
if (ret > 0) if (ret > 0)
snmp_log("sk_send OK!"); snmp_log("sk_send OK!");
@ -319,8 +319,9 @@ close_pdu(struct snmp_proto *p, u8 reason)
struct snmp_pdu c = SNMP_PDU_CONTEXT(sk); struct snmp_pdu c = SNMP_PDU_CONTEXT(sk);
byte *buf = c.buffer; byte *buf = c.buffer;
snmp_log("close_pdu() size: %u %c %u", c.size, (c.size > AGENTX_HEADER_SIZE + 4) /*snmp_log("close_pdu() size: %u %c %u", c.size, (c.size > AGENTX_HEADER_SIZE + 4)
? '>':'<', AGENTX_HEADER_SIZE); ? '>':'<', AGENTX_HEADER_SIZE);
*/
/* +4B for reason */ /* +4B for reason */
if (c.size < AGENTX_HEADER_SIZE + 4) if (c.size < AGENTX_HEADER_SIZE + 4)
@ -341,7 +342,7 @@ close_pdu(struct snmp_proto *p, u8 reason)
uint s = update_packet_size(p, buf, c.buffer); uint s = update_packet_size(p, buf, c.buffer);
snmp_log("preparing to sk_send() (close)"); //snmp_log("preparing to sk_send() (close)");
int ret = sk_send(sk, s); int ret = sk_send(sk, s);
if (ret > 0) if (ret > 0)
snmp_log("sk_send OK!"); snmp_log("sk_send OK!");
@ -360,13 +361,13 @@ addagentcaps_pdu(struct snmp_proto *p, struct oid *cap, char *descr,
sock *sk = p->sock; sock *sk = p->sock;
//byte *buf = sk->tbuf; //byte *buf = sk->tbuf;
//uint size = sk->tbsize; //uint size = sk->tbsize;
// TODO rename to pkt and add pkt_start // TO-DO rename to pkt and add pkt_start
byte *buf = sk->tpos; byte *buf = sk->tpos;
uint size = sk->tbuf + sk->tbsize - sk->tpos; uint size = sk->tbuf + sk->tbsize - sk->tpos;
if (size < AGENTX_HEADER_SIZE + snmp_context_size(c) + snmp_oid_size(cap) + snmp_str_size_from_len(descr_len)) if (size < AGENTX_HEADER_SIZE + snmp_context_size(c) + snmp_oid_size(cap) + snmp_str_size_from_len(descr_len))
{ {
/* TODO need more mem */ /* TO-DO need more mem */
return; return;
} }
@ -409,13 +410,13 @@ removeagentcaps_pdu(struct snmp_proto *p, struct oid *cap, struct agentx_context
//byte *buf = sk->tbuf; //byte *buf = sk->tbuf;
//uint size = sk->tbsize; //uint size = sk->tbsize;
// TODO rename to pkt and add pkt_start // TO-DO rename to pkt and add pkt_start
byte *buf = sk->tpos; byte *buf = sk->tpos;
uint size = sk->tbuf + sk->tbsize - sk->tpos; uint size = sk->tbuf + sk->tbsize - sk->tpos;
if (size < AGENTX_HEADER_SIZE + snmp_context_size(c) + snmp_oid_size(cap)) if (size < AGENTX_HEADER_SIZE + snmp_context_size(c) + snmp_oid_size(cap))
{ {
/* TODO need more mem */ /* TO-DO need more mem */
return; return;
} }
@ -463,13 +464,12 @@ refresh_ids(struct snmp_proto *p, struct agentx_header *h)
* @size: number of packet bytes in buffer * @size: number of packet bytes in buffer
* retval number of byte parsed * retval number of byte parsed
* *
* function parse_pkt() parses response-pdu and calls do_response(). * Returns number of bytes parsed from RX-buffer.
* returns number of bytes parsed by function excluding size of header.
*/ */
static uint static uint
parse_pkt(struct snmp_proto *p, byte *pkt, uint size, uint *skip) parse_pkt(struct snmp_proto *p, byte *pkt, uint size, uint *skip)
{ {
snmp_log("parse_pkt() pkt start: %p", pkt); //snmp_log("parse_pkt() pkt start: %p", pkt);
if (size < AGENTX_HEADER_SIZE) if (size < AGENTX_HEADER_SIZE)
return 0; return 0;
@ -477,13 +477,13 @@ parse_pkt(struct snmp_proto *p, byte *pkt, uint size, uint *skip)
uint parsed_len = 0; uint parsed_len = 0;
struct agentx_header *h = (void *) pkt; struct agentx_header *h = (void *) pkt;
snmp_log("parse_pkt got type %s (%d)", snmp_pkt_type[h->type], h->type); //snmp_log("parse_pkt got type %s (%d)", snmp_pkt_type[h->type], h->type);
snmp_log("parse_pkt rx size %u", size); //snmp_log("parse_pkt rx size %u", size);
snmp_dump_packet((void *)h, MIN(h->payload, 256)); //snmp_dump_packet((void *)h, MIN(h->payload, 256));
switch (h->type) switch (h->type)
{ {
case AGENTX_RESPONSE_PDU: case AGENTX_RESPONSE_PDU:
snmp_log("parse_pkt returning parse_response"); //snmp_log("parse_pkt returning parse_response");
parsed_len = parse_response(p, pkt, size); parsed_len = parse_response(p, pkt, size);
break; break;
@ -503,20 +503,20 @@ parse_pkt(struct snmp_proto *p, byte *pkt, uint size, uint *skip)
break; break;
*/ */
/* should not happen */
default: default:
snmp_log("unknown packet type %u", h->type); /* drop the packet with unknown type silently */
//snmp_log("unknown packet type %u", h->type);
return 0; return 0;
} }
snmp_log("parse_pkt returning parsed length"); //snmp_log("parse_pkt returning parsed length");
return parsed_len; return parsed_len;
} }
static uint static uint
parse_response(struct snmp_proto *p, byte *res, uint size) parse_response(struct snmp_proto *p, byte *res, uint size)
{ {
snmp_log("parse_response() g%u h%u", size, sizeof(struct agentx_header)); //snmp_log("parse_response() g%u h%u", size, sizeof(struct agentx_header));
if (size < sizeof(struct agentx_response)) if (size < sizeof(struct agentx_response))
return 0; return 0;
@ -527,26 +527,29 @@ parse_response(struct snmp_proto *p, byte *res, uint size)
int byte_ord = h->flags & AGENTX_NETWORK_BYTE_ORDER; int byte_ord = h->flags & AGENTX_NETWORK_BYTE_ORDER;
uint pkt_size = LOAD_U32(h->payload, byte_ord); uint pkt_size = LOAD_U32(h->payload, byte_ord);
snmp_log("p_res pkt_size %u", pkt_size); //snmp_log("p_res pkt_size %u", pkt_size);
if (size < pkt_size + AGENTX_HEADER_SIZE) if (size < pkt_size + AGENTX_HEADER_SIZE)
{ {
snmp_log("parse_response early return"); //snmp_log("parse_response early return");
return 0; return 0;
} }
snmp_log(" endianity: %s, session %u, transaction: %u", /*snmp_log(" endianity: %s, session %u, transaction: %u",
(h->flags & AGENTX_NETWORK_BYTE_ORDER) ? "big end": "little end", (h->flags & AGENTX_NETWORK_BYTE_ORDER) ? "big end": "little end",
h->session_id, h->transaction_id); h->session_id, h->transaction_id);
snmp_log(" sid: %3u\ttid: %3u\tpid: %3u", p->session_id, p->transaction_id, */
/*snmp_log(" sid: %3u\ttid: %3u\tpid: %3u", p->session_id, p->transaction_id,
p->packet_id); p->packet_id);
*/
//snmp_log(" pkt size %u", h->payload);
snmp_log(" pkt size %u", h->payload); //snmp_log(" pkt size %u", h->payload);
if (r->error == AGENTX_RES_NO_ERROR) if (r->error == AGENTX_RES_NO_ERROR)
do_response(p, res, size); do_response(p, res, size);
else else
/* erronous packet should be dropped quietly */ /* erronous packet should be dropped quietly */
snmp_log("an error occured '%s'", snmp_errs[get_u16(&r->error) - SNMP_ERR_SHIFT]); {}//snmp_log("an error occured '%s'", snmp_errs[get_u16(&r->error) - SNMP_ERR_SHIFT]);
return pkt_size + AGENTX_HEADER_SIZE; return pkt_size + AGENTX_HEADER_SIZE;
} }
@ -554,17 +557,18 @@ parse_response(struct snmp_proto *p, byte *res, uint size)
static void static void
snmp_register_mibs(struct snmp_proto *p) snmp_register_mibs(struct snmp_proto *p)
{ {
snmp_log("snmp_register_mibs()"); //snmp_log("snmp_register_mibs()");
snmp_bgp_register(p); snmp_bgp_register(p);
/* snmp_ospf_regsiter(p); ... */
snmp_log("registering all done"); //snmp_log("registering all done");
} }
static void static void
do_response(struct snmp_proto *p, byte *buf, uint size) do_response(struct snmp_proto *p, byte *buf, uint size)
{ {
snmp_log("do_response()"); //snmp_log("do_response()");
struct agentx_response *r = (void *) buf; struct agentx_response *r = (void *) buf;
struct agentx_header *h = &r->h; struct agentx_header *h = &r->h;
int byte_ord = h->flags & AGENTX_NETWORK_BYTE_ORDER; int byte_ord = h->flags & AGENTX_NETWORK_BYTE_ORDER;
@ -588,11 +592,11 @@ do_response(struct snmp_proto *p, byte *buf, uint size)
snmp_log("changing state to REGISTER"); snmp_log("changing state to REGISTER");
p->state = SNMP_REGISTER; p->state = SNMP_REGISTER;
snmp_register_mibs(p); snmp_register_mibs(p);
snmp_log("do_response state SNMP_INIT register list %u", list_length(&p->register_queue)); //snmp_log("do_response state SNMP_INIT register list %u", list_length(&p->register_queue));
break; break;
case SNMP_REGISTER: case SNMP_REGISTER:;
snmp_log("do_response state SNMP_REGISTER register list %u", list_length(&p->register_queue)); //snmp_log("do_response state SNMP_REGISTER register list %u", list_length(&p->register_queue));
byte *pkt = buf; byte *pkt = buf;
ADVANCE(pkt, size, AGENTX_HEADER_SIZE); ADVANCE(pkt, size, AGENTX_HEADER_SIZE);
@ -611,7 +615,7 @@ do_response(struct snmp_proto *p, byte *buf, uint size)
if (p->register_to_ack == 0) if (p->register_to_ack == 0)
{ {
snmp_log("changing proto_snmp state to CONNECTED"); snmp_log("changing state to CONNECTED");
p->state = SNMP_CONN; p->state = SNMP_CONN;
proto_notify_state(&p->p, PS_UP); proto_notify_state(&p->p, PS_UP);
} }
@ -650,11 +654,11 @@ static int
snmp_get_next2(struct snmp_proto *p, struct oid *o_start, struct oid *o_end, snmp_get_next2(struct snmp_proto *p, struct oid *o_start, struct oid *o_end,
struct snmp_pdu *c) struct snmp_pdu *c)
{ {
snmp_log("get_next2()"); //snmp_log("get_next2()");
enum snmp_search_res r; enum snmp_search_res r;
snmp_log("next2() o_end %p", o_end); //snmp_log("next2() o_end %p", o_end);
struct oid *o_copy = search_mib(p, o_start, o_end, NULL, c, &r); struct oid *o_copy = search_mib(p, o_start, o_end, NULL, c, &r);
snmp_log("next2()2 o_end %p", o_end); //snmp_log("next2()2 o_end %p", o_end);
struct agentx_varbind *vb = NULL; struct agentx_varbind *vb = NULL;
switch (r) switch (r)
@ -774,9 +778,7 @@ snmp_get_bulk2(struct snmp_proto *p, struct oid *o_start, struct oid *o_end,
static inline uint static inline uint
update_packet_size(struct snmp_proto *p, const byte *start, byte *end) update_packet_size(struct snmp_proto *p, const byte *start, byte *end)
{ {
/* work even for partial messages */
struct agentx_header *h = (void *) p->sock->tpos; struct agentx_header *h = (void *) p->sock->tpos;
size_t s = snmp_pkt_len(start, end); size_t s = snmp_pkt_len(start, end);
STORE_U32(h->payload, s); STORE_U32(h->payload, s);
return AGENTX_HEADER_SIZE + s; return AGENTX_HEADER_SIZE + s;
@ -796,7 +798,7 @@ static uint
parse_gets2_pdu(struct snmp_proto *p, byte * const pkt_start, uint size, uint *skip) parse_gets2_pdu(struct snmp_proto *p, byte * const pkt_start, uint size, uint *skip)
{ {
// TODO checks for c.size underflow // TODO checks for c.size underflow
snmp_log("parse_gets2_pdu()"); //snmp_log("parse_gets2_pdu()");
struct oid *o_start = NULL, *o_end = NULL; struct oid *o_start = NULL, *o_end = NULL;
byte *pkt = pkt_start; byte *pkt = pkt_start;
@ -822,7 +824,7 @@ parse_gets2_pdu(struct snmp_proto *p, byte * const pkt_start, uint size, uint *s
*/ */
if (size < clen) if (size < clen)
{ {
snmp_log("size %u < %u clen, returning 0", size, clen); //snmp_log("size %u < %u clen, returning 0", size, clen);
goto wait; goto wait;
} }
@ -887,7 +889,7 @@ parse_gets2_pdu(struct snmp_proto *p, byte * const pkt_start, uint size, uint *s
uint ind = 0; uint ind = 0;
while (c.error == AGENTX_RES_NO_ERROR && size > 0 && pkt_size > 0) while (c.error == AGENTX_RES_NO_ERROR && size > 0 && pkt_size > 0)
{ {
snmp_log("iter %u size %u remaining %u/%u", ind + 1, c.buffer - sk->tpos, size, pkt_size); //snmp_log("iter %u size %u remaining %u/%u", ind + 1, c.buffer - sk->tpos, size, pkt_size);
if (size < snmp_oid_sizeof(0)) if (size < snmp_oid_sizeof(0))
goto partial; goto partial;
@ -909,12 +911,12 @@ parse_gets2_pdu(struct snmp_proto *p, byte * const pkt_start, uint size, uint *s
*/ */
if (sz > size && ind > 0) if (sz > size && ind > 0)
{ {
snmp_log("sz %u > %u size && ind %u > 1", sz, size, ind + 1); //snmp_log("sz %u > %u size && ind %u > 1", sz, size, ind + 1);
goto partial; /* send already processed part */ goto partial; /* send already processed part */
} }
else if (sz > size) else if (sz > size)
{ {
snmp_log("sz %u > %u size; returning 0", sz, size); //snmp_log("sz %u > %u size; returning 0", sz, size);
goto wait; goto wait;
} }
@ -936,13 +938,13 @@ parse_gets2_pdu(struct snmp_proto *p, byte * const pkt_start, uint size, uint *s
if (sz > size && ind > 0) if (sz > size && ind > 0)
{ {
snmp_log("sz2 %u > %u size && ind %u > 1", sz, size, ind + 1); //snmp_log("sz2 %u > %u size && ind %u > 1", sz, size, ind + 1);
size += snmp_oid_size(o_start_b); size += snmp_oid_size(o_start_b);
goto partial; goto partial;
} }
else if (sz > size) else if (sz > size)
{ {
snmp_log("sz2 %u > %u size; returning 0", sz, size); //snmp_log("sz2 %u > %u size; returning 0", sz, size);
goto wait; goto wait;
} }
@ -957,7 +959,7 @@ parse_gets2_pdu(struct snmp_proto *p, byte * const pkt_start, uint size, uint *s
if (!snmp_is_oid_empty(o_end) && snmp_oid_compare(o_start, o_end) > 0) if (!snmp_is_oid_empty(o_end) && snmp_oid_compare(o_start, o_end) > 0)
{ {
snmp_log("snmp_gets2() o_start does not preceed o_end, returning GEN_ERROR"); //snmp_log("snmp_gets2() o_start does not preceed o_end, returning GEN_ERROR");
c.error = AGENTX_RES_GEN_ERROR; c.error = AGENTX_RES_GEN_ERROR;
goto send; goto send;
} }
@ -1012,14 +1014,15 @@ parse_gets2_pdu(struct snmp_proto *p, byte * const pkt_start, uint size, uint *s
} }
} }
send: send:;
snmp_log("gets2: sending response ..."); //snmp_log("gets2: sending response ...");
struct agentx_response *res = (void *) sk->tbuf; struct agentx_response *res = (void *) sk->tbuf;
/* We update the error, index pair on the beginning of the packet. */ /* We update the error, index pair on the beginning of the packet. */
response_err_ind(res, c.error, ind + 1); response_err_ind(res, c.error, ind + 1);
uint s = update_packet_size(p, (byte *) response_header, c.buffer); uint s = update_packet_size(p, (byte *) response_header, c.buffer);
snmp_log("sending response to Get-PDU, GetNext-PDU or GetBulk-PDU request (size %u)...", s); //snmp_log("sending response to Get-PDU, GetNext-PDU or GetBulk-PDU request (size %u)...", s);
/* We send the message in TX-buffer. */ /* We send the message in TX-buffer. */
int ret = sk_send(sk, s); int ret = sk_send(sk, s);
if (ret > 0) if (ret > 0)
@ -1040,13 +1043,13 @@ send:
partial: partial:
snmp_log("partial packet"); //snmp_log("partial packet");
/* The context octet is not added into response pdu. */ /* The context octet is not added into response pdu. */
/* need to tweak RX buffer packet size */ /* need to tweak RX buffer packet size */
snmp_log("old rx-buffer size %u", h->payload); //snmp_log("old rx-buffer size %u", h->payload);
(c.byte_ord) ? put_u32(&h->payload, pkt_size) : (h->payload = pkt_size); (c.byte_ord) ? put_u32(&h->payload, pkt_size) : (h->payload = pkt_size);
snmp_log("new rx-buffer size %u", h->payload); //snmp_log("new rx-buffer size %u", h->payload);
*skip = AGENTX_HEADER_SIZE; *skip = AGENTX_HEADER_SIZE;
p->partial_response = response_header; p->partial_response = response_header;
@ -1065,8 +1068,8 @@ wait:
void void
snmp_start_subagent(struct snmp_proto *p) snmp_start_subagent(struct snmp_proto *p)
{ {
snmp_log("snmp_start_subagent() starting subagent"); //snmp_log("snmp_start_subagent() starting subagent");
snmp_log("DEBUG p->bgp_local_as %u", p->bgp_local_as); //snmp_log("DEBUG p->bgp_local_as %u", p->bgp_local_as);
/* blank oid means unsupported */ /* blank oid means unsupported */
struct oid *blank = snmp_oid_blank(p); struct oid *blank = snmp_oid_blank(p);
@ -1080,7 +1083,7 @@ snmp_start_subagent(struct snmp_proto *p)
void void
snmp_stop_subagent(struct snmp_proto *p) snmp_stop_subagent(struct snmp_proto *p)
{ {
snmp_log("snmp_stop_subagent() state %d", p->state); //snmp_log("snmp_stop_subagent() state %d", p->state);
if (p->state == SNMP_STOP) if (p->state == SNMP_STOP)
close_pdu(p, AGENTX_CLOSE_SHUTDOWN); close_pdu(p, AGENTX_CLOSE_SHUTDOWN);
@ -1099,12 +1102,12 @@ oid_prefix(struct oid *o, u32 *prefix, uint len)
int int
snmp_rx(sock *sk, uint size) snmp_rx(sock *sk, uint size)
{ {
snmp_log("snmp_rx() size %u", size); //snmp_log("snmp_rx() size %u", size);
//snmp_dump_packet(sk->tbuf, 64); //snmp_dump_packet(sk->tbuf, 64);
struct snmp_proto *p = sk->data; struct snmp_proto *p = sk->data;
byte *pkt_start = sk->rbuf; byte *pkt_start = sk->rbuf;
byte *end = pkt_start + size; byte *end = pkt_start + size;
snmp_log("snmp_rx rbuf 0x%p rpos 0x%p", sk->rbuf, sk->rpos); //snmp_log("snmp_rx rbuf 0x%p rpos 0x%p", sk->rbuf, sk->rpos);
/* /*
* In some cases we want to save the header for future parsing, skip is number * In some cases we want to save the header for future parsing, skip is number
@ -1112,14 +1115,15 @@ snmp_rx(sock *sk, uint size)
*/ */
uint skip = 0; uint skip = 0;
snmp_log("snmp_rx before loop"); //snmp_log("snmp_rx before loop");
while (end >= pkt_start + AGENTX_HEADER_SIZE && skip == 0) while (end >= pkt_start + AGENTX_HEADER_SIZE && skip == 0)
{ {
uint parsed_len = parse_pkt(p, pkt_start, size, &skip); uint parsed_len = parse_pkt(p, pkt_start, size, &skip);
snmp_log("snmp_rx loop end %p parsed >>> %u <<< curr %p", end, parsed_len, /*snmp_log("snmp_rx loop end %p parsed >>> %u <<< curr %p", end, parsed_len,
pkt_start + parsed_len); pkt_start + parsed_len);
snmp_log("snmp_rx loop2 rpos 0x%p", sk->rpos); */
//snmp_log("snmp_rx loop2 rpos 0x%p", sk->rpos);
if (parsed_len == 0) if (parsed_len == 0)
break; break;
@ -1127,23 +1131,23 @@ snmp_rx(sock *sk, uint size)
pkt_start += parsed_len; pkt_start += parsed_len;
size -= parsed_len; size -= parsed_len;
} }
snmp_log("snmp_rx loop finished"); //snmp_log("snmp_rx loop finished");
/* Incomplete packets */ /* Incomplete packets */
if (skip != 0 || pkt_start != end) if (skip != 0 || pkt_start != end)
{ {
snmp_log("snmp_rx memmove"); //snmp_log("snmp_rx memmove");
snmp_dump_packet(sk->rbuf, SNMP_RX_BUFFER_SIZE); //snmp_dump_packet(sk->rbuf, SNMP_RX_BUFFER_SIZE);
memmove(sk->rbuf + skip, pkt_start, size); memmove(sk->rbuf + skip, pkt_start, size);
snmp_log("after change; sk->rbuf 0x%p sk->rpos 0x%p", sk->rbuf, sk->rpos); //snmp_log("after change; sk->rbuf 0x%p sk->rpos 0x%p", sk->rbuf, sk->rpos);
snmp_dump_packet(sk->rbuf, size + skip); //snmp_dump_packet(sk->rbuf, size + skip);
snmp_log("tweaking rpos 0x%p (size %u skip %u)", sk->rpos, size, skip); //snmp_log("tweaking rpos 0x%p (size %u skip %u)", sk->rpos, size, skip);
sk->rpos = sk->rbuf + size + skip; sk->rpos = sk->rbuf + size + skip;
snmp_log("snmp_rx returing 0"); //snmp_log("snmp_rx returing 0");
return 0; return 0;
} }
snmp_log("snmp_rx returning 1"); //snmp_log("snmp_rx returning 1");
return 1; return 1;
} }
@ -1152,14 +1156,14 @@ void
snmp_ping(struct snmp_proto *p) snmp_ping(struct snmp_proto *p)
{ {
sock *sk = p->sock; sock *sk = p->sock;
snmp_dump_packet(sk->tpos, AGENTX_HEADER_SIZE + 4); //snmp_dump_packet(sk->tpos, AGENTX_HEADER_SIZE + 4);
snmp_log("snmp_ping sk->tpos 0x%p", sk->tpos); //snmp_log("snmp_ping sk->tpos 0x%p", sk->tpos);
struct snmp_pdu c = SNMP_PDU_CONTEXT(sk); struct snmp_pdu c = SNMP_PDU_CONTEXT(sk);
if (c.size < AGENTX_HEADER_SIZE) if (c.size < AGENTX_HEADER_SIZE)
snmp_manage_tbuf(p, &c); snmp_manage_tbuf(p, &c);
snmp_log("ping_pdu()"); //snmp_log("ping_pdu()");
struct agentx_header *h = (struct agentx_header *) c.buffer; struct agentx_header *h = (struct agentx_header *) c.buffer;
ADVANCE(c.buffer, c.size, AGENTX_HEADER_SIZE); ADVANCE(c.buffer, c.size, AGENTX_HEADER_SIZE);
SNMP_BLANK_HEADER(h, AGENTX_PING_PDU); SNMP_BLANK_HEADER(h, AGENTX_PING_PDU);
@ -1167,8 +1171,8 @@ snmp_ping(struct snmp_proto *p)
SNMP_SESSION(h, p); SNMP_SESSION(h, p);
c.byte_ord = AGENTX_NETWORK_BYTE_ORDER; c.byte_ord = AGENTX_NETWORK_BYTE_ORDER;
snmp_log("sending ping packet ... tpos 0x%p", sk->tpos); //snmp_log("sending ping packet ... tpos 0x%p", sk->tpos);
snmp_dump_packet(sk->tpos, AGENTX_HEADER_SIZE + 4); //snmp_dump_packet(sk->tpos, AGENTX_HEADER_SIZE + 4);
/* sending only header -> pkt - buf */ /* sending only header -> pkt - buf */
uint s = update_packet_size(p, sk->tpos, c.buffer); uint s = update_packet_size(p, sk->tpos, c.buffer);
@ -1210,8 +1214,9 @@ has_inet_prefix(struct oid *o)
*/ */
int snmp_search_check_end_oid(const struct oid *found, const struct oid *bound) int snmp_search_check_end_oid(const struct oid *found, const struct oid *bound)
{ {
snmp_log("upper_bound_check(*f, *b) %p %p is_empty() %d", found, bound, /*snmp_log("upper_bound_check(*f, *b) %p %p is_empty() %d", found, bound,
snmp_is_oid_empty(bound)); snmp_is_oid_empty(bound));
*/
if (snmp_is_oid_empty(bound)) if (snmp_is_oid_empty(bound))
return 1; return 1;
@ -1226,7 +1231,7 @@ search_mib(struct snmp_proto *p, const struct oid *o_start, const struct oid *o_
struct oid *o_curr, struct snmp_pdu *c, struct oid *o_curr, struct snmp_pdu *c,
enum snmp_search_res *result) enum snmp_search_res *result)
{ {
snmp_log("search_mib()"); //snmp_log("search_mib()");
ASSUME(o_start != NULL); ASSUME(o_start != NULL);
if (o_curr && (o_curr->n_subid < 2 || o_curr->ids[0] != 1)) if (o_curr && (o_curr->n_subid < 2 || o_curr->ids[0] != 1))
@ -1246,7 +1251,7 @@ search_mib(struct snmp_proto *p, const struct oid *o_start, const struct oid *o_
snmp_get_mib_class(o_curr) < snmp_get_mib_class(o_end)) snmp_get_mib_class(o_curr) < snmp_get_mib_class(o_end))
{ {
o_end = blank = snmp_oid_blank(p); o_end = blank = snmp_oid_blank(p);
snmp_log("search_mib() o_end points to blank oid now %p", o_end); //snmp_log("search_mib() o_end points to blank oid now %p", o_end);
} }
enum snmp_search_res r; enum snmp_search_res r;
@ -1293,32 +1298,35 @@ struct oid *
snmp_prefixize(struct snmp_proto *proto, const struct oid *oid, int byte_ord) snmp_prefixize(struct snmp_proto *proto, const struct oid *oid, int byte_ord)
{ {
ASSERT(oid != NULL); ASSERT(oid != NULL);
snmp_log("snmp_prefixize()"); //snmp_log("snmp_prefixize()");
if (snmp_is_oid_empty(oid)) if (snmp_is_oid_empty(oid))
{ {
/* allocate new zeroed oid */ /* allocate new zeroed oid */
snmp_log("blank"); //snmp_log("blank");
return snmp_oid_blank(proto); return snmp_oid_blank(proto);
} }
/* already in prefixed form */ /* already in prefixed form */
else if (oid->prefix != 0) { else if (oid->prefix != 0) {
struct oid *new = snmp_oid_duplicate(proto->pool, oid); struct oid *new = snmp_oid_duplicate(proto->pool, oid);
snmp_log("already prefixed"); //snmp_log("already prefixed");
return new; return new;
} }
if (oid->n_subid < 5) if (oid->n_subid < 5)
{ snmp_log("too small"); return NULL; } return NULL;
//{ snmp_log("too small"); return NULL; }
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
if (LOAD_U32(oid->ids[i], byte_ord) != snmp_internet[i]) if (LOAD_U32(oid->ids[i], byte_ord) != snmp_internet[i])
{ snmp_log("different prefix"); return NULL; } return NULL;
//{ snmp_log("different prefix"); return NULL; }
/* validity check here */ /* validity check here */
if (oid->ids[4] >= 256) if (oid->ids[4] >= 256)
{ snmp_log("outside byte first id"); return NULL; } return NULL;
//{ snmp_log("outside byte first id"); return NULL; }
struct oid *new = mb_alloc(proto->pool, struct oid *new = mb_alloc(proto->pool,
sizeof(struct oid) + MAX((oid->n_subid - 5) * sizeof(u32), 0)); sizeof(struct oid) + MAX((oid->n_subid - 5) * sizeof(u32), 0));
@ -1362,6 +1370,7 @@ snmp_mib_fill2(struct snmp_proto *p, struct oid *oid,
case SNMP_CLASS_INVALID: case SNMP_CLASS_INVALID:
case SNMP_CLASS_END: case SNMP_CLASS_END:
default: default:
break;
vb->type = AGENTX_NO_SUCH_OBJECT; vb->type = AGENTX_NO_SUCH_OBJECT;
ADVANCE(c->buffer, c->size, snmp_varbind_header_size(vb)); ADVANCE(c->buffer, c->size, snmp_varbind_header_size(vb));
} }
@ -1375,26 +1384,17 @@ snmp_mib_fill2(struct snmp_proto *p, struct oid *oid,
void void
snmp_manage_tbuf(struct snmp_proto UNUSED *p, struct snmp_pdu *c) snmp_manage_tbuf(struct snmp_proto UNUSED *p, struct snmp_pdu *c)
{ {
snmp_log("snmp_manage_tbuf()"); //snmp_log("snmp_manage_tbuf()");
sock *sk = p->sock; sock *sk = p->sock;
sk_set_tbsize(sk, sk->tbsize + 2048); sk_set_tbsize(sk, sk->tbsize + 2048);
c->size += 2048; c->size += 2048;
} }
/*
void
snmp_tx(sock UNUSED *sk)
{
snmp_log("snmp_tx");
}
*/
static struct agentx_response * static struct agentx_response *
prepare_response(struct snmp_proto *p, struct snmp_pdu *c) prepare_response(struct snmp_proto *p, struct snmp_pdu *c)
{ {
snmp_log("prepare_response()"); //snmp_log("prepare_response()");
if (!p->partial_response) if (!p->partial_response)
{ {

6
proto/snmp/subagent.h
View File

@ -115,7 +115,7 @@ enum snmp_search_res {
#define COPY_STR(proto, buf, str, length, byte_order) ({ \ #define COPY_STR(proto, buf, str, length, byte_order) ({ \
length = LOAD_PTR(buf, byte_order); \ length = LOAD_PTR(buf, byte_order); \
log(L_INFO "LOAD_STR(), %p %u", proto->pool, length + 1); \ /*log(L_INFO "LOAD_STR(), %p %u", proto->pool, length + 1); */ \
str = mb_alloc(proto->pool, length + 1); \ str = mb_alloc(proto->pool, length + 1); \
memcpy(str, buf+4, length); \ memcpy(str, buf+4, length); \
str[length] = '\0'; /* set term. char */ \ str[length] = '\0'; /* set term. char */ \
@ -338,6 +338,10 @@ u8 snmp_get_mib_class(const struct oid *oid);
// debug wrapper // debug wrapper
#if 0
#define snmp_log(...) log(L_INFO "snmp " __VA_ARGS__) #define snmp_log(...) log(L_INFO "snmp " __VA_ARGS__)
#else
#define snmp_log(...) do { } while(0)
#endif
#endif #endif