Add #include <net-snmp/library/snmp.h> and/or
#include <net-snmp/library/snmp_impl.h> where necessary.
---
include/net-snmp/library/snmp_api.h | 2 +-
include/net-snmp/library/snmp_transport.h | 2 ++
include/net-snmp/types.h | 2 --
snmplib/cert_util.c | 1 +
snmplib/snmp-tc.c | 1 +
snmplib/snmp.c | 1 +
snmplib/snmp_client.c | 3 +++
snmplib/transports/snmpAAL5PVCDomain.c | 1 +
snmplib/transports/snmpDTLSUDPDomain.c | 1 +
snmplib/transports/snmpIPv4BaseDomain.c | 1 +
snmplib/transports/snmpIPv6BaseDomain.c | 1 +
snmplib/transports/snmpSSHDomain.c | 1 +
snmplib/transports/snmpSTDDomain.c | 2 +-
snmplib/transports/snmpTCPDomain.c | 1 +
snmplib/transports/snmpTCPIPv6Domain.c | 1 +
snmplib/transports/snmpTLSBaseDomain.c | 2 ++
snmplib/transports/snmpTLSTCPDomain.c | 1 +
snmplib/transports/snmpUDPDomain.c | 1 +
snmplib/transports/snmpUDPIPv6Domain.c | 1 +
snmplib/transports/snmpUnixDomain.c | 2 ++
snmplib/vacm.c | 2 ++
21 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/include/net-snmp/library/snmp_api.h
b/include/net-snmp/library/snmp_api.h
index a7d62e36a486..6a9adeec2093 100644
--- a/include/net-snmp/library/snmp_api.h
+++ b/include/net-snmp/library/snmp_api.h
@@ -760,7 +760,7 @@ struct netsnmp_transport_s;
struct session_list {
struct session_list *next;
netsnmp_session *session;
- netsnmp_transport *transport;
+ struct netsnmp_transport_s *transport;
struct snmp_internal_session *internal;
};
diff --git a/include/net-snmp/library/snmp_transport.h
b/include/net-snmp/library/snmp_transport.h
index 5f3d3266194e..7d09b104b3e2 100644
--- a/include/net-snmp/library/snmp_transport.h
+++ b/include/net-snmp/library/snmp_transport.h
@@ -1,6 +1,8 @@
#ifndef _SNMP_TRANSPORT_H
#define _SNMP_TRANSPORT_H
+#include <net-snmp/types.h>
+
/*
* Portions of this file are copyrighted by:
* Copyright (c) 2016 VMware, Inc. All rights reserved.
diff --git a/include/net-snmp/types.h b/include/net-snmp/types.h
index fe4deccd4efd..755740327908 100644
--- a/include/net-snmp/types.h
+++ b/include/net-snmp/types.h
@@ -513,8 +513,6 @@ typedef struct netsnmp_large_fd_set_s {
fd_set lfs_set;
} netsnmp_large_fd_set;
-#include <net-snmp/library/snmp_api.h>
-
#ifdef __cplusplus
}
#endif
diff --git a/snmplib/cert_util.c b/snmplib/cert_util.c
index ad79e37f5a56..890214afb577 100644
--- a/snmplib/cert_util.c
+++ b/snmplib/cert_util.c
@@ -80,6 +80,7 @@ netsnmp_feature_child_of(tls_fingerprint_build, cert_util_all)
#include <net-snmp/output_api.h>
#include <net-snmp/config_api.h>
+#include <net-snmp/library/snmp.h>
#include <net-snmp/library/snmp_assert.h>
#include <net-snmp/library/snmp_transport.h>
#include <net-snmp/library/system.h>
diff --git a/snmplib/snmp-tc.c b/snmplib/snmp-tc.c
index f5531b142e13..11cc7ace4c3a 100644
--- a/snmplib/snmp-tc.c
+++ b/snmplib/snmp-tc.c
@@ -30,6 +30,7 @@
#endif
#include <net-snmp/types.h>
+#include <net-snmp/library/snmp.h>
#include <net-snmp/library/snmp-tc.h> /* for "internal" definitions */
#include <net-snmp/library/snmp_api.h>
diff --git a/snmplib/snmp.c b/snmplib/snmp.c
index 661ffac9e816..2b7e6faf1b04 100644
--- a/snmplib/snmp.c
+++ b/snmplib/snmp.c
@@ -69,6 +69,7 @@ SOFTWARE.
#include <net-snmp/library/asn1.h>
#include <net-snmp/library/snmp.h> /* for "internal" definitions */
#include <net-snmp/library/snmp_api.h>
+#include <net-snmp/library/snmp_impl.h>
#include <net-snmp/library/mib.h>
/** @mainpage Net-SNMP Coding Documentation
diff --git a/snmplib/snmp_client.c b/snmplib/snmp_client.c
index 2a463518556a..b202aaa55e1d 100644
--- a/snmplib/snmp_client.c
+++ b/snmplib/snmp_client.c
@@ -95,8 +95,11 @@ SOFTWARE.
#include <net-snmp/agent/ds_agent.h>
#include <net-snmp/library/default_store.h>
+#include <net-snmp/library/snmp.h>
+#include <net-snmp/library/snmp-tc.h>
#include <net-snmp/library/snmp_api.h>
#include <net-snmp/library/snmp_client.h>
+#include <net-snmp/library/snmp_impl.h>
#include <net-snmp/library/snmp_secmod.h>
#include <net-snmp/library/snmpusm.h>
#include <net-snmp/library/mib.h>
diff --git a/snmplib/transports/snmpAAL5PVCDomain.c
b/snmplib/transports/snmpAAL5PVCDomain.c
index ccc550031555..e826ac0c3e57 100644
--- a/snmplib/transports/snmpAAL5PVCDomain.c
+++ b/snmplib/transports/snmpAAL5PVCDomain.c
@@ -31,6 +31,7 @@
#include <net-snmp/output_api.h>
#include <net-snmp/config_api.h>
+#include <net-snmp/library/snmp.h>
#include <net-snmp/library/snmp_transport.h>
#include <net-snmp/library/tools.h>
diff --git a/snmplib/transports/snmpDTLSUDPDomain.c
b/snmplib/transports/snmpDTLSUDPDomain.c
index 4965eca91d01..392cb8246612 100644
--- a/snmplib/transports/snmpDTLSUDPDomain.c
+++ b/snmplib/transports/snmpDTLSUDPDomain.c
@@ -26,6 +26,7 @@ netsnmp_feature_require(sockaddr_size)
#include <net-snmp/library/snmpDTLSUDPDomain.h>
#include <net-snmp/library/snmpUDPIPv6Domain.h>
#include <net-snmp/library/snmp_assert.h>
+#include <net-snmp/library/snmp_impl.h>
#include <stdio.h>
#include <sys/types.h>
diff --git a/snmplib/transports/snmpIPv4BaseDomain.c
b/snmplib/transports/snmpIPv4BaseDomain.c
index 910bb56234db..50143ec1d925 100644
--- a/snmplib/transports/snmpIPv4BaseDomain.c
+++ b/snmplib/transports/snmpIPv4BaseDomain.c
@@ -33,6 +33,7 @@
#endif
#include <net-snmp/types.h>
+#include <net-snmp/library/snmp.h>
#include <net-snmp/library/snmp_debug.h>
#include <net-snmp/library/default_store.h>
#include <net-snmp/library/system.h>
diff --git a/snmplib/transports/snmpIPv6BaseDomain.c
b/snmplib/transports/snmpIPv6BaseDomain.c
index 4336b6a6ae9d..850a36a9bf0f 100644
--- a/snmplib/transports/snmpIPv6BaseDomain.c
+++ b/snmplib/transports/snmpIPv6BaseDomain.c
@@ -52,6 +52,7 @@
#endif
#include <net-snmp/types.h>
+#include <net-snmp/library/snmp.h>
#include <net-snmp/library/snmp_debug.h>
#include <net-snmp/library/default_store.h>
#include <net-snmp/library/snmp_logging.h>
diff --git a/snmplib/transports/snmpSSHDomain.c
b/snmplib/transports/snmpSSHDomain.c
index 3ca4f81c9f93..de3e0968c454 100644
--- a/snmplib/transports/snmpSSHDomain.c
+++ b/snmplib/transports/snmpSSHDomain.c
@@ -56,6 +56,7 @@
#include <net-snmp/library/system.h>
#include <net-snmp/library/default_store.h>
+#include <net-snmp/library/snmp.h>
#include <net-snmp/library/snmp_transport.h>
#include <net-snmp/library/snmpIPv4BaseDomain.h>
#include <net-snmp/library/snmpSocketBaseDomain.h>
diff --git a/snmplib/transports/snmpSTDDomain.c
b/snmplib/transports/snmpSTDDomain.c
index 5845f25937c6..b991625b4b2c 100644
--- a/snmplib/transports/snmpSTDDomain.c
+++ b/snmplib/transports/snmpSTDDomain.c
@@ -25,7 +25,7 @@
#include <net-snmp/types.h>
#include <net-snmp/output_api.h>
-
+#include <net-snmp/library/snmp.h>
#include <net-snmp/library/snmp_transport.h>
#include <net-snmp/library/tools.h>
diff --git a/snmplib/transports/snmpTCPDomain.c
b/snmplib/transports/snmpTCPDomain.c
index 00ad39af03cf..f039687b7100 100644
--- a/snmplib/transports/snmpTCPDomain.c
+++ b/snmplib/transports/snmpTCPDomain.c
@@ -38,6 +38,7 @@
#include <net-snmp/types.h>
#include <net-snmp/output_api.h>
+#include <net-snmp/library/snmp.h>
#include <net-snmp/library/snmpIPv4BaseDomain.h>
#include <net-snmp/library/snmpSocketBaseDomain.h>
#include <net-snmp/library/snmpTCPBaseDomain.h>
diff --git a/snmplib/transports/snmpTCPIPv6Domain.c
b/snmplib/transports/snmpTCPIPv6Domain.c
index bdd5c2906835..c522ddaa7e36 100644
--- a/snmplib/transports/snmpTCPIPv6Domain.c
+++ b/snmplib/transports/snmpTCPIPv6Domain.c
@@ -44,6 +44,7 @@
#include <net-snmp/output_api.h>
#include <net-snmp/config_api.h>
+#include <net-snmp/library/snmp.h>
#include <net-snmp/library/snmp_transport.h>
#include <net-snmp/library/snmpSocketBaseDomain.h>
#include <net-snmp/library/snmpTCPBaseDomain.h>
diff --git a/snmplib/transports/snmpTLSBaseDomain.c
b/snmplib/transports/snmpTLSBaseDomain.c
index c0bdde997320..602876ed383b 100644
--- a/snmplib/transports/snmpTLSBaseDomain.c
+++ b/snmplib/transports/snmpTLSBaseDomain.c
@@ -44,8 +44,10 @@ netsnmp_feature_require(cert_util)
#include <net-snmp/library/snmp_logging.h>
#include <net-snmp/library/snmp_api.h>
#include <net-snmp/library/tools.h>
+#include <net-snmp/library/snmp.h>
#include <net-snmp/library/snmp_debug.h>
#include <net-snmp/library/snmp_assert.h>
+#include <net-snmp/library/snmp_impl.h>
#include <net-snmp/library/snmp_transport.h>
#include <net-snmp/library/snmp_secmod.h>
#include <net-snmp/library/read_config.h>
diff --git a/snmplib/transports/snmpTLSTCPDomain.c
b/snmplib/transports/snmpTLSTCPDomain.c
index 550dcad61431..0f5902747b9b 100644
--- a/snmplib/transports/snmpTLSTCPDomain.c
+++ b/snmplib/transports/snmpTLSTCPDomain.c
@@ -57,6 +57,7 @@ netsnmp_feature_require(cert_util)
#include <net-snmp/output_api.h>
#include <net-snmp/config_api.h>
#include <net-snmp/library/snmp_assert.h>
+#include <net-snmp/library/snmp_impl.h>
#include <net-snmp/library/snmpIPv4BaseDomain.h>
#include <net-snmp/library/snmpSocketBaseDomain.h>
#include <net-snmp/library/snmpTLSBaseDomain.h>
diff --git a/snmplib/transports/snmpUDPDomain.c
b/snmplib/transports/snmpUDPDomain.c
index 7543b3419a7a..7bcd0219cfb9 100644
--- a/snmplib/transports/snmpUDPDomain.c
+++ b/snmplib/transports/snmpUDPDomain.c
@@ -61,6 +61,7 @@
#include <net-snmp/output_api.h>
#include <net-snmp/config_api.h>
+#include <net-snmp/library/snmp_impl.h>
#include <net-snmp/library/snmp_transport.h>
#include <net-snmp/library/snmpSocketBaseDomain.h>
#include <net-snmp/library/system.h>
diff --git a/snmplib/transports/snmpUDPIPv6Domain.c
b/snmplib/transports/snmpUDPIPv6Domain.c
index 5b9313165296..5724817dd3dc 100644
--- a/snmplib/transports/snmpUDPIPv6Domain.c
+++ b/snmplib/transports/snmpUDPIPv6Domain.c
@@ -69,6 +69,7 @@ static const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT;
#include <net-snmp/output_api.h>
#include <net-snmp/config_api.h>
+#include <net-snmp/library/snmp_impl.h>
#include <net-snmp/library/snmp_transport.h>
#include <net-snmp/library/snmpSocketBaseDomain.h>
#include <net-snmp/library/tools.h>
diff --git a/snmplib/transports/snmpUnixDomain.c
b/snmplib/transports/snmpUnixDomain.c
index ab57accac16e..8c23db6f1786 100644
--- a/snmplib/transports/snmpUnixDomain.c
+++ b/snmplib/transports/snmpUnixDomain.c
@@ -32,6 +32,8 @@
#include <net-snmp/output_api.h>
#include <net-snmp/config_api.h>
+#include <net-snmp/library/snmp.h>
+#include <net-snmp/library/snmp_impl.h>
#include <net-snmp/library/snmp_transport.h>
#include <net-snmp/library/snmpSocketBaseDomain.h>
#include <net-snmp/library/system.h> /* mkdirhier */
diff --git a/snmplib/vacm.c b/snmplib/vacm.c
index 606920a1d886..2ee183e59203 100644
--- a/snmplib/vacm.c
+++ b/snmplib/vacm.c
@@ -60,6 +60,8 @@
#include <net-snmp/output_api.h>
#include <net-snmp/config_api.h>
+#include <net-snmp/library/snmp.h>
+#include <net-snmp/library/snmp-tc.h>
#include <net-snmp/library/snmp_api.h>
#include <net-snmp/library/system.h> /* strlcpy() */
#include <net-snmp/library/tools.h>
--
2.16.3
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Net-snmp-coders mailing list
Net-snmp-coders@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/net-snmp-coders
