SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync code with last improvements from OpenBSD

Browse source
This commit is contained in:
purplerain 2023-11-11 01:29:48 +00:00
parent 5903cbe575
commit 62d64fa864
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
841 changed files with 83929 additions and 40755 deletions
Download patch file Download diff file Expand all files Collapse all files

68
lib/libagentx/agentx.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: agentx.c,v 1.22 2022/12/27 17:10:05 jmc Exp $ */
/* $OpenBSD: agentx.c,v 1.24 2023/10/29 11:10:07 martijn Exp $ */
/*
* Copyright (c) 2019 Martijn van Duren <martijn@openbsd.org>
*
@ -92,7 +92,7 @@ struct agentx_object {
size_t axo_indexlen;
int axo_implied;
uint8_t axo_timeout;
/* Prevent freeing object while in use by get and set requesets */
/* Prevent freeing object while in use by get and set requests */
uint32_t axo_lock;
void (*axo_get)(struct agentx_varbind *);
enum agentx_cstate axo_cstate;
@ -566,7 +566,7 @@ agentx_session_close_finalize(struct ax_pdu *pdu, void *cookie)
agentx_session_start(axs);
if (!axfree)
agentx_free_finalize(ax);
return 0;
}
@ -1114,7 +1114,7 @@ agentx_region(struct agentx_context *axc, uint32_t oid[],
#else
return NULL;
#endif
}
TAILQ_FOREACH(axr, &(axc->axc_regions), axr_axc_regions) {
if (ax_oid_cmp(&(axr->axr_oid), &tmpoid) == 0) {
@ -2733,8 +2733,7 @@ agentx_get_finalize(struct agentx_get *axg)
free(logmsg);
if (ax_response(ax->ax_ax, axs->axs_id, axg->axg_transactionid,
axg->axg_packetid, AGENTX_CONTEXT_CTX(axc), 0, error, index,
vbl, nvarbind) == -1) {
axg->axg_packetid, 0, error, index, vbl, nvarbind) == -1) {
agentx_log_axg_warn(axg, "Couldn't parse request");
agentx_reset(ax);
} else
@ -2823,7 +2822,7 @@ getnext:
while (axo != NULL && axo->axo_cstate != AX_CSTATE_OPEN)
axo = RB_NEXT(axc_objects, &(axc->axc_objects), axo);
if (axo == NULL ||
ax_oid_cmp(&(axo->axo_oid), &(axv->axv_end)) > 0) {
ax_oid_cmp(&(axo->axo_oid), &(axv->axv_end)) >= 0) {
agentx_varbind_endofmibview(axv);
return;
}
@ -3350,19 +3349,53 @@ agentx_varbind_finalize(struct agentx_varbind *axv)
#endif
}
}
cmp = ax_oid_cmp(&(axv->axv_vb.avb_oid), &oid);
if ((agentx_varbind_request(axv) == AGENTX_REQUEST_TYPE_GETNEXT &&
cmp >= 0) || cmp > 0) {
cmp = ax_oid_cmp(&oid, &(axv->axv_vb.avb_oid));
switch (agentx_varbind_request(axv)) {
case AGENTX_REQUEST_TYPE_GET:
if (cmp != 0) {
#ifdef AX_DEBUG
agentx_log_axg_fatalx(axg, "indices not incremented");
agentx_log_axg_fatalx(axg, "index changed");
#else
agentx_log_axg_warnx(axg, "indices not incremented");
bcopy(&(axv->axv_start), &(axv->axv_vb.avb_oid),
sizeof(axv->axv_start));
axv->axv_error = AX_PDU_ERROR_GENERR;
agentx_log_axg_warnx(axg, "index changed");
bcopy(&(axv->axv_start), &(axv->axv_vb.avb_oid),
sizeof(axv->axv_start));
axv->axv_error = AX_PDU_ERROR_GENERR;
break;
#endif
} else
}
break;
case AGENTX_REQUEST_TYPE_GETNEXT:
if (cmp <= 0) {
#ifdef AX_DEBUG
agentx_log_axg_fatalx(axg, "indices not incremented");
#else
agentx_log_axg_warnx(axg, "indices not incremented");
bcopy(&(axv->axv_start), &(axv->axv_vb.avb_oid),
sizeof(axv->axv_start));
axv->axv_error = AX_PDU_ERROR_GENERR;
break;
#endif
}
/* FALLTHROUGH */
case AGENTX_REQUEST_TYPE_GETNEXTINCLUSIVE:
if (cmp < 0) {
#ifdef AX_DEBUG
agentx_log_axg_fatalx(axg, "index decremented");
#else
agentx_log_axg_warnx(axg, "index decremented");
bcopy(&(axv->axv_start), &(axv->axv_vb.avb_oid),
sizeof(axv->axv_start));
axv->axv_error = AX_PDU_ERROR_GENERR;
break;
#endif
}
if (axv->axv_end.aoi_idlen != 0 &&
ax_oid_cmp(&oid, &(axv->axv_end)) >= 0) {
agentx_varbind_endofmibview(axv);
return;
}
bcopy(&oid, &(axv->axv_vb.avb_oid), sizeof(oid));
}
done:
agentx_object_unlock(axv->axv_axo);
agentx_get_finalize(axv->axv_axg);
@ -3797,7 +3830,7 @@ agentx_varbind_set_index_oid(struct agentx_varbind *axv,
return;
#endif
}
*curvalue = oid;
return;
}
@ -4041,7 +4074,6 @@ agentx_read(struct agentx *ax)
if (ax_response(ax->ax_ax, axs->axs_id,
pdu->ap_header.aph_transactionid,
pdu->ap_header.aph_packetid,
axc == NULL ? NULL : AGENTX_CONTEXT_CTX(axc),
0, error, 1, NULL, 0) == -1)
agentx_log_axc_warn(axc,
"transaction: %u packetid: %u: failed to send "