- use new netsnmp_ds_blah functions and constants
git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/trunk@7049 06827809-a52a-0410-b366-d66718629ded
diff --git a/agent/mibgroup/agentx/agentx_config.c b/agent/mibgroup/agentx/agentx_config.c
index e772a8b..bc6d6c7 100644
--- a/agent/mibgroup/agentx/agentx_config.c
+++ b/agent/mibgroup/agentx/agentx_config.c
@@ -42,7 +42,7 @@
sprintf(buf, "master '%s' unrecognised", cptr);
config_perror(buf);
} else
- ds_set_boolean(DS_APPLICATION_ID, DS_AGENT_AGENTX_MASTER, i);
+ netsnmp_ds_set_boolean(NETSNMP_DS_APPLICATION_ID, NETSNMP_DS_AGENT_AGENTX_MASTER, i);
}
#endif /* USING_AGENTX_MASTER_MODULE */
@@ -50,7 +50,7 @@
agentx_parse_agentx_socket(const char *token, char *cptr)
{
DEBUGMSGTL(("agentx/config", "port spec: %s\n", cptr));
- ds_set_string(DS_APPLICATION_ID, DS_AGENT_X_SOCKET, cptr);
+ netsnmp_ds_set_string(NETSNMP_DS_APPLICATION_ID, NETSNMP_DS_AGENT_X_SOCKET, cptr);
}
void
@@ -64,7 +64,7 @@
* whether or not to run as an AgentX master.
*/
#ifdef USING_AGENTX_MASTER_MODULE
- if (ds_get_boolean(DS_APPLICATION_ID, DS_AGENT_ROLE) == MASTER_AGENT)
+ if (netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID, NETSNMP_DS_AGENT_ROLE) == MASTER_AGENT)
snmpd_register_config_handler("master",
agentx_parse_master, NULL,
"specify 'agentx' for AgentX support");
diff --git a/agent/mibgroup/agentx/master.c b/agent/mibgroup/agentx/master.c
index b7e010a..a2723df 100644
--- a/agent/mibgroup/agentx/master.c
+++ b/agent/mibgroup/agentx/master.c
@@ -40,16 +40,16 @@
{
netsnmp_session sess, *session;
- if (ds_get_boolean(DS_APPLICATION_ID, DS_AGENT_ROLE) != MASTER_AGENT)
+ if (netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID, NETSNMP_DS_AGENT_ROLE) != MASTER_AGENT)
return;
DEBUGMSGTL(("agentx/master", "initializing...\n"));
snmp_sess_init(&sess);
sess.version = AGENTX_VERSION_1;
sess.flags |= SNMP_FLAGS_STREAM_SOCKET;
- if (ds_get_string(DS_APPLICATION_ID, DS_AGENT_X_SOCKET))
+ if (netsnmp_ds_get_string(NETSNMP_DS_APPLICATION_ID, NETSNMP_DS_AGENT_X_SOCKET))
sess.peername =
- ds_get_string(DS_APPLICATION_ID, DS_AGENT_X_SOCKET);
+ netsnmp_ds_get_string(NETSNMP_DS_APPLICATION_ID, NETSNMP_DS_AGENT_X_SOCKET);
else
sess.peername = AGENTX_SOCKET;
@@ -87,7 +87,7 @@
/*
* diagnose snmp_open errors with the input netsnmp_session pointer
*/
- if (!ds_get_boolean(DS_APPLICATION_ID, DS_AGENT_NO_ROOT_ACCESS)) {
+ if (!netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID, NETSNMP_DS_AGENT_NO_ROOT_ACCESS)) {
snmp_sess_perror
("Error: Couldn't open a master agentx socket to listen on",
&sess);
@@ -255,7 +255,7 @@
" handle_agentx_response: processing: "));
DEBUGMSGOID(("agentx/master", var->name, var->name_length));
DEBUGMSG(("agentx/master", "\n"));
- if (ds_get_boolean(DS_APPLICATION_ID, DS_AGENT_VERBOSE)) {
+ if (netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID, NETSNMP_DS_AGENT_VERBOSE)) {
DEBUGMSGTL(("snmp_agent", " >> "));
DEBUGMSGVAR(("snmp_agent", var));
DEBUGMSG(("snmp_agent", "\n"));
diff --git a/agent/mibgroup/agentx/subagent.c b/agent/mibgroup/agentx/subagent.c
index 5f798ef..6f82ea3 100644
--- a/agent/mibgroup/agentx/subagent.c
+++ b/agent/mibgroup/agentx/subagent.c
@@ -187,7 +187,7 @@
if (operation == NETSNMP_CALLBACK_OP_DISCONNECT) {
int period =
- ds_get_int(DS_APPLICATION_ID, DS_AGENT_AGENTX_PING_INTERVAL);
+ netsnmp_ds_get_int(NETSNMP_DS_APPLICATION_ID, NETSNMP_DS_AGENT_AGENTX_PING_INTERVAL);
DEBUGMSGTL(("agentx/subagent",
"transport disconnect indication\n"));
/*
@@ -632,9 +632,9 @@
sess.retries = SNMP_DEFAULT_RETRIES;
sess.timeout = SNMP_DEFAULT_TIMEOUT;
sess.flags |= SNMP_FLAGS_STREAM_SOCKET;
- if (ds_get_string(DS_APPLICATION_ID, DS_AGENT_X_SOCKET)) {
+ if (netsnmp_ds_get_string(NETSNMP_DS_APPLICATION_ID, NETSNMP_DS_AGENT_X_SOCKET)) {
sess.peername =
- ds_get_string(DS_APPLICATION_ID, DS_AGENT_X_SOCKET);
+ netsnmp_ds_get_string(NETSNMP_DS_APPLICATION_ID, NETSNMP_DS_AGENT_X_SOCKET);
} else {
sess.peername = AGENTX_SOCKET;
}
@@ -651,7 +651,7 @@
* Diagnose snmp_open errors with the input
* netsnmp_session pointer.
*/
- if (!ds_get_boolean(DS_APPLICATION_ID, DS_AGENT_NO_ROOT_ACCESS)) {
+ if (!netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID, NETSNMP_DS_AGENT_NO_ROOT_ACCESS)) {
netsnmp_sess_log_error(LOG_WARNING,
"Error: Failed to connect to the agentx master agent",
&sess);
@@ -702,13 +702,13 @@
/*
* set up callbacks to initiate master agent pings for this session
*/
- ds_register_config(ASN_INTEGER,
- ds_get_string(DS_LIBRARY_ID, DS_LIB_APPTYPE),
+ netsnmp_ds_register_config(ASN_INTEGER,
+ netsnmp_ds_get_string(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_APPTYPE),
"agentxPingInterval",
- DS_APPLICATION_ID, DS_AGENT_AGENTX_PING_INTERVAL);
+ NETSNMP_DS_APPLICATION_ID, NETSNMP_DS_AGENT_AGENTX_PING_INTERVAL);
- if (ds_get_boolean(DS_APPLICATION_ID, DS_AGENT_ROLE) != SUB_AGENT) {
+ if (netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID, NETSNMP_DS_AGENT_ROLE) != SUB_AGENT) {
return 0;
}
@@ -717,7 +717,7 @@
* * to try to connect to master or setup a ping alarm if it couldn't
* * succeed
*/
- if (ds_get_int(DS_APPLICATION_ID, DS_AGENT_AGENTX_PING_INTERVAL) > 0)
+ if (netsnmp_ds_get_int(NETSNMP_DS_APPLICATION_ID, NETSNMP_DS_AGENT_AGENTX_PING_INTERVAL) > 0)
agentx_reopen_session(0, NULL);
else /* if no ping interval was set up, just try to connect once */
subagent_open_master_session();
@@ -783,7 +783,7 @@
netsnmp_session *ss = (netsnmp_session *) clientarg;
int ping_interval =
- ds_get_int(DS_APPLICATION_ID, DS_AGENT_AGENTX_PING_INTERVAL);
+ netsnmp_ds_get_int(NETSNMP_DS_APPLICATION_ID, NETSNMP_DS_AGENT_AGENTX_PING_INTERVAL);
if (!ping_interval) /* don't do anything if not setup properly */
return 0;
diff --git a/agent/mibgroup/disman/mteTriggerTable.c b/agent/mibgroup/disman/mteTriggerTable.c
index d853537..c7e6953 100644
--- a/agent/mibgroup/disman/mteTriggerTable.c
+++ b/agent/mibgroup/disman/mteTriggerTable.c
@@ -162,8 +162,8 @@
"[options] monitor_expression [see \"man snmpd.conf\"]");
snmpd_register_config_handler("defaultMonitors",
parse_default_monitors, NULL, "yes|no");
- ds_register_config(ASN_OCTET_STR, "snmpd", "agentSecName",
- DS_APPLICATION_ID, DS_AGENT_INTERNAL_SECNAME);
+ netsnmp_ds_register_config(ASN_OCTET_STR, "snmpd", "agentSecName",
+ NETSNMP_DS_APPLICATION_ID, NETSNMP_DS_AGENT_INTERNAL_SECNAME);
/*
* we need to be called back later to store our data
@@ -318,7 +318,7 @@
{
char buf[SPRINT_MAX_LEN];
char *mte_default_user =
- ds_get_string(DS_APPLICATION_ID, DS_AGENT_INTERNAL_SECNAME);
+ netsnmp_ds_get_string(NETSNMP_DS_APPLICATION_ID, NETSNMP_DS_AGENT_INTERNAL_SECNAME);
if (strncmp(line, "yes", 3) == 0) {
@@ -452,7 +452,7 @@
if (StorageNew->pdu_securityNameLen == 0) {
char *mte_default_user =
- ds_get_string(DS_APPLICATION_ID, DS_AGENT_INTERNAL_SECNAME);
+ netsnmp_ds_get_string(NETSNMP_DS_APPLICATION_ID, NETSNMP_DS_AGENT_INTERNAL_SECNAME);
if (mte_default_user) {
StorageNew->pdu_securityName = strdup(mte_default_user);
StorageNew->pdu_securityNameLen = strlen(mte_default_user);
diff --git a/agent/mibgroup/mibII/snmp_mib.c b/agent/mibgroup/mibII/snmp_mib.c
index d14db11..c2474df 100644
--- a/agent/mibgroup/mibII/snmp_mib.c
+++ b/agent/mibgroup/mibII/snmp_mib.c
@@ -229,11 +229,11 @@
case COMMIT:
snmp_enableauthentrapsset = 1;
- snmp_save_persistent(ds_get_string(DS_LIBRARY_ID, DS_LIB_APPTYPE));
+ snmp_save_persistent(netsnmp_ds_get_string(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_APPTYPE));
(void) snmp_call_callbacks(SNMP_CALLBACK_LIBRARY,
SNMP_CALLBACK_STORE_DATA, NULL);
- snmp_clean_persistent(ds_get_string
- (DS_LIBRARY_ID, DS_LIB_APPTYPE));
+ snmp_clean_persistent(netsnmp_ds_get_string
+ (NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_APPTYPE));
break;
case FREE: /* Free any resources allocated */
diff --git a/agent/mibgroup/mibII/sysORTable.c b/agent/mibgroup/mibII/sysORTable.c
index 4b05d49..e681004 100644
--- a/agent/mibgroup/mibII/sysORTable.c
+++ b/agent/mibgroup/mibII/sysORTable.c
@@ -86,7 +86,7 @@
*/
#ifdef USING_AGENTX_SUBAGENT_MODULE
- if (ds_get_boolean(DS_APPLICATION_ID, DS_AGENT_ROLE) == MASTER_AGENT)
+ if (netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID, NETSNMP_DS_AGENT_ROLE) == MASTER_AGENT)
(void) register_mib_priority("mibII/sysORTable",
(struct variable *)
sysORTable_variables,
diff --git a/agent/mibgroup/mibII/system_mib.c b/agent/mibgroup/mibII/system_mib.c
index 379265d..2c18aab 100644
--- a/agent/mibgroup/mibII/system_mib.c
+++ b/agent/mibgroup/mibII/system_mib.c
@@ -530,11 +530,11 @@
if (setvar != NULL) {
*setvar = 1;
}
- snmp_save_persistent(ds_get_string(DS_LIBRARY_ID, DS_LIB_APPTYPE));
+ snmp_save_persistent(netsnmp_ds_get_string(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_APPTYPE));
(void) snmp_call_callbacks(SNMP_CALLBACK_LIBRARY,
SNMP_CALLBACK_STORE_DATA, NULL);
- snmp_clean_persistent(ds_get_string
- (DS_LIBRARY_ID, DS_LIB_APPTYPE));
+ snmp_clean_persistent(netsnmp_ds_get_string
+ (NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_APPTYPE));
case FREE: /* Free any resources allocated */
diff --git a/agent/mibgroup/smux/smux.c b/agent/mibgroup/smux/smux.c
index 68c097d..a18200e 100644
--- a/agent/mibgroup/smux/smux.c
+++ b/agent/mibgroup/smux/smux.c
@@ -193,7 +193,7 @@
struct sockaddr_in lo_socket;
int one = 1;
- if (ds_get_boolean(DS_APPLICATION_ID, DS_AGENT_ROLE) == SUB_AGENT) {
+ if (netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID, NETSNMP_DS_AGENT_ROLE) == SUB_AGENT) {
smux_listen_sd = -1;
return;
}
diff --git a/agent/mibgroup/tunnel/tunnel.c b/agent/mibgroup/tunnel/tunnel.c
index 47d7592..a67c77f 100644
--- a/agent/mibgroup/tunnel/tunnel.c
+++ b/agent/mibgroup/tunnel/tunnel.c
@@ -186,7 +186,7 @@
"RFC 2667 TUNNEL-MIB implementation for "
"Linux 2.2.x kernels.");
- ds_set_string(DS_LIBRARY_ID, DS_LIB_APPTYPE, "snmpd");
+ netsnmp_ds_set_string(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_APPTYPE, "snmpd");
/*
* register ourselves with the agent to handle our mib tree
diff --git a/apps/notification_log.c b/apps/notification_log.c
index 679e7e6..fa104f5 100644
--- a/apps/notification_log.c
+++ b/apps/notification_log.c
@@ -446,8 +446,8 @@
/*
* disable flag
*/
- ds_register_config(ASN_BOOLEAN, "snmptrapd", "dontRetainLogs",
- DS_APPLICATION_ID, DS_APP_DONT_LOG);
+ netsnmp_ds_register_config(ASN_BOOLEAN, "snmptrapd", "dontRetainLogs",
+ NETSNMP_DS_APPLICATION_ID, NETSNMP_DS_APP_DONT_LOG);
}
u_long default_num = 0;
@@ -471,8 +471,10 @@
u_long tmpul;
int col;
- if (ds_get_boolean(DS_APPLICATION_ID, DS_APP_DONT_LOG))
+ if (netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_APP_DONT_LOG)) {
return;
+ }
DEBUGMSGTL(("log_notification", "logging something\n"));
row = netsnmp_create_table_data_row();
diff --git a/apps/notification_log.h b/apps/notification_log.h
index acdf9fd..ceb9429 100644
--- a/apps/notification_log.h
+++ b/apps/notification_log.h
@@ -13,7 +13,7 @@
log_notification(struct hostent *host, netsnmp_pdu *pdu,
netsnmp_transport *transport);
-#define DS_APP_DONT_LOG 9 /* must match notification_log. */
+#define NETSNMP_DS_APP_DONT_LOG 9 /* must match notification_log. */
/*
* column number definitions for table nlmLogTable
diff --git a/apps/snmpbulkwalk.c b/apps/snmpbulkwalk.c
index 0f0d87f..bedbe7f 100644
--- a/apps/snmpbulkwalk.c
+++ b/apps/snmpbulkwalk.c
@@ -72,9 +72,9 @@
#include <net-snmp/net-snmp-includes.h>
-#define DS_WALK_INCLUDE_REQUESTED 1
-#define DS_WALK_PRINT_STATISTICS 2
-#define DS_WALK_DONT_CHECK_LEXICOGRAPHIC 3
+#define NETSNMP_DS_WALK_INCLUDE_REQUESTED 1
+#define NETSNMP_DS_WALK_PRINT_STATISTICS 2
+#define NETSNMP_DS_WALK_DONT_CHECK_LEXICOGRAPHIC 3
oid objid_mib[] = { 1, 3, 6, 1, 2, 1 };
int numprinted = 0;
@@ -132,13 +132,13 @@
while (*optarg) {
switch (*optarg++) {
case 'c':
- ds_toggle_boolean(DS_APPLICATION_ID,
- DS_WALK_DONT_CHECK_LEXICOGRAPHIC);
+ netsnmp_ds_toggle_boolean(NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_WALK_DONT_CHECK_LEXICOGRAPHIC);
break;
case 'i':
- ds_toggle_boolean(DS_APPLICATION_ID,
- DS_WALK_INCLUDE_REQUESTED);
+ netsnmp_ds_toggle_boolean(NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_WALK_INCLUDE_REQUESTED);
break;
case 'n':
@@ -164,8 +164,8 @@
break;
case 'p':
- ds_toggle_boolean(DS_APPLICATION_ID,
- DS_WALK_PRINT_STATISTICS);
+ netsnmp_ds_toggle_boolean(NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_WALK_PRINT_STATISTICS);
break;
default:
@@ -195,13 +195,15 @@
int check;
int exitval = 0;
- ds_register_config(ASN_BOOLEAN, "snmpwalk", "includeRequested",
- DS_APPLICATION_ID, DS_WALK_INCLUDE_REQUESTED);
- ds_register_config(ASN_BOOLEAN, "snmpwalk", "printStatistics",
- DS_APPLICATION_ID, DS_WALK_PRINT_STATISTICS);
- ds_register_config(ASN_BOOLEAN, "snmpwalk", "dontCheckOrdering",
- DS_APPLICATION_ID,
- DS_WALK_DONT_CHECK_LEXICOGRAPHIC);
+ netsnmp_ds_register_config(ASN_BOOLEAN, "snmpwalk", "includeRequested",
+ NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_WALK_INCLUDE_REQUESTED);
+ netsnmp_ds_register_config(ASN_BOOLEAN, "snmpwalk", "printStatistics",
+ NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_WALK_PRINT_STATISTICS);
+ netsnmp_ds_register_config(ASN_BOOLEAN, "snmpwalk", "dontCheckOrdering",
+ NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_WALK_DONT_CHECK_LEXICOGRAPHIC);
/*
* get the common command line arguments
@@ -259,10 +261,10 @@
running = 1;
- check =
- !ds_get_boolean(DS_APPLICATION_ID,
- DS_WALK_DONT_CHECK_LEXICOGRAPHIC);
- if (ds_get_boolean(DS_APPLICATION_ID, DS_WALK_INCLUDE_REQUESTED)) {
+ check = !netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_WALK_DONT_CHECK_LEXICOGRAPHIC);
+ if (netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_WALK_INCLUDE_REQUESTED)) {
snmp_get_and_print(ss, root, rootlen);
}
@@ -379,7 +381,8 @@
}
snmp_close(ss);
- if (ds_get_boolean(DS_APPLICATION_ID, DS_WALK_PRINT_STATISTICS)) {
+ if (netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_WALK_PRINT_STATISTICS)) {
printf("Variables found: %d\n", numprinted);
}
diff --git a/apps/snmpdelta.c b/apps/snmpdelta.c
index a408f2a..0d78c97 100644
--- a/apps/snmpdelta.c
+++ b/apps/snmpdelta.c
@@ -75,7 +75,7 @@
#include <net-snmp/net-snmp-includes.h>
#define MAX_ARGS 256
-#define DS_APP_DONT_FIX_PDUS 0
+#define NETSNMP_DS_APP_DONT_FIX_PDUS 0
const char *SumFile = "Sum";
@@ -141,7 +141,8 @@
while (*optarg) {
switch ((opt = *optarg++)) {
case 'f':
- ds_toggle_boolean(DS_APPLICATION_ID, DS_APP_DONT_FIX_PDUS);
+ netsnmp_ds_toggle_boolean(NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_APP_DONT_FIX_PDUS);
break;
case 'p':
period = atoi(argv[optind++]);
@@ -696,8 +697,8 @@
/*
* retry if the errored variable was successfully removed
*/
- if (!ds_get_boolean
- (DS_APPLICATION_ID, DS_APP_DONT_FIX_PDUS)) {
+ if (!netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_APP_DONT_FIX_PDUS)) {
pdu = snmp_fix_pdu(response, SNMP_MSG_GET);
snmp_free_pdu(response);
response = NULL;
diff --git a/apps/snmpget.c b/apps/snmpget.c
index cfccc74..1618866 100644
--- a/apps/snmpget.c
+++ b/apps/snmpget.c
@@ -75,7 +75,7 @@
int failures = 0;
-#define DS_APP_DONT_FIX_PDUS 0
+#define NETSNMP_DS_APP_DONT_FIX_PDUS 0
static void
optProc(int argc, char *const *argv, int opt)
@@ -85,7 +85,8 @@
while (*optarg) {
switch (*optarg++) {
case 'f':
- ds_toggle_boolean(DS_APPLICATION_ID, DS_APP_DONT_FIX_PDUS);
+ netsnmp_ds_toggle_boolean(NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_APP_DONT_FIX_PDUS);
break;
default:
fprintf(stderr, "Unknown flag passed to -C: %c\n",
@@ -210,8 +211,9 @@
vars && count != response->errindex;
vars = vars->next_variable, count++)
/*EMPTY*/;
- if (vars)
+ if (vars) {
fprint_objid(stderr, vars->name, vars->name_length);
+ }
fprintf(stderr, "\n");
}
exitval = 2;
@@ -219,12 +221,14 @@
/*
* retry if the errored variable was successfully removed
*/
- if (!ds_get_boolean(DS_APPLICATION_ID, DS_APP_DONT_FIX_PDUS)) {
+ if (!netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_APP_DONT_FIX_PDUS)) {
pdu = snmp_fix_pdu(response, SNMP_MSG_GET);
snmp_free_pdu(response);
response = NULL;
- if (pdu != NULL)
+ if (pdu != NULL) {
goto retry;
+ }
}
} /* endif -- SNMP_ERR_NOERROR */
diff --git a/apps/snmpgetnext.c b/apps/snmpgetnext.c
index 0c5207b..5502523 100644
--- a/apps/snmpgetnext.c
+++ b/apps/snmpgetnext.c
@@ -71,7 +71,7 @@
#include <net-snmp/net-snmp-includes.h>
-#define DS_APP_DONT_FIX_PDUS 0
+#define NETSNMP_DS_APP_DONT_FIX_PDUS 0
static void
optProc(int argc, char *const *argv, int opt)
@@ -81,7 +81,8 @@
while (*optarg) {
switch (*optarg++) {
case 'f':
- ds_toggle_boolean(DS_APPLICATION_ID, DS_APP_DONT_FIX_PDUS);
+ netsnmp_ds_toggle_boolean(NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_APP_DONT_FIX_PDUS);
break;
default:
fprintf(stderr, "Unknown flag passed to -C: %c\n",
@@ -207,7 +208,8 @@
/*
* retry if the errored variable was successfully removed
*/
- if (!ds_get_boolean(DS_APPLICATION_ID, DS_APP_DONT_FIX_PDUS)) {
+ if (!netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_APP_DONT_FIX_PDUS)) {
pdu = snmp_fix_pdu(response, SNMP_MSG_GETNEXT);
snmp_free_pdu(response);
response = NULL;
diff --git a/apps/snmpnetstat/main.c b/apps/snmpnetstat/main.c
index 2fb3ff1..49e3c2a 100644
--- a/apps/snmpnetstat/main.c
+++ b/apps/snmpnetstat/main.c
@@ -277,7 +277,7 @@
init_snmp("snmpapp");
if (version == SNMP_DEFAULT_VERSION) {
- version = ds_get_int(DS_LIBRARY_ID, DS_LIB_SNMPVERSION);
+ version = netsnmp_ds_get_int(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_SNMPVERSION);
}
if (hostname == NULL && optind < argc) {
hostname = argv[optind++];
@@ -313,7 +313,7 @@
if (version == SNMP_VERSION_1 || version == SNMP_VERSION_2c) {
if (!community
&& !(community =
- ds_get_string(DS_LIBRARY_ID, DS_LIB_COMMUNITY))) {
+ netsnmp_ds_get_string(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_COMMUNITY))) {
fprintf(stderr, "Missing community name.\n");
exit(1);
}
diff --git a/apps/snmpstatus.c b/apps/snmpstatus.c
index 2356a9b..72dc82d 100644
--- a/apps/snmpstatus.c
+++ b/apps/snmpstatus.c
@@ -100,7 +100,7 @@
size_t length_ipOutRequests =
sizeof(objid_ipOutRequests) / sizeof(oid);
-#define DS_APP_DONT_FIX_PDUS 0
+#define NETSNMP_DS_APP_DONT_FIX_PDUS 0
static void
optProc(int argc, char *const *argv, int opt)
@@ -110,7 +110,8 @@
while (*optarg) {
switch (*optarg++) {
case 'f':
- ds_toggle_boolean(DS_APPLICATION_ID, DS_APP_DONT_FIX_PDUS);
+ netsnmp_ds_toggle_boolean(NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_APP_DONT_FIX_PDUS);
break;
default:
fprintf(stderr, "Unknown flag passed to -C: %c\n",
@@ -239,7 +240,8 @@
/*
* retry if the errored variable was successfully removed
*/
- if (!ds_get_boolean(DS_APPLICATION_ID, DS_APP_DONT_FIX_PDUS)) {
+ if (!netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_APP_DONT_FIX_PDUS)) {
pdu = snmp_fix_pdu(response, SNMP_MSG_GET);
snmp_free_pdu(response);
response = NULL;
diff --git a/apps/snmptable.c b/apps/snmptable.c
index 27d37c7..8ff95cb 100644
--- a/apps/snmptable.c
+++ b/apps/snmptable.c
@@ -593,10 +593,10 @@
}
i = vars->name_length - rootlen + 1;
if (localdebug || show_index) {
- if (ds_get_boolean
- (DS_LIBRARY_ID, DS_LIB_EXTENDED_INDEX))
+ if (netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID,
+ NETSNMP_DS_LIB_EXTENDED_INDEX)) {
name_p = strchr(buf, '[');
- else {
+ } else {
switch (snmp_get_suffix_only()) {
case 2:
name_p = strrchr(buf, ':');
@@ -612,8 +612,9 @@
name_p = strchr(name_p, '.') + 1;
}
}
- if (localdebug)
+ if (localdebug) {
printf("Index: %s\n", name_p);
+ }
if (show_index) {
indices[entries - 1] = strdup(name_p);
i = strlen(name_p);
@@ -749,10 +750,10 @@
printf("%s => taken\n",
buf ? (char *) buf : "[NIL]");
}
- if (ds_get_boolean
- (DS_LIBRARY_ID, DS_LIB_EXTENDED_INDEX))
+ if (netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID,
+ NETSNMP_DS_LIB_EXTENDED_INDEX)) {
name_p = strchr(buf, '[');
- else {
+ } else {
switch (snmp_get_suffix_only()) {
case 2:
name_p = strrchr(buf, ':');
diff --git a/apps/snmptranslate.c b/apps/snmptranslate.c
index 233be57..85d9148 100644
--- a/apps/snmptranslate.c
+++ b/apps/snmptranslate.c
@@ -254,7 +254,8 @@
exit(1);
}
exit(0);
- } else if (ds_get_boolean(DS_LIBRARY_ID, DS_LIB_REGEX_ACCESS)) {
+ } else if (netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID,
+ NETSNMP_DS_LIB_REGEX_ACCESS)) {
if (0 == get_wild_node(current_name, name, &name_length)) {
fprintf(stderr,
"Unable to find a matching object identifier for \"%s\"\n",
diff --git a/apps/snmptrap.c b/apps/snmptrap.c
index 9d85980..8f66d60 100644
--- a/apps/snmptrap.c
+++ b/apps/snmptrap.c
@@ -183,7 +183,8 @@
session.callback = snmp_input;
session.callback_magic = NULL;
- ds_set_int(DS_LIBRARY_ID, DS_LIB_DEFAULT_PORT, SNMP_TRAP_PORT);
+ netsnmp_ds_set_int(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_DEFAULT_PORT,
+ SNMP_TRAP_PORT);
if (session.version == SNMP_VERSION_3 && !inform) {
/*
diff --git a/apps/snmptrapd.c b/apps/snmptrapd.c
index 29bacce..480cdd1 100644
--- a/apps/snmptrapd.c
+++ b/apps/snmptrapd.c
@@ -103,9 +103,9 @@
int deny_severity = LOG_WARNING;
#endif
-#define DS_APP_NUMERIC_IP 8 /* must not conflict with agent's DS booleans */
+#define NETSNMP_DS_APP_NUMERIC_IP 8 /* must not conflict with agent's DS booleans */
/*
- * #define DS_APP_DONT_LOG 9 defined in notification_log.h
+ * #define NETSNMP_DS_APP_DONT_LOG 9 defined in notification_log.h
*/
#ifndef BSD4_3
@@ -454,9 +454,11 @@
num_received++;
- if (!ds_get_boolean(DS_APPLICATION_ID, DS_APP_NUMERIC_IP)) {
+ if (!netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_APP_NUMERIC_IP)) {
host = gethostbyaddr((char *) pdu->agent_addr, 4, AF_INET);
}
+
if (pdu->trap_type == SNMP_TRAP_ENTERPRISESPECIFIC) {
memcpy(trapOid, pdu->enterprise, sizeof(oid) * trapOidLen);
if (trapOid[trapOidLen - 1] != 0) {
@@ -572,7 +574,8 @@
} else if (pdu->command == SNMP_MSG_TRAP2 ||
pdu->command == SNMP_MSG_INFORM) {
num_received++;
- if (!ds_get_boolean(DS_APPLICATION_ID, DS_APP_NUMERIC_IP)) {
+ if (!netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_APP_NUMERIC_IP)) {
/*
* Right, apparently a name lookup is wanted. This is only
* reasonable for the UDP and TCP transport domains (we
@@ -640,7 +643,8 @@
rbuf[o_len] = '\0';
}
- if (!ds_get_boolean(DS_APPLICATION_ID, DS_APP_NUMERIC_IP)) {
+ if (!netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_APP_NUMERIC_IP)) {
/*
* Right, apparently a name lookup is wanted. This is only
* reasonable for the UDP and TCP transport domains (we
@@ -983,8 +987,8 @@
case 'c':
if (optarg != NULL) {
- ds_set_string(DS_LIBRARY_ID, DS_LIB_OPTIONALCONFIG,
- optarg);
+ netsnmp_ds_set_string(NETSNMP_DS_LIBRARY_ID,
+ NETSNMP_DS_LIB_OPTIONALCONFIG, optarg);
} else {
usage();
exit(1);
@@ -992,7 +996,8 @@
break;
case 'C':
- ds_set_boolean(DS_LIBRARY_ID, DS_LIB_DONT_READ_CONFIGS, 1);
+ netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID,
+ NETSNMP_DS_LIB_DONT_READ_CONFIGS, 1);
break;
case 'd':
@@ -1095,7 +1100,8 @@
break;
case 'n':
- ds_set_boolean(DS_APPLICATION_ID, DS_APP_NUMERIC_IP, 1);
+ netsnmp_ds_set_boolean(NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_APP_NUMERIC_IP, 1);
break;
case 'o':
@@ -1206,14 +1212,16 @@
/*
* make us a agentx client.
*/
- ds_set_boolean(DS_APPLICATION_ID, DS_AGENT_ROLE, 1);
+ netsnmp_ds_set_boolean(NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_AGENT_ROLE, 1);
}
#endif
/*
* don't fail if we can't do agentx (ie, socket not there, or not root)
*/
- ds_toggle_boolean(DS_APPLICATION_ID, DS_AGENT_NO_ROOT_ACCESS);
+ netsnmp_ds_toggle_boolean(NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_AGENT_NO_ROOT_ACCESS);
/*
* initialize the agent library
@@ -1241,7 +1249,8 @@
trap2_fmt_str = strdup(trap1_fmt_str_remember);
}
- if (ds_get_boolean(DS_APPLICATION_ID, DS_AGENT_QUIT_IMMEDIATELY)) {
+ if (netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_AGENT_QUIT_IMMEDIATELY)) {
/*
* just starting up to process specific configuration and then
* shutting down immediately.
diff --git a/apps/snmpusm.c b/apps/snmpusm.c
index e82b735..38d074e 100644
--- a/apps/snmpusm.c
+++ b/apps/snmpusm.c
@@ -287,8 +287,9 @@
* do we have a securityName? If not, copy the default
*/
if (session.securityName == NULL) {
- session.securityName =
- strdup(ds_get_string(DS_LIBRARY_ID, DS_LIB_SECNAME));
+ session.securityName =
+ strdup(netsnmp_ds_get_string(NETSNMP_DS_LIBRARY_ID,
+ NETSNMP_DS_LIB_SECNAME));
}
/*
diff --git a/apps/snmpwalk.c b/apps/snmpwalk.c
index 4c6a4df..99e4d33 100644
--- a/apps/snmpwalk.c
+++ b/apps/snmpwalk.c
@@ -71,9 +71,9 @@
#include <net-snmp/net-snmp-includes.h>
-#define DS_WALK_INCLUDE_REQUESTED 1
-#define DS_WALK_PRINT_STATISTICS 2
-#define DS_WALK_DONT_CHECK_LEXICOGRAPHIC 3
+#define NETSNMP_DS_WALK_INCLUDE_REQUESTED 1
+#define NETSNMP_DS_WALK_PRINT_STATISTICS 2
+#define NETSNMP_DS_WALK_DONT_CHECK_LEXICOGRAPHIC 3
oid objid_mib[] = { 1, 3, 6, 1, 2, 1 };
int numprinted = 0;
@@ -123,18 +123,18 @@
while (*optarg) {
switch (*optarg++) {
case 'i':
- ds_toggle_boolean(DS_APPLICATION_ID,
- DS_WALK_INCLUDE_REQUESTED);
+ netsnmp_ds_toggle_boolean(NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_WALK_INCLUDE_REQUESTED);
break;
case 'p':
- ds_toggle_boolean(DS_APPLICATION_ID,
- DS_WALK_PRINT_STATISTICS);
+ netsnmp_ds_toggle_boolean(NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_WALK_PRINT_STATISTICS);
break;
case 'c':
- ds_toggle_boolean(DS_APPLICATION_ID,
- DS_WALK_DONT_CHECK_LEXICOGRAPHIC);
+ netsnmp_ds_toggle_boolean(NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_WALK_DONT_CHECK_LEXICOGRAPHIC);
break;
default:
fprintf(stderr, "Unknown flag passed to -C: %c\n",
@@ -163,13 +163,17 @@
int check;
int exitval = 0;
- ds_register_config(ASN_BOOLEAN, "snmpwalk", "includeRequested",
- DS_APPLICATION_ID, DS_WALK_INCLUDE_REQUESTED);
- ds_register_config(ASN_BOOLEAN, "snmpwalk", "printStatistics",
- DS_APPLICATION_ID, DS_WALK_PRINT_STATISTICS);
- ds_register_config(ASN_BOOLEAN, "snmpwalk", "dontCheckOrdering",
- DS_APPLICATION_ID,
- DS_WALK_DONT_CHECK_LEXICOGRAPHIC);
+ netsnmp_ds_register_config(ASN_BOOLEAN, "snmpwalk", "includeRequested",
+ NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_WALK_INCLUDE_REQUESTED);
+
+ netsnmp_ds_register_config(ASN_BOOLEAN, "snmpwalk", "printStatistics",
+ NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_WALK_PRINT_STATISTICS);
+
+ netsnmp_ds_register_config(ASN_BOOLEAN, "snmpwalk", "dontCheckOrdering",
+ NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_WALK_DONT_CHECK_LEXICOGRAPHIC);
/*
* get the common command line arguments
@@ -228,9 +232,9 @@
running = 1;
check =
- !ds_get_boolean(DS_APPLICATION_ID,
- DS_WALK_DONT_CHECK_LEXICOGRAPHIC);
- if (ds_get_boolean(DS_APPLICATION_ID, DS_WALK_INCLUDE_REQUESTED)) {
+ !netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
+ NETSNMP_DS_WALK_DONT_CHECK_LEXICOGRAPHIC);
+ if (netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID, NETSNMP_DS_WALK_INCLUDE_REQUESTED)) {
snmp_get_and_print(ss, root, rootlen);
}
@@ -339,7 +343,7 @@
}
snmp_close(ss);
- if (ds_get_boolean(DS_APPLICATION_ID, DS_WALK_PRINT_STATISTICS)) {
+ if (netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID, NETSNMP_DS_WALK_PRINT_STATISTICS)) {
printf("Variables found: %d\n", numprinted);
}
