Re: snmpd: s/SNMP_C_GETRESP/SNMP_C_RESPONSE
On Thu, 2021-10-21 at 15:22 +0100, Stuart Henderson wrote: > On 2021/10/21 15:08, Martijn van Duren wrote: > > This one has been bothering me for a while. > > > > OK? > > > > martijn@ > > > > Index: smi.c > > === > > RCS file: /cvs/src/usr.sbin/snmpd/smi.c,v > > retrieving revision 1.28 > > diff -u -p -r1.28 smi.c > > --- smi.c 4 Jan 2021 07:59:54 - 1.28 > > +++ smi.c 21 Oct 2021 14:06:40 - > > @@ -377,7 +377,7 @@ smi_debug_elements(struct ber_element *r > > case SNMP_C_GETNEXTREQ: > > fprintf(stderr, "nextreq"); > > break; > > - case SNMP_C_GETRESP: > > + case SNMP_C_RESPONSE: > > fprintf(stderr, "getresp"); > > ok. > > maybe s/getresp/response in the fprintf above too? > Sure, but let's clean up nextreq while we're here. > Index: smi.c === RCS file: /cvs/src/usr.sbin/snmpd/smi.c,v retrieving revision 1.29 diff -u -p -r1.29 smi.c --- smi.c 21 Oct 2021 14:33:13 - 1.29 +++ smi.c 21 Oct 2021 14:34:49 - @@ -375,10 +375,10 @@ smi_debug_elements(struct ber_element *r fprintf(stderr, "getreq"); break; case SNMP_C_GETNEXTREQ: - fprintf(stderr, "nextreq"); + fprintf(stderr, "getnextreq"); break; case SNMP_C_RESPONSE: - fprintf(stderr, "getresp"); + fprintf(stderr, "response"); break; case SNMP_C_SETREQ: fprintf(stderr, "setreq");
Re: snmpd: s/SNMP_C_GETRESP/SNMP_C_RESPONSE
On 2021/10/21 15:08, Martijn van Duren wrote:
> This one has been bothering me for a while.
>
> OK?
>
> martijn@
>
> Index: smi.c
> ===
> RCS file: /cvs/src/usr.sbin/snmpd/smi.c,v
> retrieving revision 1.28
> diff -u -p -r1.28 smi.c
> --- smi.c 4 Jan 2021 07:59:54 - 1.28
> +++ smi.c 21 Oct 2021 14:06:40 -
> @@ -377,7 +377,7 @@ smi_debug_elements(struct ber_element *r
> case SNMP_C_GETNEXTREQ:
> fprintf(stderr, "nextreq");
> break;
> - case SNMP_C_GETRESP:
> + case SNMP_C_RESPONSE:
> fprintf(stderr, "getresp");
ok.
maybe s/getresp/response in the fprintf above too?
> break;
> case SNMP_C_SETREQ:
> Index: snmp.h
> ===
> RCS file: /cvs/src/usr.sbin/snmpd/snmp.h,v
> retrieving revision 1.17
> diff -u -p -r1.17 snmp.h
> --- snmp.h20 May 2021 08:53:12 - 1.17
> +++ snmp.h21 Oct 2021 14:06:40 -
> @@ -80,7 +80,7 @@ enum snmp_version {
> enum snmp_pdutype {
> SNMP_C_GETREQ = 0,
> SNMP_C_GETNEXTREQ = 1,
> - SNMP_C_GETRESP = 2,
> + SNMP_C_RESPONSE = 2,
> SNMP_C_SETREQ = 3,
> SNMP_C_TRAP = 4,
>
> Index: snmpe.c
> ===
> RCS file: /cvs/src/usr.sbin/snmpd/snmpe.c,v
> retrieving revision 1.77
> diff -u -p -r1.77 snmpe.c
> --- snmpe.c 21 Oct 2021 08:21:43 - 1.77
> +++ snmpe.c 21 Oct 2021 14:06:40 -
> @@ -207,7 +207,7 @@ snmpe_pdutype2string(enum snmp_pdutype p
> return "GetRequest";
> case SNMP_C_GETNEXTREQ:
> return "GetNextRequest";
> - case SNMP_C_GETRESP:
> + case SNMP_C_RESPONSE:
> return "Response";
> case SNMP_C_SETREQ:
> return "SetRequest";
> @@ -373,7 +373,7 @@ badversion:
> }
> break;
>
> - case SNMP_C_GETRESP:
> + case SNMP_C_RESPONSE:
> stats->snmp_ingetresponses++;
> msg->sm_errstr = "response without request";
> goto parsefail;
> @@ -812,7 +812,7 @@ snmpe_dispatchmsg(struct snmp_message *m
> (void) snmpe_parsevarbinds(msg);
>
> /* respond directly */
> - msg->sm_pdutype = SNMP_C_GETRESP;
> + msg->sm_pdutype = SNMP_C_RESPONSE;
> snmpe_response(msg);
> }
>
>
>
snmpd: s/SNMP_C_GETRESP/SNMP_C_RESPONSE
This one has been bothering me for a while.
OK?
martijn@
Index: smi.c
===
RCS file: /cvs/src/usr.sbin/snmpd/smi.c,v
retrieving revision 1.28
diff -u -p -r1.28 smi.c
--- smi.c 4 Jan 2021 07:59:54 - 1.28
+++ smi.c 21 Oct 2021 14:06:40 -
@@ -377,7 +377,7 @@ smi_debug_elements(struct ber_element *r
case SNMP_C_GETNEXTREQ:
fprintf(stderr, "nextreq");
break;
- case SNMP_C_GETRESP:
+ case SNMP_C_RESPONSE:
fprintf(stderr, "getresp");
break;
case SNMP_C_SETREQ:
Index: snmp.h
===
RCS file: /cvs/src/usr.sbin/snmpd/snmp.h,v
retrieving revision 1.17
diff -u -p -r1.17 snmp.h
--- snmp.h 20 May 2021 08:53:12 - 1.17
+++ snmp.h 21 Oct 2021 14:06:40 -
@@ -80,7 +80,7 @@ enum snmp_version {
enum snmp_pdutype {
SNMP_C_GETREQ = 0,
SNMP_C_GETNEXTREQ = 1,
- SNMP_C_GETRESP = 2,
+ SNMP_C_RESPONSE = 2,
SNMP_C_SETREQ = 3,
SNMP_C_TRAP = 4,
Index: snmpe.c
===
RCS file: /cvs/src/usr.sbin/snmpd/snmpe.c,v
retrieving revision 1.77
diff -u -p -r1.77 snmpe.c
--- snmpe.c 21 Oct 2021 08:21:43 - 1.77
+++ snmpe.c 21 Oct 2021 14:06:40 -
@@ -207,7 +207,7 @@ snmpe_pdutype2string(enum snmp_pdutype p
return "GetRequest";
case SNMP_C_GETNEXTREQ:
return "GetNextRequest";
- case SNMP_C_GETRESP:
+ case SNMP_C_RESPONSE:
return "Response";
case SNMP_C_SETREQ:
return "SetRequest";
@@ -373,7 +373,7 @@ badversion:
}
break;
- case SNMP_C_GETRESP:
+ case SNMP_C_RESPONSE:
stats->snmp_ingetresponses++;
msg->sm_errstr = "response without request";
goto parsefail;
@@ -812,7 +812,7 @@ snmpe_dispatchmsg(struct snmp_message *m
(void) snmpe_parsevarbinds(msg);
/* respond directly */
- msg->sm_pdutype = SNMP_C_GETRESP;
+ msg->sm_pdutype = SNMP_C_RESPONSE;
snmpe_response(msg);
}
