osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

snmp: fix 'time' var name. 

As pointed out by checkAPI.pl

Change-Id: I603465614236ec41d1050e6e3452dbf9021bf1d5
Reviewed-on: https://code.wireshark.org/review/10468
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This commit is contained in:
Dario Lombardo 2015-09-10 17:39:07 +02:00 committed by Alexis La Goutte
parent 942eb739f4
commit 4c16eff85e
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
asn1/snmp/packet-snmp-template.c
View File

@ -1759,10 +1759,10 @@ snmp_usm_priv_aes_common(snmp_usm_params_t* p, tvbuff_t* encryptedData, gchar co
iv[1] = (p->boots & 0x00ff0000) >> 16;
iv[2] = (p->boots & 0x0000ff00) >> 8;
iv[3] = (p->boots & 0x000000ff);
iv[4] = (p->time & 0xff000000) >> 24;
iv[5] = (p->time & 0x00ff0000) >> 16;
iv[6] = (p->time & 0x0000ff00) >> 8;
iv[7] = (p->time & 0x000000ff);
iv[4] = (p->snmp_time & 0xff000000) >> 24;
iv[5] = (p->snmp_time & 0x00ff0000) >> 16;
iv[6] = (p->snmp_time & 0x0000ff00) >> 8;
iv[7] = (p->snmp_time & 0x000000ff);
tvb_memcpy(p->priv_tvb,&(iv[8]),0,8);
cryptgrm_len = tvb_captured_length(encryptedData);
@ -1907,7 +1907,7 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo,
usm_p.authenticated = FALSE;
usm_p.encrypted = FALSE;
usm_p.boots = 0;
usm_p.time = 0;
usm_p.snmp_time = 0;
usm_p.authOK = FALSE;
/*

2
asn1/snmp/packet-snmp-template.h
View File

@ -73,7 +73,7 @@ struct _snmp_usm_params_t {
guint auth_offset;
guint32 boots;
guint32 time;
guint32 snmp_time;
tvbuff_t* engine_tvb;
tvbuff_t* user_tvb;
proto_item* auth_item;

2
asn1/snmp/snmp.cnf
View File

@ -88,7 +88,7 @@ gint pdu_type=-1;
#.FN_PARS UsmSecurityParameters/msgAuthoritativeEngineTime
VAL_PTR = &usm_p.time
VAL_PTR = &usm_p.snmp_time
#.FN_BODY UsmSecurityParameters/msgAuthoritativeEngineID

12
epan/dissectors/packet-snmp.c
View File

@ -1861,10 +1861,10 @@ snmp_usm_priv_aes_common(snmp_usm_params_t* p, tvbuff_t* encryptedData, gchar co
iv[1] = (p->boots & 0x00ff0000) >> 16;
iv[2] = (p->boots & 0x0000ff00) >> 8;
iv[3] = (p->boots & 0x000000ff);
iv[4] = (p->time & 0xff000000) >> 24;
iv[5] = (p->time & 0x00ff0000) >> 16;
iv[6] = (p->time & 0x0000ff00) >> 8;
iv[7] = (p->time & 0x000000ff);
iv[4] = (p->snmp_time & 0xff000000) >> 24;
iv[5] = (p->snmp_time & 0x00ff0000) >> 16;
iv[6] = (p->snmp_time & 0x0000ff00) >> 8;
iv[7] = (p->snmp_time & 0x000000ff);
tvb_memcpy(p->priv_tvb,&(iv[8]),0,8);
cryptgrm_len = tvb_captured_length(encryptedData);
@ -2520,7 +2520,7 @@ dissect_snmp_T_msgAuthoritativeEngineBoots(gboolean implicit_tag _U_, tvbuff_t *
static int
dissect_snmp_T_msgAuthoritativeEngineTime(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
&usm_p.time);
&usm_p.snmp_time);
return offset;
}
@ -3123,7 +3123,7 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo,
usm_p.authenticated = FALSE;
usm_p.encrypted = FALSE;
usm_p.boots = 0;
usm_p.time = 0;
usm_p.snmp_time = 0;
usm_p.authOK = FALSE;
/*

2
epan/dissectors/packet-snmp.h
View File

@ -81,7 +81,7 @@ struct _snmp_usm_params_t {
guint auth_offset;
guint32 boots;
guint32 time;
guint32 snmp_time;
tvbuff_t* engine_tvb;
tvbuff_t* user_tvb;
proto_item* auth_item;