diff options
| author | Dario Lombardo <lomato@gmail.com> | 2015-09-10 17:39:07 +0200 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2015-09-11 06:16:21 +0000 |
| commit | 4c16eff85e40b55c9884a12dbcc25544d4d59243 (patch) | |
| tree | 26107b81a341fdcc6f8f113301ea7ff854f23cff /asn1 | |
| parent | 942eb739f4b3e5631015c1f3d4dba009caf83e27 (diff) | |
| download | wireshark-4c16eff85e40b55c9884a12dbcc25544d4d59243.tar.gz wireshark-4c16eff85e40b55c9884a12dbcc25544d4d59243.tar.bz2 wireshark-4c16eff85e40b55c9884a12dbcc25544d4d59243.zip | |
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>
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/snmp/packet-snmp-template.c | 10 | ||||
| -rw-r--r-- | asn1/snmp/packet-snmp-template.h | 2 | ||||
| -rw-r--r-- | asn1/snmp/snmp.cnf | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c index 5914dc99d3..b204cbdc95 100644 --- a/asn1/snmp/packet-snmp-template.c +++ b/asn1/snmp/packet-snmp-template.c @@ -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; /* diff --git a/asn1/snmp/packet-snmp-template.h b/asn1/snmp/packet-snmp-template.h index 3ade802264..7d6b746e7e 100644 --- a/asn1/snmp/packet-snmp-template.h +++ b/asn1/snmp/packet-snmp-template.h @@ -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; diff --git a/asn1/snmp/snmp.cnf b/asn1/snmp/snmp.cnf index bf7010ba41..f2b95009f4 100644 --- a/asn1/snmp/snmp.cnf +++ b/asn1/snmp/snmp.cnf @@ -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 |