Deleted Added
full compact
snmpclient.c (216294) snmpclient.c (216594)
1/*
2 * Copyright (c) 2004-2005
3 * Hartmut Brandt.
4 * All rights reserved.
5 * Copyright (c) 2001-2003
6 * Fraunhofer Institute for Open Communication Systems (FhG Fokus).
7 * All rights reserved.
8 *

--- 1146 unchanged lines hidden (view full) ---

1155 if (snmp_client.version != SNMP_V3)
1156 return;
1157
1158 pdu->identifier = ++snmp_client.identifier;
1159 pdu->engine.max_msg_size = snmp_client.engine.max_msg_size;
1160 pdu->flags = 0;
1161 pdu->security_model = snmp_client.security_model;
1162
1/*
2 * Copyright (c) 2004-2005
3 * Hartmut Brandt.
4 * All rights reserved.
5 * Copyright (c) 2001-2003
6 * Fraunhofer Institute for Open Communication Systems (FhG Fokus).
7 * All rights reserved.
8 *

--- 1146 unchanged lines hidden (view full) ---

1155 if (snmp_client.version != SNMP_V3)
1156 return;
1157
1158 pdu->identifier = ++snmp_client.identifier;
1159 pdu->engine.max_msg_size = snmp_client.engine.max_msg_size;
1160 pdu->flags = 0;
1161 pdu->security_model = snmp_client.security_model;
1162
1163 if (snmp_client.security_model == SNMP_SECMODEL_USM)
1164 snmp_pdu_init_secparams(pdu, &snmp_client.engine,
1165 &snmp_client.user);
1166 else
1163 if (snmp_client.security_model == SNMP_SECMODEL_USM) {
1164 memcpy(&pdu->engine, &snmp_client.engine, sizeof(pdu->engine));
1165 memcpy(&pdu->user, &snmp_client.user, sizeof(pdu->user));
1166 snmp_pdu_init_secparams(pdu);
1167 } else
1167 seterr(&snmp_client, "unknown security model");
1168
1169 if (snmp_client.clen > 0) {
1170 memcpy(pdu->context_engine, snmp_client.cengine,
1171 snmp_client.clen);
1172 pdu->context_engine_len = snmp_client.clen;
1173 } else {
1174 memcpy(pdu->context_engine, snmp_client.engine.engine_id,

--- 260 unchanged lines hidden (view full) ---

1435 errno = EPIPE;
1436 return (-1);
1437 }
1438
1439 abuf.asn_ptr = buf;
1440 abuf.asn_len = ret;
1441
1442 memset(pdu, 0, sizeof(*pdu));
1168 seterr(&snmp_client, "unknown security model");
1169
1170 if (snmp_client.clen > 0) {
1171 memcpy(pdu->context_engine, snmp_client.cengine,
1172 snmp_client.clen);
1173 pdu->context_engine_len = snmp_client.clen;
1174 } else {
1175 memcpy(pdu->context_engine, snmp_client.engine.engine_id,

--- 260 unchanged lines hidden (view full) ---

1436 errno = EPIPE;
1437 return (-1);
1438 }
1439
1440 abuf.asn_ptr = buf;
1441 abuf.asn_len = ret;
1442
1443 memset(pdu, 0, sizeof(*pdu));
1443 if (snmp_client.security_model == SNMP_SECMODEL_USM)
1444 snmp_pdu_init_secparams(pdu, &snmp_client.engine,
1445 &snmp_client.user);
1444 if (snmp_client.security_model == SNMP_SECMODEL_USM) {
1445 memcpy(&pdu->engine, &snmp_client.engine, sizeof(pdu->engine));
1446 memcpy(&pdu->user, &snmp_client.user, sizeof(pdu->user));
1447 snmp_pdu_init_secparams(pdu);
1448 }
1446
1447 if (SNMP_CODE_OK != (ret = snmp_pdu_decode(&abuf, pdu, &ip))) {
1448 seterr(&snmp_client, "snmp_decode_pdu: failed %d", ret);
1449 free(buf);
1450 return (-1);
1451 }
1452
1453 free(buf);

--- 500 unchanged lines hidden ---
1449
1450 if (SNMP_CODE_OK != (ret = snmp_pdu_decode(&abuf, pdu, &ip))) {
1451 seterr(&snmp_client, "snmp_decode_pdu: failed %d", ret);
1452 free(buf);
1453 return (-1);
1454 }
1455
1456 free(buf);

--- 500 unchanged lines hidden ---