|
@@ -220,7 +220,7 @@ static unsigned char asn1_length_decode(struct asn1_ctx *ctx,
|
|
|
if (ch < 0x80)
|
|
|
*len = ch;
|
|
|
else {
|
|
|
- cnt = (unsigned char) (ch & 0x7F);
|
|
|
+ cnt = ch & 0x7F;
|
|
|
*len = 0;
|
|
|
|
|
|
while (cnt > 0) {
|
|
@@ -618,8 +618,7 @@ struct snmp_cnv
|
|
|
int syntax;
|
|
|
};
|
|
|
|
|
|
-static struct snmp_cnv snmp_conv [] =
|
|
|
-{
|
|
|
+static const struct snmp_cnv snmp_conv[] = {
|
|
|
{ASN1_UNI, ASN1_NUL, SNMP_NULL},
|
|
|
{ASN1_UNI, ASN1_INT, SNMP_INTEGER},
|
|
|
{ASN1_UNI, ASN1_OTS, SNMP_OCTETSTR},
|
|
@@ -644,7 +643,7 @@ static unsigned char snmp_tag_cls2syntax(unsigned int tag,
|
|
|
unsigned int cls,
|
|
|
unsigned short *syntax)
|
|
|
{
|
|
|
- struct snmp_cnv *cnv;
|
|
|
+ const struct snmp_cnv *cnv;
|
|
|
|
|
|
cnv = snmp_conv;
|
|
|
|
|
@@ -904,7 +903,7 @@ static inline void mangle_address(unsigned char *begin,
|
|
|
u_int32_t old;
|
|
|
|
|
|
if (debug)
|
|
|
- memcpy(&old, (unsigned char *)addr, sizeof(old));
|
|
|
+ memcpy(&old, addr, sizeof(old));
|
|
|
|
|
|
*addr = map->to;
|
|
|
|
|
@@ -999,7 +998,7 @@ err_id_free:
|
|
|
*
|
|
|
*****************************************************************************/
|
|
|
|
|
|
-static void hex_dump(unsigned char *buf, size_t len)
|
|
|
+static void hex_dump(const unsigned char *buf, size_t len)
|
|
|
{
|
|
|
size_t i;
|
|
|
|
|
@@ -1080,7 +1079,7 @@ static int snmp_parse_mangle(unsigned char *msg,
|
|
|
if (cls != ASN1_CTX || con != ASN1_CON)
|
|
|
return 0;
|
|
|
if (debug > 1) {
|
|
|
- unsigned char *pdus[] = {
|
|
|
+ static const unsigned char *const pdus[] = {
|
|
|
[SNMP_PDU_GET] = "get",
|
|
|
[SNMP_PDU_NEXT] = "get-next",
|
|
|
[SNMP_PDU_RESPONSE] = "response",
|
|
@@ -1232,8 +1231,8 @@ static int help(struct sk_buff *skb, unsigned int protoff,
|
|
|
{
|
|
|
int dir = CTINFO2DIR(ctinfo);
|
|
|
unsigned int ret;
|
|
|
- struct iphdr *iph = ip_hdr(skb);
|
|
|
- struct udphdr *udph = (struct udphdr *)((u_int32_t *)iph + iph->ihl);
|
|
|
+ const struct iphdr *iph = ip_hdr(skb);
|
|
|
+ const struct udphdr *udph = (struct udphdr *)((__be32 *)iph + iph->ihl);
|
|
|
|
|
|
/* SNMP replies and originating SNMP traps get mangled */
|
|
|
if (udph->source == htons(SNMP_PORT) && dir != IP_CT_DIR_REPLY)
|