diff options
Diffstat (limited to 'epan/dissectors/packet-snmp.c')
| -rw-r--r-- | epan/dissectors/packet-snmp.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index 6384d7eff4..baea271e5e 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -114,6 +114,11 @@ static int proto_smux = -1; static gboolean display_oid = TRUE; static gboolean snmp_var_in_tree = TRUE; +void proto_register_snmp(void); +void proto_reg_handoff_snmp(void); +void proto_register_smux(void); +void proto_reg_handoff_smux(void); + static gboolean snmp_usm_auth_md5(snmp_usm_params_t* p, guint8**, guint*, gchar const**); static gboolean snmp_usm_auth_sha1(snmp_usm_params_t* p, guint8**, guint*, gchar const**); @@ -306,7 +311,7 @@ static int hf_snmp_priority = -1; /* INTEGER_M1_2147483647 */ static int hf_snmp_operation = -1; /* T_operation */ /*--- End of included file: packet-snmp-hf.c ---*/ -#line 232 "../../asn1/snmp/packet-snmp-template.c" +#line 237 "../../asn1/snmp/packet-snmp-template.c" static int hf_smux_version = -1; static int hf_smux_pdutype = -1; @@ -349,7 +354,7 @@ static gint ett_snmp_SimpleOpen_U = -1; static gint ett_snmp_RReqPDU_U = -1; /*--- End of included file: packet-snmp-ett.c ---*/ -#line 251 "../../asn1/snmp/packet-snmp-template.c" +#line 256 "../../asn1/snmp/packet-snmp-template.c" static const true_false_string auth_flags = { "OK", @@ -803,7 +808,7 @@ show_oid_index: proto_tree_add_ether(pt_name,k->hfid,tvb,name_offset,buf_len, buf); break; case OID_KEY_TYPE_IPADDR: { - guint32* ipv4_p = (void*)buf; + guint32* ipv4_p = (guint32*)buf; proto_tree_add_ipv4(pt_name,k->hfid,tvb,name_offset,buf_len, *ipv4_p); } break; @@ -1583,7 +1588,7 @@ snmp_usm_priv_des(snmp_usm_params_t* p _U_, tvbuff_t* encryptedData _U_, gchar c return clear_tvb; on_gcry_error: - *error = (void*)gpg_strerror(err); + *error = (const gchar *)gpg_strerror(err); if (hd) gcry_cipher_close(hd); return NULL; #else @@ -1653,7 +1658,7 @@ snmp_usm_priv_aes_common(snmp_usm_params_t* p, tvbuff_t* encryptedData, gchar co return clear_tvb; on_gcry_error: - *error = (void*)gpg_strerror(err); + *error = (const gchar *)gpg_strerror(err); if (hd) gcry_cipher_close(hd); return NULL; } @@ -1692,7 +1697,7 @@ snmp_usm_priv_aes256(snmp_usm_params_t* p _U_, tvbuff_t* encryptedData _U_, gcha #endif } -gboolean +static gboolean check_ScopedPdu(tvbuff_t* tvb) { int offset; @@ -2851,7 +2856,7 @@ static void dissect_SMUX_PDUs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro /*--- End of included file: packet-snmp-fn.c ---*/ -#line 1631 "../../asn1/snmp/packet-snmp-template.c" +#line 1636 "../../asn1/snmp/packet-snmp-template.c" guint @@ -3766,7 +3771,7 @@ void proto_register_snmp(void) { NULL, HFILL }}, /*--- End of included file: packet-snmp-hfarr.c ---*/ -#line 2281 "../../asn1/snmp/packet-snmp-template.c" +#line 2286 "../../asn1/snmp/packet-snmp-template.c" }; /* List of subtrees */ @@ -3806,7 +3811,7 @@ void proto_register_snmp(void) { &ett_snmp_RReqPDU_U, /*--- End of included file: packet-snmp-ettarr.c ---*/ -#line 2297 "../../asn1/snmp/packet-snmp-template.c" +#line 2302 "../../asn1/snmp/packet-snmp-template.c" }; module_t *snmp_module; |