add test for IpAddress::is_private()

and run g++dep

2 files changed, 182 insertions, 1 deletions

diff --git a/ASNMP/tests/Address_Test.cpp b/ASNMP/tests/Address_Test.cpp
index 9017e6b7967..936e6b75fcc 100644
--- a/ASNMP/tests/Address_Test.cpp
+++ b/ASNMP/tests/Address_Test.cpp
@@ -157,10 +157,16 @@ static void TestIpAddress()
   IpAddress ia5(ga);
   ACE_ASSERT(ia5.is_broadcast());
   IpAddress ia6 = IpAddress("10.0.0.2");
-  ACE_ASSERT(ia6.is_arpanet());
+  ACE_ASSERT(ia6.is_private());
   ACE_ASSERT(!ia6.is_multicast());
   ACE_ASSERT(!ia6.is_loopback());
 
+  IpAddress ia7("172.16.0.1");
+  ACE_ASSERT(ia7.is_private());
+
+  IpAddress ia8("192.168.0.1");
+  ACE_ASSERT(ia8.is_private());
+
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) IpAddress:ia1(\"\") [%s]\n", 
     ia1.to_string()));
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) IpAddress:ia2(\"1.2.3.4\") [%s]\n", 
diff --git a/ASNMP/tests/Makefile b/ASNMP/tests/Makefile
index a09caea1497..821444f36a2 100644
--- a/ASNMP/tests/Makefile
+++ b/ASNMP/tests/Makefile
@@ -46,3 +46,178 @@ include	$(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU
 #----------------------------------------------------------------------------
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+Address_Test.o: Address_Test.cpp \
+ /home/cs/guest/mrm/ASNMP/asnmp/address.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Record.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.i \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Priority.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Record.i \
+ /home/cs/guest/mrm/ASNMP/asnmp/smival.h \
+ /home/cs/guest/mrm/ASNMP/asnmp/smi.h \
+ /home/cs/guest/mrm/ASNMP/asnmp/octet.h test_config.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Containers.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Containers.i
+Counter64_Test.o: Counter64_Test.cpp \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Record.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.i \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Priority.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Record.i \
+ /home/cs/guest/mrm/ASNMP/asnmp/ctr64.h \
+ /home/cs/guest/mrm/ASNMP/asnmp/smival.h \
+ /home/cs/guest/mrm/ASNMP/asnmp/smi.h test_config.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Containers.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Containers.i
+Counter_Test.o: Counter_Test.cpp \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Record.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.i \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Priority.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Record.i \
+ /home/cs/guest/mrm/ASNMP/asnmp/counter.h \
+ /home/cs/guest/mrm/ASNMP/asnmp/smival.h \
+ /home/cs/guest/mrm/ASNMP/asnmp/smi.h \
+ /home/cs/guest/mrm/ASNMP/asnmp/integer.h test_config.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Containers.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Containers.i
+Gauge_Test.o: Gauge_Test.cpp \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Record.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.i \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Priority.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Record.i \
+ /home/cs/guest/mrm/ASNMP/asnmp/gauge.h \
+ /home/cs/guest/mrm/ASNMP/asnmp/integer.h \
+ /home/cs/guest/mrm/ASNMP/asnmp/smival.h \
+ /home/cs/guest/mrm/ASNMP/asnmp/smi.h test_config.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Containers.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Containers.i
+Integer_Test.o: Integer_Test.cpp \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Record.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.i \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Priority.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Record.i \
+ /home/cs/guest/mrm/ASNMP/asnmp/integer.h \
+ /home/cs/guest/mrm/ASNMP/asnmp/smival.h \
+ /home/cs/guest/mrm/ASNMP/asnmp/smi.h test_config.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Containers.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Containers.i
+Octet_Test.o: Octet_Test.cpp \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Record.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.i \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Priority.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Record.i \
+ /home/cs/guest/mrm/ASNMP/asnmp/octet.h \
+ /home/cs/guest/mrm/ASNMP/asnmp/smival.h \
+ /home/cs/guest/mrm/ASNMP/asnmp/smi.h test_config.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Containers.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Containers.i
+Oid_Test.o: Oid_Test.cpp \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Record.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.i \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Priority.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Record.i \
+ /home/cs/guest/mrm/ASNMP/asnmp/oid.h \
+ /home/cs/guest/mrm/ASNMP/asnmp/smival.h \
+ /home/cs/guest/mrm/ASNMP/asnmp/smi.h test_config.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Containers.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Containers.i
+Target_Test.o: Target_Test.cpp \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Record.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.i \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Priority.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Record.i \
+ /home/cs/guest/mrm/ASNMP/asnmp/octet.h \
+ /home/cs/guest/mrm/ASNMP/asnmp/smival.h \
+ /home/cs/guest/mrm/ASNMP/asnmp/smi.h \
+ /home/cs/guest/mrm/ASNMP/asnmp/target.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/INET_Addr.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Addr.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Addr.i \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/INET_Addr.i \
+ /home/cs/guest/mrm/ASNMP/asnmp/address.h \
+ /home/cs/guest/mrm/ASNMP/asnmp/oid.h test_config.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Containers.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Containers.i
+Varbind_Test.o: Varbind_Test.cpp \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Record.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.i \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Priority.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Record.i \
+ /home/cs/guest/mrm/ASNMP/asnmp/oid.h \
+ /home/cs/guest/mrm/ASNMP/asnmp/smival.h \
+ /home/cs/guest/mrm/ASNMP/asnmp/smi.h \
+ /home/cs/guest/mrm/ASNMP/asnmp/vb.h \
+ /home/cs/guest/mrm/ASNMP/asnmp/snmperrs.h \
+ /home/cs/guest/mrm/ASNMP/asnmp/timetick.h \
+ /home/cs/guest/mrm/ASNMP/asnmp/integer.h \
+ /home/cs/guest/mrm/ASNMP/asnmp/counter.h \
+ /home/cs/guest/mrm/ASNMP/asnmp/gauge.h \
+ /home/cs/guest/mrm/ASNMP/asnmp/ctr64.h \
+ /home/cs/guest/mrm/ASNMP/asnmp/octet.h \
+ /home/cs/guest/mrm/ASNMP/asnmp/address.h test_config.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Containers.h \
+ /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Containers.i
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY