diff options
author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-11-01 11:15:26 +0000 |
---|---|---|
committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-11-01 11:15:26 +0000 |
commit | 746f4ee6169d6cd8d8e5f8d6b3b368d3ac128ac6 (patch) | |
tree | 9a2cd7fff6f9e796968703bf3bb2cb7ca5c5bf82 /ASNMP/asnmp | |
parent | a288d4fc55907205181362fee9979dc5cd9b9d07 (diff) | |
download | ATCD-746f4ee6169d6cd8d8e5f8d6b3b368d3ac128ac6.tar.gz |
ChangeLogTag:Sat Nov 1 05:40:21 UTC 2003 Don Hinton <dhinton@dresystems.com>
Diffstat (limited to 'ASNMP/asnmp')
-rw-r--r-- | ASNMP/asnmp/address.cpp | 29 | ||||
-rw-r--r-- | ASNMP/asnmp/address.h | 3 | ||||
-rw-r--r-- | ASNMP/asnmp/asn1.cpp | 1 | ||||
-rw-r--r-- | ASNMP/asnmp/asn1.h | 2 | ||||
-rw-r--r-- | ASNMP/asnmp/ctr64.cpp | 1 | ||||
-rw-r--r-- | ASNMP/asnmp/integer.cpp | 3 | ||||
-rw-r--r-- | ASNMP/asnmp/octet.cpp | 10 | ||||
-rw-r--r-- | ASNMP/asnmp/oid.cpp | 4 | ||||
-rw-r--r-- | ASNMP/asnmp/oid.h | 2 | ||||
-rw-r--r-- | ASNMP/asnmp/pdu.cpp | 2 | ||||
-rw-r--r-- | ASNMP/asnmp/smi.h | 2 | ||||
-rw-r--r-- | ASNMP/asnmp/snmp.cpp | 3 | ||||
-rw-r--r-- | ASNMP/asnmp/timetick.cpp | 1 | ||||
-rw-r--r-- | ASNMP/asnmp/transaction.cpp | 1 | ||||
-rw-r--r-- | ASNMP/asnmp/vb.cpp | 5 | ||||
-rw-r--r-- | ASNMP/asnmp/vb.h | 2 | ||||
-rw-r--r-- | ASNMP/asnmp/wpdu.cpp | 1 | ||||
-rw-r--r-- | ASNMP/asnmp/wpdu.h | 2 |
18 files changed, 52 insertions, 22 deletions
diff --git a/ASNMP/asnmp/address.cpp b/ASNMP/asnmp/address.cpp index eea41707a15..72a910ddb07 100644 --- a/ASNMP/asnmp/address.cpp +++ b/ASNMP/asnmp/address.cpp @@ -37,6 +37,13 @@ =====================================================================*/ #include "asnmp/address.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_arpa_inet.h" +#include "ace/OS_NS_netdb.h" +#include "ace/OS_NS_stdlib.h" +#include "ace/OS_NS_stdio.h" +#include "ace/os_include/os_ctype.h" +#include "ace/OS_Memory.h" ACE_RCSID(asnmp, address, "$Id$") @@ -88,7 +95,7 @@ unsigned char& Address::operator[]( const int position) // overloaded equivlence operator, are two addresses equal? int operator==( const Address &lhs, const Address &rhs) { - if ( strcmp( (const char*) lhs, (const char*)rhs)==0) + if ( ACE_OS::strcmp( (const char*) lhs, (const char*)rhs)==0) return 1; else return 0; @@ -106,7 +113,7 @@ int operator!=( const Address &lhs, const Address &rhs) // overloaded > operator, is a1 > a2 int operator>( const Address &lhs, const Address &rhs) { - if ( strcmp( (const char*) lhs, (const char*)rhs)>0) + if (ACE_OS::strcmp( (const char*) lhs, (const char*)rhs)>0) return 1; else return 0; @@ -136,7 +143,7 @@ int operator<=( const Address &lhs,const Address &rhs) // overloaded < operator, is a1 < a2 int operator<( const Address &lhs, const Address &rhs) { - if ( strcmp( (const char*) lhs, (const char*)rhs)<0) + if (ACE_OS::strcmp( (const char*) lhs, (const char*)rhs)<0) return 1; else return 0; @@ -148,7 +155,7 @@ int operator==( const Address &lhs,const char *rhs) { if (!rhs && !lhs.valid()) return 1; - if (strcmp( (const char *) lhs, rhs)== 0) + if (ACE_OS::strcmp( (const char *) lhs, rhs)== 0) return 1; else return 0; @@ -167,7 +174,7 @@ int operator>( const Address &lhs,const char *rhs) { if (!rhs) return lhs.valid(); // if lhs valid then > 0, else invalid !> 0 - if (strcmp( (const char *) lhs, rhs)> 0) + if (ACE_OS::strcmp( (const char *) lhs, rhs)> 0) return 1; else return 0; @@ -179,7 +186,7 @@ int operator>=( const Address &lhs,const char *rhs) { if (!rhs) return 1; // always >= 0 - if (strcmp( (const char *) lhs, rhs)>= 0) + if (ACE_OS::strcmp( (const char *) lhs, rhs)>= 0) return 1; else return 0; @@ -191,7 +198,7 @@ int operator<( const Address &lhs,const char *rhs) { if (!rhs) return 0; // always >= 0 - if (strcmp( (const char *) lhs, rhs)< 0) + if (ACE_OS::strcmp( (const char *) lhs, rhs)< 0) return 1; else return 0; @@ -203,7 +210,7 @@ int operator<=( const Address &lhs,const char *rhs) { if (!rhs) return !lhs.valid(); // invalid == 0, else valid > 0 - if (strcmp( (const char *) lhs, rhs)<= 0) + if (ACE_OS::strcmp( (const char *) lhs, rhs)<= 0) return 1; else return 0; @@ -451,7 +458,7 @@ int IpAddress::parse_dotted_ipstring( const char *inaddr) return 0; // look for dot token separator - ip_token = strtok( (char *) temp,"."); + ip_token = ACE_OS::strtok( (char *) temp,"."); // while more tokens.. while ( ip_token != 0) { @@ -467,12 +474,12 @@ int IpAddress::parse_dotted_ipstring( const char *inaddr) if (( value > 0)&& ( value <=255)) address_buffer[token_count] = (unsigned char) value; else - if ( strcmp(ip_token,"0")==0) + if (ACE_OS::strcmp(ip_token,"0")==0) address_buffer[token_count]= (unsigned char) 0; else error_status = 1; token_count++; - ip_token = strtok( 0, "."); + ip_token = ACE_OS::strtok( 0, "."); } // gota be four in len diff --git a/ASNMP/asnmp/address.h b/ASNMP/asnmp/address.h index 21257d7737e..e6d89fedfd0 100644 --- a/ASNMP/asnmp/address.h +++ b/ASNMP/asnmp/address.h @@ -37,7 +37,8 @@ //----[ includes ]----------------------------------------------------- // ACE OS Adaption layer -#include "ace/OS.h" +#include "ace/os_include/netinet/os_in.h" +#include "ace/os_include/os_netdb.h" #include "ace/Log_Msg.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/ASNMP/asnmp/asn1.cpp b/ASNMP/asnmp/asn1.cpp index 77dc9baa5ec..ccb2e699456 100644 --- a/ASNMP/asnmp/asn1.cpp +++ b/ASNMP/asnmp/asn1.cpp @@ -52,6 +52,7 @@ #include "asnmp/asn1.h" #include "asnmp/snmp.h" +#include "ace/OS_NS_string.h" ACE_RCSID(asnmp, asn1, "$Id$") diff --git a/ASNMP/asnmp/asn1.h b/ASNMP/asnmp/asn1.h index c01b34e65a7..0c141c188d2 100644 --- a/ASNMP/asnmp/asn1.h +++ b/ASNMP/asnmp/asn1.h @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ASNMP/asnmp/ctr64.cpp b/ASNMP/asnmp/ctr64.cpp index 45d12cca277..e11b7cd613b 100644 --- a/ASNMP/asnmp/ctr64.cpp +++ b/ASNMP/asnmp/ctr64.cpp @@ -32,6 +32,7 @@ =====================================================================*/ #include "asnmp/ctr64.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(asnmp, ctr64, "$Id$") diff --git a/ASNMP/asnmp/integer.cpp b/ASNMP/asnmp/integer.cpp index ca399336053..d732e0f3ff9 100644 --- a/ASNMP/asnmp/integer.cpp +++ b/ASNMP/asnmp/integer.cpp @@ -33,11 +33,12 @@ =====================================================================*/ #include "asnmp/integer.h" // header file for gauge class +#include "ace/OS_NS_stdio.h" ACE_RCSID(asnmp, integer, "$Id$") // constructor with value -SnmpUInt32::SnmpUInt32 (const u_long i) +SnmpUInt32::SnmpUInt32 (const unsigned long i) { smival.value.uNumber=i; smival.syntax = sNMP_SYNTAX_UINT32; diff --git a/ASNMP/asnmp/octet.cpp b/ASNMP/asnmp/octet.cpp index b75a5186178..7c9db8ca405 100644 --- a/ASNMP/asnmp/octet.cpp +++ b/ASNMP/asnmp/octet.cpp @@ -33,8 +33,12 @@ derivatives based upon this software code base. =====================================================================*/ -#include "ace/OS.h" #include "asnmp/octet.h" // include definition for octet class +#include "ace/OS_Memory.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_ctype.h" +#include "ace/os_include/os_ctype.h" ACE_RCSID(asnmp, octet, "$Id$") @@ -477,7 +481,7 @@ const char * OctetStr::to_string() for ( unsigned long i=0; i < smival.value.string.len; i++) { if (( smival.value.string.ptr[i] != '\r')&& ( smival.value.string.ptr[i] != '\n')&& - (isprint((int) (smival.value.string.ptr[i]))==0)) + (ACE_OS::ace_isprint((int) (smival.value.string.ptr[i]))==0)) return(to_string_hex()); } @@ -587,7 +591,7 @@ const char *OctetStr::to_string_hex() #endif // _WIN32 ACE_OS::sprintf(line_ptr, fmt, char_buf); - line_ptr += 3 + strlen(char_buf); + line_ptr += 3 + ACE_OS::strlen(char_buf); } return output_buffer; diff --git a/ASNMP/asnmp/oid.cpp b/ASNMP/asnmp/oid.cpp index 03e65410a4a..71c5caa8835 100644 --- a/ASNMP/asnmp/oid.cpp +++ b/ASNMP/asnmp/oid.cpp @@ -36,6 +36,10 @@ //---------[ external C libaries used ]-------------------------------- #include "asnmp/oid.h" // include def for oid class +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_Memory.h" +#include "ace/os_include/os_ctype.h" ACE_RCSID(asnmp, oid, "$Id$") diff --git a/ASNMP/asnmp/oid.h b/ASNMP/asnmp/oid.h index c0de425a144..8ef171317f3 100644 --- a/ASNMP/asnmp/oid.h +++ b/ASNMP/asnmp/oid.h @@ -39,7 +39,7 @@ =====================================================================*/ //----------[ extern C libraries Needed ]--------------------------------- -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ASNMP/asnmp/pdu.cpp b/ASNMP/asnmp/pdu.cpp index 49c14861af6..ddd43a292ad 100644 --- a/ASNMP/asnmp/pdu.cpp +++ b/ASNMP/asnmp/pdu.cpp @@ -34,6 +34,8 @@ #include "asnmp/snmp.h" #include "asnmp/pdu.h" // include Pdu class definition +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(asnmp, pdu, "$Id$") diff --git a/ASNMP/asnmp/smi.h b/ASNMP/asnmp/smi.h index 09b3927b220..4fac7f8c1bc 100644 --- a/ASNMP/asnmp/smi.h +++ b/ASNMP/asnmp/smi.h @@ -35,7 +35,7 @@ =====================================================================*/ -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ASNMP/asnmp/snmp.cpp b/ASNMP/asnmp/snmp.cpp index 9c3b0d40af2..cc2e1dd4179 100644 --- a/ASNMP/asnmp/snmp.cpp +++ b/ASNMP/asnmp/snmp.cpp @@ -43,6 +43,9 @@ #include "asnmp/address.h" // class def for addresses #include "asnmp/wpdu.h" // adapter to cmu_library / wire protocol #include "asnmp/transaction.h" // synchronous transaction processor +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_time.h" ACE_RCSID(asnmp, snmp, "$Id$") diff --git a/ASNMP/asnmp/timetick.cpp b/ASNMP/asnmp/timetick.cpp index aeb8427c43e..e6b2d0d2231 100644 --- a/ASNMP/asnmp/timetick.cpp +++ b/ASNMP/asnmp/timetick.cpp @@ -32,6 +32,7 @@ =====================================================================*/ #include "asnmp/timetick.h" // include header file for timetick class +#include "ace/OS_NS_stdio.h" ACE_RCSID(asnmp, timetick, "$Id$") diff --git a/ASNMP/asnmp/transaction.cpp b/ASNMP/asnmp/transaction.cpp index 5eccd735879..e7c703aa865 100644 --- a/ASNMP/asnmp/transaction.cpp +++ b/ASNMP/asnmp/transaction.cpp @@ -18,6 +18,7 @@ #include "ace/Reactor.h" #include "asnmp/transaction.h" +#include "ace/OS_NS_string.h" ACE_RCSID(asnmp, transaction, "$Id$") diff --git a/ASNMP/asnmp/vb.cpp b/ASNMP/asnmp/vb.cpp index ab32e9639bb..ee80d7e68ec 100644 --- a/ASNMP/asnmp/vb.cpp +++ b/ASNMP/asnmp/vb.cpp @@ -39,6 +39,9 @@ #include "asnmp/oid.h" // include oid class defs #include "asnmp/vb.h" // include vb class defs #include "asnmp/snmperrs.h" // error codes +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_Memory.h" ACE_RCSID(asnmp, vb, "$Id$") @@ -385,7 +388,7 @@ int operator==( const Vb &lhs, const Vb &rhs) return 0; if (lhs.iv_vb_value_ != 0 && rhs.iv_vb_value_ != 0) { - int val = strcmp(lhs.iv_vb_value_->to_string(), + int val = ACE_OS::strcmp(lhs.iv_vb_value_->to_string(), rhs.iv_vb_value_->to_string()); return !val; } diff --git a/ASNMP/asnmp/vb.h b/ASNMP/asnmp/vb.h index f20b58cca2a..5a2b778748d 100644 --- a/ASNMP/asnmp/vb.h +++ b/ASNMP/asnmp/vb.h @@ -37,7 +37,7 @@ =====================================================================*/ //----[ external calls ]---------------------------------------------- -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ASNMP/asnmp/wpdu.cpp b/ASNMP/asnmp/wpdu.cpp index f4ac111fe0e..d05a750970f 100644 --- a/ASNMP/asnmp/wpdu.cpp +++ b/ASNMP/asnmp/wpdu.cpp @@ -19,6 +19,7 @@ #include "asnmp/wpdu.h" #include <ace/Log_Msg.h> +#include "ace/OS_NS_string.h" #define DEFINE_TRAP_CONSTANTS_ #include "asnmp/enttraps.h" diff --git a/ASNMP/asnmp/wpdu.h b/ASNMP/asnmp/wpdu.h index 4d56c73ada6..1485560baeb 100644 --- a/ASNMP/asnmp/wpdu.h +++ b/ASNMP/asnmp/wpdu.h @@ -20,7 +20,7 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once |