diff options
35 files changed, 115 insertions, 38 deletions
diff --git a/ASNMP/ChangeLog b/ASNMP/ChangeLog index a6a01eef432..f59ec82ca2b 100644 --- a/ASNMP/ChangeLog +++ b/ASNMP/ChangeLog @@ -1,3 +1,43 @@ +Fri Jul 31 19:26:07 1998 Gonzalo Diethelm <gonzo@tango.cs.wustl.edu> + + * examples/Makefile: + It had a missing info subdirectory. + + * agent/agent_impl.cpp: + * agent/main.cpp: + * agent/snmp_agent.cpp: + * asnmp/address.cpp: + * asnmp/asn1.cpp: + * asnmp/counter.cpp: + * asnmp/ctr64.cpp: + * asnmp/gauge.cpp: + * asnmp/integer.cpp: + * asnmp/octet.cpp: + * asnmp/oid.cpp: + * asnmp/pdu.cpp: + * asnmp/sagent.cpp: + * asnmp/snmp.cpp: + * asnmp/target.cpp: + * asnmp/timetick.cpp: + * asnmp/transaction.cpp: + * asnmp/vb.cpp: + * asnmp/wpdu.cpp: + * examples/get/get.cpp: + * examples/next/next.cpp: + * examples/set/set.cpp: + * examples/trap/trap.cpp: + * examples/walk/walk.cpp: + * tests/Address_Test.cpp: + * tests/Counter64_Test.cpp: + * tests/Counter_Test.cpp: + * tests/Gauge_Test.cpp: + * tests/Integer_Test.cpp: + * tests/Octet_Test.cpp: + * tests/Oid_Test.cpp: + * tests/Target_Test.cpp: + * tests/Varbind_Test.cpp: + Added ACE_RCSID to these files. + Wed Jul 15 20:34:55 CDT 1998 * general fixes for SNMPv1 trap generation code reported by Hien Nguyen <hnguyen@adcapex.com> and Jeff Hall <jeff@liffe.com> diff --git a/ASNMP/agent/agent_impl.cpp b/ASNMP/agent/agent_impl.cpp index 9f04793e7e2..0c3f8da4078 100644 --- a/ASNMP/agent/agent_impl.cpp +++ b/ASNMP/agent/agent_impl.cpp @@ -1,6 +1,5 @@ // $Id$ -/* -*-C++-*- */ // implement a prototype SNMP Agent using ASNMP and ACE #include <ace/Reactor.h> @@ -9,6 +8,8 @@ #include "agent_impl.h" +ACE_RCSID(agent, agent_impl, "$Id$") + agent_impl::agent_impl(unsigned short port, const char *rd, const char *wr) : sagent(port) { diff --git a/ASNMP/agent/main.cpp b/ASNMP/agent/main.cpp index 1aa15d00025..1dd2ad4cdd9 100644 --- a/ASNMP/agent/main.cpp +++ b/ASNMP/agent/main.cpp @@ -1,12 +1,12 @@ -/* -*-C++-*- */ // $Id$ // This server daemon processes SNMP Version 1 get, get-next, and set // commands. over the MIB II "System" group only. -// #include "snmp_agent.h" +ACE_RCSID(agent, main, "$Id$") + int main (int argc, char *argv[]) { snmp_agent the_agent; diff --git a/ASNMP/agent/snmp_agent.cpp b/ASNMP/agent/snmp_agent.cpp index 81a7c2c6f70..43a5342a3ec 100644 --- a/ASNMP/agent/snmp_agent.cpp +++ b/ASNMP/agent/snmp_agent.cpp @@ -1,4 +1,3 @@ -/* -*- C++ -*- */ // $Id$ // This server daemon processes SNMPv1 requests over MIB II System group @@ -8,6 +7,8 @@ #include "ace/Get_Opt.h" #include "ace/Reactor.h" +ACE_RCSID(agent, snmp_agent, "$Id$") + // module globals #define SNMP_AGENT_PORT (161) #define WR_COM ("private") diff --git a/ASNMP/asnmp/address.cpp b/ASNMP/asnmp/address.cpp index 17706a02ade..5296f86ef21 100644 --- a/ASNMP/asnmp/address.cpp +++ b/ASNMP/asnmp/address.cpp @@ -1,6 +1,5 @@ // $Id$ -/* -*-C++-*- */ // ============================================================================ // // = LIBRARY @@ -39,6 +38,8 @@ #include "asnmp/address.h" +ACE_RCSID(asnmp, address, "$Id$") + //================================================================= //======== Abstract Address Class Implementation ================== //================================================================= diff --git a/ASNMP/asnmp/asn1.cpp b/ASNMP/asnmp/asn1.cpp index fa09b9a0251..da2e936349b 100644 --- a/ASNMP/asnmp/asn1.cpp +++ b/ASNMP/asnmp/asn1.cpp @@ -1,6 +1,7 @@ -/* -*-C++-*- */ -// ============================================================================ // $Id$ + +// ============================================================================ +// // = LIBRARY // asnmp // @@ -52,6 +53,8 @@ #include "asnmp/asn1.h" #include "asnmp/snmp.h" +ACE_RCSID(asnmp, asn1, "$Id$") + /* * parse_int - pulls a long out of an ASN int type. * On entry, datalength is input as the number of valid bytes following diff --git a/ASNMP/asnmp/counter.cpp b/ASNMP/asnmp/counter.cpp index 77081fe84fe..363c4b632f7 100644 --- a/ASNMP/asnmp/counter.cpp +++ b/ASNMP/asnmp/counter.cpp @@ -1,6 +1,5 @@ // $Id$ -/* -*-C++-*- */ // ============================================================================ // // = LIBRARY @@ -34,6 +33,8 @@ #include "asnmp/counter.h" +ACE_RCSID(asnmp, counter, "$Id$") + // constructor with a value Counter32::Counter32( const unsigned long i):SnmpUInt32(i) { diff --git a/ASNMP/asnmp/ctr64.cpp b/ASNMP/asnmp/ctr64.cpp index 571209c5e41..6106eb83bf8 100644 --- a/ASNMP/asnmp/ctr64.cpp +++ b/ASNMP/asnmp/ctr64.cpp @@ -1,6 +1,5 @@ // $Id$ -/* -*-C++-*- */ // ============================================================================ // // = LIBRARY @@ -34,6 +33,8 @@ #include "asnmp/ctr64.h" +ACE_RCSID(asnmp, ctr64, "$Id$") + #define MAX32 4294967295 //-----------[ syntax type ]---------------------------------------------- diff --git a/ASNMP/asnmp/gauge.cpp b/ASNMP/asnmp/gauge.cpp index d00bc486b55..8f97556a660 100644 --- a/ASNMP/asnmp/gauge.cpp +++ b/ASNMP/asnmp/gauge.cpp @@ -1,6 +1,5 @@ // $Id$ -/* -*-C++-*- */ // ============================================================================ // // = LIBRARY @@ -35,6 +34,8 @@ #include "asnmp/gauge.h" // header file for gauge class +ACE_RCSID(asnmp, gauge, "$Id$") + // constructor with a value Gauge32::Gauge32( const unsigned long i):SnmpUInt32(i) { diff --git a/ASNMP/asnmp/integer.cpp b/ASNMP/asnmp/integer.cpp index 9650c3417b4..295046ab955 100644 --- a/ASNMP/asnmp/integer.cpp +++ b/ASNMP/asnmp/integer.cpp @@ -1,6 +1,5 @@ // $Id$ -/* -*-C++-*- */ // ============================================================================ // // = LIBRARY @@ -35,6 +34,8 @@ #include "asnmp/integer.h" // header file for gauge class +ACE_RCSID(asnmp, integer, "$Id$") + // constructor with value SnmpUInt32::SnmpUInt32 (const u_long i) { diff --git a/ASNMP/asnmp/octet.cpp b/ASNMP/asnmp/octet.cpp index 244b525a914..b08bf5482f1 100644 --- a/ASNMP/asnmp/octet.cpp +++ b/ASNMP/asnmp/octet.cpp @@ -1,6 +1,5 @@ // $Id$ -/* -*-C++-*- */ // ============================================================================ // // = LIBRARY @@ -37,6 +36,8 @@ #include "ace/OS.h" #include "asnmp/octet.h" // include definition for octet class +ACE_RCSID(asnmp, octet, "$Id$") + //============[ syntax type ]========================================= SmiUINT32 OctetStr::get_syntax() { diff --git a/ASNMP/asnmp/oid.cpp b/ASNMP/asnmp/oid.cpp index e021f437133..b1b47ef3e70 100644 --- a/ASNMP/asnmp/oid.cpp +++ b/ASNMP/asnmp/oid.cpp @@ -1,6 +1,5 @@ // $Id$ -/* -*-C++-*- */ // ============================================================================ // // = LIBRARY @@ -37,6 +36,9 @@ //---------[ external C libaries used ]-------------------------------- #include "asnmp/oid.h" // include def for oid class + +ACE_RCSID(asnmp, oid, "$Id$") + enum Defs {SNMPBUFFSIZE=300, SNMPCHARSIZE=15}; // max oid value (4294967295UL) diff --git a/ASNMP/asnmp/pdu.cpp b/ASNMP/asnmp/pdu.cpp index 2ca7516b6fd..a15ede7886e 100644 --- a/ASNMP/asnmp/pdu.cpp +++ b/ASNMP/asnmp/pdu.cpp @@ -1,6 +1,5 @@ // $Id$ -/* -*-C++-*- */ // ============================================================================ // // = LIBRARY @@ -36,6 +35,8 @@ #include "asnmp/snmp.h" #include "asnmp/pdu.h" // include Pdu class definition +ACE_RCSID(asnmp, pdu, "$Id$") + //=====================[ constructor no args ]========================= Pdu::Pdu( void): vb_count_(0), error_status_(0), error_index_(0), validity_(FALSE), request_id_(0), pdu_type_(0), notify_timestamp_(0), diff --git a/ASNMP/asnmp/sagent.cpp b/ASNMP/asnmp/sagent.cpp index 1f93502aaf7..489975afbc1 100644 --- a/ASNMP/asnmp/sagent.cpp +++ b/ASNMP/asnmp/sagent.cpp @@ -1,6 +1,5 @@ // $Id$ -/* -*-C++-*- */ // ============================================================================ // // = LIBRARY @@ -31,6 +30,8 @@ #include "asnmp/sagent.h" // agent interface #include "asnmp/transaction.h" // convert from wire to API +ACE_RCSID(asnmp, sagent, "$Id$") + sagent::sagent(unsigned short port): Snmp(port) { ACE_TRACE("sagent::sagent(short)"); diff --git a/ASNMP/asnmp/snmp.cpp b/ASNMP/asnmp/snmp.cpp index 173d6d21723..c3184cb3aef 100644 --- a/ASNMP/asnmp/snmp.cpp +++ b/ASNMP/asnmp/snmp.cpp @@ -1,6 +1,5 @@ // $Id$ -/* -*-C++-*- */ // ============================================================================ // // = LIBRARY @@ -45,6 +44,8 @@ #include "asnmp/wpdu.h" // adapter to cmu_library / wire protocol #include "asnmp/transaction.h" // synchronous transaction processor +ACE_RCSID(asnmp, snmp, "$Id$") + const coldStartOid coldStart; const warmStartOid warmStart; const linkDownOid linkDown; diff --git a/ASNMP/asnmp/target.cpp b/ASNMP/asnmp/target.cpp index f7c01d1c13b..1eac9d641e5 100644 --- a/ASNMP/asnmp/target.cpp +++ b/ASNMP/asnmp/target.cpp @@ -1,6 +1,5 @@ // $Id$ -/* -*-C++-*- */ // ============================================================================ // // = LIBRARY @@ -34,6 +33,8 @@ #include "asnmp/target.h" +ACE_RCSID(asnmp, target, "$Id$") + //---------------------------------------------------------------------- //--------[ Class default values ]---------------------- //---------------------------------------------------------------------- diff --git a/ASNMP/asnmp/timetick.cpp b/ASNMP/asnmp/timetick.cpp index ff89700f176..4855605b313 100644 --- a/ASNMP/asnmp/timetick.cpp +++ b/ASNMP/asnmp/timetick.cpp @@ -1,6 +1,5 @@ // $Id$ -/* -*-C++-*- */ // ============================================================================ // // = LIBRARY @@ -34,6 +33,8 @@ #include "asnmp/timetick.h" // include header file for timetick class +ACE_RCSID(asnmp, timetick, "$Id$") + // constructor with a value TimeTicks::TimeTicks( const unsigned long i):SnmpUInt32(i) { diff --git a/ASNMP/asnmp/transaction.cpp b/ASNMP/asnmp/transaction.cpp index 1098c647128..57abe2f0faf 100644 --- a/ASNMP/asnmp/transaction.cpp +++ b/ASNMP/asnmp/transaction.cpp @@ -1,6 +1,5 @@ // $Id$ -/* -*-C++-*- */ // ============================================================================ // // = LIBRARY @@ -20,6 +19,8 @@ #include "ace/Reactor.h" #include "asnmp/transaction.h" +ACE_RCSID(asnmp, transaction, "$Id$") + // pre: pdu, target report valid() == 1 // post: pdu sent out over the wire inline void reset_receive_buffer(iovec& io) diff --git a/ASNMP/asnmp/vb.cpp b/ASNMP/asnmp/vb.cpp index 584356b64cf..2a840e91015 100644 --- a/ASNMP/asnmp/vb.cpp +++ b/ASNMP/asnmp/vb.cpp @@ -1,6 +1,5 @@ // $Id$ -/* -*-C++-*- */ // ============================================================================ // // = LIBRARY @@ -41,6 +40,8 @@ #include "asnmp/vb.h" // include vb class defs #include "asnmp/snmperrs.h" // error codes +ACE_RCSID(asnmp, vb, "$Id$") + //---------------[ Vb::Vb( void) ]-------------------------------------- // constructor with no arguments // makes an vb, unitialized diff --git a/ASNMP/asnmp/wpdu.cpp b/ASNMP/asnmp/wpdu.cpp index 80538c11f7e..71e7fc1da1d 100644 --- a/ASNMP/asnmp/wpdu.cpp +++ b/ASNMP/asnmp/wpdu.cpp @@ -1,6 +1,6 @@ -/* -*-C++-*- */ -// ============================================================================ // $Id$ + +// ============================================================================ // = LIBRARY // asnmp // @@ -23,6 +23,8 @@ #define DEFINE_TRAP_CONSTANTS_ #include "asnmp/enttraps.h" +ACE_RCSID(asnmp, wpdu, "$Id$") + #define MAX_COMM_STR_LEN 255 #define V1_COLD_START 0 #define V1_WARM_START 1 diff --git a/ASNMP/examples/Makefile b/ASNMP/examples/Makefile index cd06fb9ea08..64ca08c687c 100644 --- a/ASNMP/examples/Makefile +++ b/ASNMP/examples/Makefile @@ -1,4 +1,7 @@ #---------------------------------------------------------------------------- +# +# $Id$ +# # @(#)Makefile 1.1 10/18/96 # # Makefile for the ACE+SNMP examples directory @@ -12,7 +15,6 @@ DIRS = get \ next \ set \ trap \ - info \ walk #---------------------------------------------------------------------------- diff --git a/ASNMP/examples/get/get.cpp b/ASNMP/examples/get/get.cpp index 4b7fc1f04f7..31d37bf1774 100644 --- a/ASNMP/examples/get/get.cpp +++ b/ASNMP/examples/get/get.cpp @@ -1,6 +1,5 @@ // $Id$ -/* -*-C++-*- */ // ============================================================================ // // = LIBRARY @@ -37,6 +36,8 @@ #include "asnmp/snmp.h" #include "ace/Get_Opt.h" +ACE_RCSID(get, get, "$Id$") + // // SNMPv1 Get Application // diff --git a/ASNMP/examples/next/next.cpp b/ASNMP/examples/next/next.cpp index 82aa54fc5cb..be550a567a9 100644 --- a/ASNMP/examples/next/next.cpp +++ b/ASNMP/examples/next/next.cpp @@ -1,6 +1,5 @@ // $Id$ -/* -*-C++-*- */ // ============================================================================ // // = LIBRARY @@ -37,6 +36,8 @@ #include "asnmp/snmp.h" #include "ace/Get_Opt.h" +ACE_RCSID(next, next, "$Id$") + // // SNMPv1 Get Next Application // diff --git a/ASNMP/examples/set/set.cpp b/ASNMP/examples/set/set.cpp index f01d7bb5c27..ebbd022d6d4 100644 --- a/ASNMP/examples/set/set.cpp +++ b/ASNMP/examples/set/set.cpp @@ -1,6 +1,5 @@ // $Id$ -/* -*-C++-*- */ // ============================================================================ // // = LIBRARY @@ -37,6 +36,8 @@ #include "asnmp/snmp.h" #include "ace/Get_Opt.h" +ACE_RCSID(set, set, "$Id$") + // // SNMPv1 Set Application // diff --git a/ASNMP/examples/trap/trap.cpp b/ASNMP/examples/trap/trap.cpp index d81d72a8afd..13add3d4ea6 100644 --- a/ASNMP/examples/trap/trap.cpp +++ b/ASNMP/examples/trap/trap.cpp @@ -1,6 +1,5 @@ // $Id$ -/* -*-C++-*- */ // ============================================================================ // // = LIBRARY @@ -39,6 +38,8 @@ #include "asnmp/enttraps.h" // enterprise standard traps #include "ace/Get_Opt.h" +ACE_RCSID(trap, trap, "$Id$") + // // SNMPv1 Trap Application // diff --git a/ASNMP/examples/walk/walk.cpp b/ASNMP/examples/walk/walk.cpp index 30705c665f1..0fa63f7f6ab 100644 --- a/ASNMP/examples/walk/walk.cpp +++ b/ASNMP/examples/walk/walk.cpp @@ -1,6 +1,5 @@ // $Id$ -/* -*-C++-*- */ // ============================================================================ // // = LIBRARY @@ -37,6 +36,8 @@ #include "asnmp/snmp.h" #include "ace/Get_Opt.h" +ACE_RCSID(walk, walk, "$Id$") + // // SNMPv1 Walk Mib Application // diff --git a/ASNMP/tests/Address_Test.cpp b/ASNMP/tests/Address_Test.cpp index a10705ce78b..01347ae30e1 100644 --- a/ASNMP/tests/Address_Test.cpp +++ b/ASNMP/tests/Address_Test.cpp @@ -1,4 +1,3 @@ -/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -43,6 +42,8 @@ DAMAGES. #include "asnmp/address.h" #include "test_config.h" +ACE_RCSID(tests, Address_Test, "$Id$") + // hack: do this so when linking SUNC 4.x compiler will instantiate template #include "ace/Containers.h" ACE_Unbounded_Set<ACE_Log_Msg*> x; diff --git a/ASNMP/tests/Counter64_Test.cpp b/ASNMP/tests/Counter64_Test.cpp index 506c8a85873..835bf193517 100644 --- a/ASNMP/tests/Counter64_Test.cpp +++ b/ASNMP/tests/Counter64_Test.cpp @@ -1,4 +1,3 @@ -/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -44,6 +43,8 @@ DAMAGES. #include "asnmp/ctr64.h" #include "test_config.h" +ACE_RCSID(tests, Counter64_Test, "$Id$") + // hack: do this so when linking SUNC 4.x compiler will instantiate template #include "ace/Containers.h" ACE_Unbounded_Set<ACE_Log_Msg*> x; diff --git a/ASNMP/tests/Counter_Test.cpp b/ASNMP/tests/Counter_Test.cpp index 061f469f6a5..d7be4862ea7 100644 --- a/ASNMP/tests/Counter_Test.cpp +++ b/ASNMP/tests/Counter_Test.cpp @@ -1,4 +1,3 @@ -/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -43,6 +42,8 @@ DAMAGES. #include "asnmp/counter.h" #include "test_config.h" +ACE_RCSID(tests, Counter_Test, "$Id$") + // hack: do this so when linking SUNC 4.x compiler will instantiate template #include "ace/Containers.h" ACE_Unbounded_Set<ACE_Log_Msg*> x; diff --git a/ASNMP/tests/Gauge_Test.cpp b/ASNMP/tests/Gauge_Test.cpp index 9594f9b3b4d..7c2faa436e2 100644 --- a/ASNMP/tests/Gauge_Test.cpp +++ b/ASNMP/tests/Gauge_Test.cpp @@ -1,4 +1,3 @@ -/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -42,6 +41,8 @@ DAMAGES. #include "asnmp/gauge.h" #include "test_config.h" +ACE_RCSID(tests, Gauge_Test, "$Id$") + // hack: do this so when linking SUNC 4.x compiler will instantiate template #include "ace/Containers.h" ACE_Unbounded_Set<ACE_Log_Msg*> x; diff --git a/ASNMP/tests/Integer_Test.cpp b/ASNMP/tests/Integer_Test.cpp index c42afdc42ef..264bcef5529 100644 --- a/ASNMP/tests/Integer_Test.cpp +++ b/ASNMP/tests/Integer_Test.cpp @@ -1,4 +1,3 @@ -/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -44,6 +43,8 @@ DAMAGES. #include "asnmp/integer.h" #include "test_config.h" +ACE_RCSID(tests, Integer_Test, "$Id$") + static long l = LONG_MAX, nl = LONG_MIN; // limits.h static unsigned long ul = ULONG_MAX, def = 0; static int i = INT_MAX, ni = INT_MIN; diff --git a/ASNMP/tests/Octet_Test.cpp b/ASNMP/tests/Octet_Test.cpp index 618893e57dd..1eb0c391763 100644 --- a/ASNMP/tests/Octet_Test.cpp +++ b/ASNMP/tests/Octet_Test.cpp @@ -1,5 +1,5 @@ -/* -*- C++ -*- */ // $Id$ + // ============================================================================ // // = LIBRARY @@ -39,12 +39,13 @@ SOFTWARE INCLUDING WITHOUT LIMITATION, DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES. -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/ - #include "ace/OS.h" #include "asnmp/octet.h" #include "test_config.h" +ACE_RCSID(tests, Octet_Test, "$Id$") + // hack: do this so when linking SUNC 4.x compiler will instantiate template #include "ace/Containers.h" ACE_Unbounded_Set<ACE_Log_Msg*> x; diff --git a/ASNMP/tests/Oid_Test.cpp b/ASNMP/tests/Oid_Test.cpp index 56af2271b3f..41c03a89585 100644 --- a/ASNMP/tests/Oid_Test.cpp +++ b/ASNMP/tests/Oid_Test.cpp @@ -1,4 +1,3 @@ -/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -43,6 +42,8 @@ DAMAGES. #include "asnmp/oid.h" #include "test_config.h" +ACE_RCSID(tests, Oid_Test, "$Id$") + // hack: do this so when linking SUNC 4.x compiler will instantiate template #include "ace/Containers.h" ACE_Unbounded_Set<ACE_Log_Msg*> x; diff --git a/ASNMP/tests/Target_Test.cpp b/ASNMP/tests/Target_Test.cpp index d843057215d..a1ff8e1fb51 100644 --- a/ASNMP/tests/Target_Test.cpp +++ b/ASNMP/tests/Target_Test.cpp @@ -1,4 +1,3 @@ -/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -46,6 +45,8 @@ DAMAGES. #include "asnmp/target.h" #include "test_config.h" +ACE_RCSID(tests, Target_Test, "$Id$") + // hack: do this so when linking SUNC 4.x compiler will instantiate template #include "ace/Containers.h" ACE_Unbounded_Set<ACE_Log_Msg*> x; diff --git a/ASNMP/tests/Varbind_Test.cpp b/ASNMP/tests/Varbind_Test.cpp index a4d9c77113a..46b38fd219d 100644 --- a/ASNMP/tests/Varbind_Test.cpp +++ b/ASNMP/tests/Varbind_Test.cpp @@ -1,4 +1,3 @@ -/* -*- C++ -*- */ // $Id$ // ============================================================================ @@ -46,6 +45,7 @@ DAMAGES. #include "asnmp/vb.h" #include "test_config.h" +ACE_RCSID(tests, Varbind_Test, "$Id$") // hack: do this so when linking SUNC 4.x compiler will instantiate template #include "ace/Containers.h" |