OpenNMS

Update of /cvsroot/opennms/opennms/src/services/org/opennms/protocols/icmp
In directory sc8-pr-cvs1:/tmp/cvs-serv4712

Modified Files:
	IcmpSocket.c 
Log Message:
unt64_t instead of "unsigned long long"


Index: IcmpSocket.c
===================================================================
RCS file: /cvsroot/opennms/opennms/src/services/org/opennms/protocols/icmp/IcmpSocket.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- IcmpSocket.c	15 Feb 2003 21:42:08 -0000	1.10
+++ IcmpSocket.c	25 Mar 2003 19:05:24 -0000	1.11
@@ -73,7 +73,7 @@
 {				\
 	struct timeval tv;	\
 	gettimeofday(&tv,NULL); \
-	_dst_ = (unsigned long long)tv.tv_sec * 1000UL + (unsigned long long)tv.tv_usec / 1000UL; \
+	_dst_ = (uint64_t)tv.tv_sec * 1000UL + (uint64_t)tv.tv_usec / 1000UL; \
 }
 #endif
 
@@ -86,7 +86,7 @@
 {				\
 	struct timeval tv;	\
 	gettimeofday(&tv,NULL); \
-	_dst_ = (unsigned long long)tv.tv_sec * 1000000UL + (unsigned long long)tv.tv_usec; \
+	_dst_ = (uint64_t)tv.tv_sec * 1000000UL + (uint64_t)tv.tv_usec; \
 }
 #endif
 
@@ -109,7 +109,7 @@
  * time field in the buffer
  */
 #ifndef TIME_LENGTH
-# define TIME_LENGTH sizeof(unsigned long long)
+# define TIME_LENGTH sizeof(uint64_t)
 #endif
 
 /**
@@ -660,9 +660,9 @@
 	   && memcmp((char *)icmpHdr + OPENNMS_TAG_OFFSET, OPENNMS_TAG, OPENNMS_TAG_LEN) == 0)
 #endif
 	{
-		unsigned long long now;
-		unsigned long long sent;
-		unsigned long long diff;
+		uint64_t now;
+		uint64_t sent;
+		uint64_t diff;
 
 		/**
 		 * get the current time in microseconds and then
@@ -915,7 +915,7 @@
 	   && memcmp((char *)outBuffer + OPENNMS_TAG_OFFSET, OPENNMS_TAG, OPENNMS_TAG_LEN) == 0)
 #endif
 	{
-		unsigned long long now = 0;
+		uint64_t now = 0;
 
 		memcpy((char *)outBuffer + RECVTIME_OFFSET, (char *)&now, TIME_LENGTH);
 		memcpy((char *)outBuffer + RTT_OFFSET, (char *)&now, TIME_LENGTH);

Update of /cvsroot/opennms/opennms/src/joesnmp/org/opennms/protocols/snmp
In directory sc8-pr-cvs1:/tmp/cvs-serv319/org/opennms/protocols/snmp

Modified Files:
	SnmpPduPacket.java SnmpPeer.java SnmpSession.java 
Log Message:
Added some code to allow the joeSNMP library to answer SNMP requests.
Could be useful when building an agent. Thx Oliver.


Index: SnmpPduPacket.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/joesnmp/org/opennms/protocols/snmp/SnmpPduPacket.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SnmpPduPacket.java	14 Nov 2002 22:18:55 -0000	1.2
+++ SnmpPduPacket.java	20 Mar 2003 20:43:27 -0000	1.3
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2002 Sortova Consulting Group, Inc.  All rights reserved.
+// Copyright (C) 2002-2003 Sortova Consulting Group, Inc.  All rights reserved.
 // Parts Copyright (C) 1999-2001 Oculan Corp.  All rights reserved.
 //
 // This program is free software; you can redistribute it and/or modify
@@ -144,6 +144,11 @@
 	private int		m_requestId;		// from pdu
 
 	/**
+	 * The peer of this packet, if we are agent
+	 */
+	private SnmpPeer	m_peer = null;		
+
+	/**
 	 * The list of variables for this particular
 	 * PDU. The list may be quite large so long
 	 * as the packet can be received by the remote
@@ -464,6 +469,29 @@
 	}
 
 	/**
+	 * Sets the Peer for the Packet
+	 * 
+	 * @param peer The peer of this packet 
+	 *
+	 */
+	public void setPeer(SnmpPeer peer)
+	{
+		m_peer = peer;
+	}
+
+	/**
+	 * Returns the current peer for this
+	 * packet.
+	 *
+	 * @return The peer or null, if its a own request
+	 *
+	 */
+	public SnmpPeer getPeer()
+	{
+		return m_peer;
+	}
+
+	/**
 	 * Sets the protocol data unit's sequence identifer
 	 * 
 	 * @param reqid The new request id
@@ -474,6 +502,7 @@
 		m_requestId = reqid;
 	}
 
+	/**
 	/**
 	 * Returns the number of variables in the data unit.
 	 *

Index: SnmpPeer.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/joesnmp/org/opennms/protocols/snmp/SnmpPeer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SnmpPeer.java	14 Nov 2002 22:18:55 -0000	1.2
+++ SnmpPeer.java	20 Mar 2003 20:43:27 -0000	1.3
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2002 Sortova Consulting Group, Inc.  All rights reserved.
+// Copyright (C) 2002-2003 Sortova Consulting Group, Inc.  All rights reserved.
 // Parts Copyright (C) 1999-2001 Oculan Corp.  All rights reserved.
 //
 // This program is free software; you can redistribute it and/or modify
@@ -68,6 +68,12 @@
 	private int		m_port;		// the remote port
 
 	/**
+	 * The local port of the agent. By default this 
+	 * is usually 0 when acting as manager, 161 as agent
+	 */
+	private int		m_serverport=0;	// the local server port
+
+	/**
 	 * The number of time to resend the datagram
 	 * to the host.
 	 */
@@ -208,6 +214,27 @@
 	public void setPort(int port)
 	{
 		m_port = port;
+	}
+
+	/**
+	 * Returns the local agent's port for communications
+	 *
+	 * @return The local agent's port
+	 */
+	public int getServerPort()
+	{
+		return m_serverport;
+	}
+
+	/**
+	 * Used to set the local communication port
+	 *
+	 * @param port The local communication port
+	 *
+	 */
+	public void setServerPort(int port)
+	{
+		m_serverport = port;
 	}
 
 	/**

Index: SnmpSession.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/joesnmp/org/opennms/protocols/snmp/SnmpSession.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SnmpSession.java	14 Nov 2002 22:18:56 -0000	1.2
+++ SnmpSession.java	20 Mar 2003 20:43:29 -0000	1.3
@@ -1,5 +1,5 @@
 //
-// Copyright (C) 2002 Sortova Consulting Group, Inc.  All rights reserved.
+// Copyright (C) 2002-2003 Sortova Consulting Group, Inc.  All rights reserved.
 // Parts Copyright (C) 1999-2001 Oculan Corp.  All rights reserved.
 //
 // This program is free software; you can redistribute it and/or modify
@@ -193,7 +193,7 @@
 			// now find the request and
 			// inform
 			//
-			boolean isExpired = true;
+			boolean isExpired = false;
 			SnmpRequest req   = null;
 			synchronized(m_requests)
 			{
@@ -205,12 +205,17 @@
 				if(req != null)
 					isExpired = req.m_expired;
 			}
-			
-			if(req != null && isExpired == false)
+		
+	
+			if(isExpired == false)
 			{
 				int cmd = -1;
-				if(req.m_pdu instanceof SnmpPduPacket)
+				if(req != null && req.m_pdu instanceof SnmpPduPacket)
 					cmd = ((SnmpPduPacket)req.m_pdu).getCommand();
+                                else {
+					cmd= pdu.getCommand();
+ 					pdu.setPeer(new SnmpPeer(agent,port));
+				}
 
 				switch(cmd)
 				{
@@ -244,11 +249,14 @@
 					default:
 						throw new SnmpPduEncodingException("Invalid PDU Type for session received");
 				}
-
-				req.m_expired = true; // mark it as expired
-				req.m_handler.snmpReceivedPdu(req.m_session,
-						      	      ((SnmpPduRequest)pdu).getCommand(),
-						      	      (SnmpPduRequest)pdu);
+				if (req != null) {
+					req.m_expired = true; // mark it as expired
+					req.m_handler.snmpReceivedPdu(req.m_session,
+							      	      ((SnmpPduRequest)pdu).getCommand(),
+							      	      (SnmpPduRequest)pdu);
+				} else {
+					m_defHandler.snmpReceivedPdu(null,cmd,pdu);
+				}
 			}
 		}
 
@@ -656,7 +664,10 @@
 			// transmit the datagram
 			//
 			ByteArrayInfo msg = encode(pdu);
-			m_portal.send(m_peer, msg.array(), msg.size());
+                        if (pdu.getPeer() == null)
+				m_portal.send(m_peer, msg.array(), msg.size());
+			else
+				m_portal.send(pdu.getPeer(), msg.array(), msg.size());
 		}
 		else if(trap != null)
 		{
@@ -725,7 +736,7 @@
 		m_encoder  = peer.getParameters().getEncoder();
 		m_portal   = new SnmpPortal(new SessionHandler(), 
 					    m_encoder,
-					    0);
+					    peer.getServerPort());
 
 		m_threadException= false;
 		m_why		= null;
@@ -918,7 +929,7 @@
 		}
 
 		SnmpRequest req = new SnmpRequest(this, pdu, handler);
-		if(pdu.getCommand() != SnmpPduPacket.V2TRAP) // traps don't get responses!
+		if(pdu.getCommand() != SnmpPduPacket.V2TRAP || pdu.getPeer() == null ) // traps and responses don't get answers!
 			addRequest(req);
 
 		req.run();

Update of /cvsroot/opennms/opennms/src/services/org/opennms/netmgt/capsd
In directory sc8-pr-cvs1:/tmp/cvs-serv4290/netmgt/capsd

Modified Files:
	RescanProcessor.java SuspectEventProcessor.java 
Log Message:
Certain poorly written SNMP agents can return improper value types for
things such as ifSpeed. This will cause a null pointer exception in
OpenNMS during a scan or rescan. This patch will catch those null
pointer exceptions for ifSpeed, AdminStatus and OperStatus and return
zero.


Index: RescanProcessor.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/services/org/opennms/netmgt/capsd/RescanProcessor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RescanProcessor.java	31 Jan 2003 14:18:48 -0000	1.6
+++ RescanProcessor.java	18 Mar 2003 19:19:11 -0000	1.7
@@ -651,15 +651,38 @@
 
 			// speed
 			SnmpUInt32 uint = (SnmpUInt32)ifte.get(IfTableEntry.IF_SPEED);
-			dbSnmpIfEntry.updateSpeed((int)uint.getValue());
+                        if (uint == null)
+                        {
+                                dbSnmpIfEntry.updateSpeed(0);
+                        }
+                        else
+                        {
+                                dbSnmpIfEntry.updateSpeed((int)uint.getValue());
+                        }
 
 			// admin status
 			sint = (SnmpInt32)ifte.get(IfTableEntry.IF_ADMIN_STATUS);
-			dbSnmpIfEntry.updateAdminStatus(sint.getValue());
+                        if (sint == null)
+                        {
+                                dbSnmpIfEntry.updateAdminStatus(0);
+                        }
+                        else
+                        {
+				dbSnmpIfEntry.updateAdminStatus(sint.getValue());
+                        }
+
 					
 			// oper status
 			sint = (SnmpInt32)ifte.get(IfTableEntry.IF_OPER_STATUS);
-			dbSnmpIfEntry.updateOperationalStatus(sint.getValue());
+                        if (sint == null)
+                        {
+                                dbSnmpIfEntry.updateOperationalStatus(0);
+                        }
+                        else
+                        {
+				dbSnmpIfEntry.updateOperationalStatus(sint.getValue());
+                        }
+
 			
 			// name (from interface extensions table)
 			SnmpOctetString snmpIfName = snmpc.getIfName(ifIndex);

Index: SuspectEventProcessor.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/services/org/opennms/netmgt/capsd/SuspectEventProcessor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SuspectEventProcessor.java	31 Jan 2003 14:18:48 -0000	1.5
+++ SuspectEventProcessor.java	18 Mar 2003 19:19:12 -0000	1.6
@@ -782,15 +782,36 @@
 				
 				// speed
 				SnmpUInt32 uint = (SnmpUInt32)ifte.get(IfTableEntry.IF_SPEED);
-				snmpEntry.setSpeed((int)uint.getValue());
+                        	if (uint == null)
+                        	{
+                                	snmpEntry.setSpeed(0);
+                        	}
+                        	else
+                        	{
+                                	snmpEntry.setSpeed((int)uint.getValue());
+                        	}
 
 				// admin status
 				sint = (SnmpInt32)ifte.get(IfTableEntry.IF_ADMIN_STATUS);
-				snmpEntry.setAdminStatus(sint.getValue());
+				if (sint == null)
+				{
+					snmpEntry.setAdminStatus(0);
+				}
+				else
+				{
+					snmpEntry.setAdminStatus(sint.getValue());
+				}
 				
 				// oper status
 				sint = (SnmpInt32)ifte.get(IfTableEntry.IF_OPER_STATUS);
-				snmpEntry.setOperationalStatus(sint.getValue());
+                                if (sint == null)
+                                {
+                                        snmpEntry.setOperationalStatus(0);
+                                }
+                                else
+                                {
+                                        snmpEntry.setOperationalStatus(sint.getValue());
+                                }
 
 				// name (from interface extensions table)
 				SnmpOctetString snmpIfName = snmpc.getIfName(xifIndex);

Update of /cvsroot/opennms/opennms/src/web/web/help
In directory sc8-pr-cvs1:/tmp/cvs-serv13306

Modified Files:
	about.jsp 
Log Message:
Another Copyright notice update


Index: about.jsp
===================================================================
RCS file: /cvsroot/opennms/opennms/src/web/web/help/about.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- about.jsp	3 Mar 2003 16:37:43 -0000	1.5
+++ about.jsp	18 Mar 2003 16:14:24 -0000	1.6
@@ -57,7 +57,7 @@
     <td>
       <h3>OpenNMS Web Console</h3>
       <p>
-        <a href="http://www.opennms.org/">OpenNMS</a>, Copyright &copy; 2003 <a href="http://www.sortova.com">Sortova Consulting Group, Inc.</a>
+        The <a href="http://www.opennms.org/">OpenNMS</a> software, as distributed here, is copyright &copy; 2002-2003 <a href="http://www.sortova.com">Sortova Consulting Group, Inc.</a>, the current maintainers of the project. Being a community effort, portions of the code have been contributed by others, most notably from the <a href="http://www.oculan.com">Oculan Corporation</a>, the original maintainers of the project and creators of the bulk of the code. Please see the source for detailed copyright notices. 
       </p>
         
       <p>

Update of /cvsroot/opennms/opennms/tools/contrib
In directory sc8-pr-cvs1:/tmp/cvs-serv24499

Modified Files:
	send-event.pl 
Log Message:
Updated some documentation in send-event.pl. Thx Wrolf and Gary


Index: send-event.pl
===================================================================
RCS file: /cvsroot/opennms/opennms/tools/contrib/send-event.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- send-event.pl	6 Feb 2003 01:55:50 -0000	1.4
+++ send-event.pl	17 Mar 2003 16:14:41 -0000	1.5
@@ -222,7 +222,7 @@
          --help, -h        this help message
 
          --timezone, -t    the time zone you are in
-         --service, -s     service name (from services.xml)
+         --service, -s     service name 
          --nodeid, -n      node identifier (numeric)
          --interface, -i   IP address of the interface
          --descr, -d       a description for the event browser
@@ -236,6 +236,13 @@
                            7 = Critical
 	--parm, -p         an event parameter (ie:
                            --parm 'url http://www.google.com/')
+Example:
+
+        Force discovery of a node
+
+        send-event.pl \\
+        uei.opennms.org/internal/discovery/newSuspect \\
+        --interface 172.16.1.1
 
 END
 }

Update of /cvsroot/opennms/opennms/src/services/org/opennms/protocols/icmp
In directory sc8-pr-cvs1:/tmp/cvs-serv31259/protocols/icmp

Modified Files:
	AddressMaskReply.java AddressMaskRequest.java 
	ErrorMessage.java ICMPHeader.java IcmpSocket.java 
	TimestampReply.java TimestampRequest.java 
Log Message:
Cleaning up some ICMP stuff


Index: AddressMaskReply.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/services/org/opennms/protocols/icmp/AddressMaskReply.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AddressMaskReply.java	14 Nov 2002 22:19:39 -0000	1.2
+++ AddressMaskReply.java	5 Mar 2003 20:22:38 -0000	1.3
@@ -81,7 +81,7 @@
 	 * the ICMP message.
 	 *
 	 */
-	public void computeChecksum( )
+	public final void computeChecksum( )
 	{
 		OC16ChecksumProducer summer = new OC16ChecksumProducer();
 		super.computeChecksum(summer);
@@ -106,7 +106,7 @@
 	 *	does not have enough storage space.
 	 *
 	 */
-	public int storeToBuffer(byte[] buf, int offset)
+	public final int storeToBuffer(byte[] buf, int offset)
 	{
 		if(buf.length < (offset + 12))
 			throw new IndexOutOfBoundsException("Array index overflow in buffer build");
@@ -144,7 +144,7 @@
 	 * @exception java.lang.IllegalArgumentException Thrown if the ICMP type
 	 *	is not an Address Mask reply.
 	 */
-	public int loadFromBuffer(byte[] buf, int offset)
+	public final int loadFromBuffer(byte[] buf, int offset)
 	{
 		if(buf.length < (offset + 12))
 			throw new IndexOutOfBoundsException("Insufficient data to load ICMP header");
@@ -157,9 +157,9 @@
 		//
 		// get the mask
 		//
-		m_mask = byteToInt(buf[offset++]) << 24  |
-			 byteToInt(buf[offset++]) << 16  |
-			 byteToInt(buf[offset++]) <<  8  |
+		m_mask = (byteToInt(buf[offset++]) << 24)  |
+			 (byteToInt(buf[offset++]) << 16)  |
+			 (byteToInt(buf[offset++]) <<  8)  |
 			 byteToInt(buf[offset++]);
 
 		return offset;
@@ -168,7 +168,7 @@
 	/**
 	 * Used to get the IPv4 32-bit address mask.
 	 */
-	public int getAddressMask( )
+	public final int getAddressMask( )
 	{
 		return m_mask;
 	}
@@ -176,7 +176,7 @@
 	/**
 	 * Used to set the IPv4 32-bit address mask.
 	 */
-	public void setAddressMask(int mask)
+	public final void setAddressMask(int mask)
 	{
 		m_mask = mask;
 	}
@@ -184,7 +184,7 @@
 	/**
 	 * Converts the object to a stream of bytes.
 	 */
-	public byte[] toBytes()
+	public final byte[] toBytes()
 	{
 		byte[] buf = new byte[12];
 		storeToBuffer(buf, 0);

Index: AddressMaskRequest.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/services/org/opennms/protocols/icmp/AddressMaskRequest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AddressMaskRequest.java	14 Nov 2002 22:19:39 -0000	1.2
+++ AddressMaskRequest.java	5 Mar 2003 20:22:38 -0000	1.3
@@ -76,7 +76,7 @@
 	 * the ICMP message.
 	 *
 	 */
-	public void computeChecksum( )
+	public final void computeChecksum( )
 	{
 		OC16ChecksumProducer summer = new OC16ChecksumProducer();
 		super.computeChecksum(summer);
@@ -101,7 +101,7 @@
 	 *	does not have enough storage space.
 	 *
 	 */
-	public int storeToBuffer(byte[] buf, int offset)
+	public final int storeToBuffer(byte[] buf, int offset)
 	{
 		if(buf.length < (offset + 12))
 			throw new IndexOutOfBoundsException("Array index overflow in buffer build");
@@ -137,7 +137,7 @@
 	 * @exception java.lang.IllegalArgumentException Thrown if the ICMP type
 	 *	is not an Address Mask Request.
 	 */
-	public int loadFromBuffer(byte[] buf, int offset)
+	public final int loadFromBuffer(byte[] buf, int offset)
 	{
 		if(buf.length < (offset + 12))
 			throw new IndexOutOfBoundsException("Insufficient data to load ICMP header");
@@ -155,7 +155,7 @@
 	 * Converts the object to an array of bytes
 	 *
 	 */
-	public byte[] toBytes()	
+	public final byte[] toBytes()	
 	{
 		byte[] b = new byte[12];
 		storeToBuffer(b,0);

Index: ErrorMessage.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/services/org/opennms/protocols/icmp/ErrorMessage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ErrorMessage.java	14 Nov 2002 22:19:39 -0000	1.2
+++ ErrorMessage.java	5 Mar 2003 20:22:39 -0000	1.3
@@ -99,7 +99,7 @@
 	 * @exception java.lang.IndexOutOfBoundsException Thrown if there
 	 *	is not sufficent data in the buffer.
 	 */
-	public int loadFromBuffer(byte[] buf, int offset)
+	public final int loadFromBuffer(byte[] buf, int offset)
 	{
 		//
 		// minimum length
@@ -141,7 +141,7 @@
 	 * @return The IP Header in error.
 	 *
 	 */
-	public IPHeader getIPHeader( )
+	public final IPHeader getIPHeader( )
 	{
 		return m_iphdr;
 	}
@@ -163,7 +163,7 @@
 	 * @return The first 8 bytes of the packet in error.
 	 *
 	 */
-	public byte[] getProtocolData()
+	public final byte[] getProtocolData()
 	{
 		return m_protoData;
 	}

Index: ICMPHeader.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/services/org/opennms/protocols/icmp/ICMPHeader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ICMPHeader.java	14 Nov 2002 22:19:39 -0000	1.2
+++ ICMPHeader.java	5 Mar 2003 20:22:39 -0000	1.3
@@ -125,7 +125,7 @@
 	 *
 	 * @return The next 16-bit sequence number, may be negative.
 	 */
-	public static synchronized short nextSequenceId()
+	public final static synchronized short nextSequenceId()
 	{
 		if(sm_seq == 0)
 		{
@@ -280,7 +280,7 @@
 	 *
 	 * @return The ICMP type.
 	 */
-	public byte getType( )
+	public final byte getType( )
 	{
 		return m_type;
 	}
@@ -302,7 +302,7 @@
 	 * @return The ICMP code.
 	 *
 	 */
-	public byte getCode( )
+	public final byte getCode( )
 	{
 		return m_code;
 	}
@@ -313,7 +313,7 @@
 	 * @param code The new ICMP code.
 	 *
 	 */
-	public void setCode(byte code)
+	public final void setCode(byte code)
 	{
 		m_code = code;
 	}
@@ -325,7 +325,7 @@
 	 * @return The 16-bit sequence identifier.
 	 *
 	 */
-	public short getSequenceId( )
+	public final short getSequenceId( )
 	{
 		return m_sequence;
 	}
@@ -339,7 +339,7 @@
 	 * @return The new 16-bit sequence identifier.
 	 *
 	 */
-	public short setNextSequenceId( )
+	public final short setNextSequenceId( )
 	{
 		m_sequence = nextSequenceId();
 		return m_sequence;
@@ -351,7 +351,7 @@
 	 * @param id The new 16-bit sequence id.
 	 *
 	 */
-	public void setSequenceId(short id)
+	public final void setSequenceId(short id)
 	{
 		m_sequence = id;
 	}
@@ -362,7 +362,7 @@
 	 * @return The 16-bit identity.
 	 *
 	 */
-	public short getIdentity( )
+	public final short getIdentity( )
 	{
 		return m_ident;
 	}
@@ -374,7 +374,7 @@
 	 * @param identity The header's new identity.
 	 *
 	 */
-	public void setIdentity(short identity)
+	public final void setIdentity(short identity)
 	{
 		m_ident = identity;
 	}
@@ -389,7 +389,7 @@
 	 * @return The 16-bit one's compliment checksum.
 	 *
 	 */
-	public short getChecksum( )
+	public final short getChecksum( )
 	{
 		return m_checksum;
 	}
@@ -527,7 +527,7 @@
 	 * @return True if the header marks an echo reply.
 	 *
 	 */
-	public boolean isEchoReply( )
+	public final boolean isEchoReply( )
 	{
 		return (m_type == TYPE_ECHO_REPLY);
 	}
@@ -540,7 +540,7 @@
 	 * @return True if the header marks an echo request.
 	 *
 	 */
-	public boolean isEchoRequest( )
+	public final boolean isEchoRequest( )
 	{
 		return (m_type == TYPE_ECHO_REQUEST);
 	}

Index: IcmpSocket.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/services/org/opennms/protocols/icmp/IcmpSocket.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IcmpSocket.java	14 Nov 2002 22:19:39 -0000	1.2
+++ IcmpSocket.java	5 Mar 2003 20:22:39 -0000	1.3
@@ -39,7 +39,7 @@
  * @author <a href="http://www.opennms.org/">OpenNMS</a>
  *
  */
-public class IcmpSocket
+public final class IcmpSocket
 {
 	/**
 	 * This instance is used by the native code
@@ -101,7 +101,7 @@
 	 * 	reading the next ICMP message.
 	 *
 	 */
-	public native DatagramPacket receive()
+	public final native DatagramPacket receive()
 		throws IOException;
 	
 	/**
@@ -116,7 +116,7 @@
 	 * @exception java.net.NoRouteToHostException Thrown if the
 	 * 	destination address is a broadcast address.
 	 */
-	public native void send(DatagramPacket packet)
+	public final native void send(DatagramPacket packet)
 		throws IOException;
 	
 	/**
@@ -127,7 +127,7 @@
 	 * this instance should result in exceptions
 	 * being generated.
 	 */
-	public native void close();
+	public final native void close();
 }
 
 

Index: TimestampReply.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/services/org/opennms/protocols/icmp/TimestampReply.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TimestampReply.java	14 Nov 2002 22:19:39 -0000	1.2
+++ TimestampReply.java	5 Mar 2003 20:22:39 -0000	1.3
@@ -84,7 +84,7 @@
 	 * the ICMP message.
 	 *
 	 */
-	public void computeChecksum( )
+	public final void computeChecksum( )
 	{
 		OC16ChecksumProducer summer = new OC16ChecksumProducer();
 		super.computeChecksum(summer);
@@ -111,7 +111,7 @@
 	 *	does not have enough storage space.
 	 *
 	 */
-	public int storeToBuffer(byte[] buf, int offset)
+	public final int storeToBuffer(byte[] buf, int offset)
 	{
 		if(buf.length < (offset + 20))
 			throw new IndexOutOfBoundsException("Array index overflow in buffer build");
@@ -160,7 +160,7 @@
 	 * @exception java.lang.IllegalArgumentException Thrown if the ICMP type
 	 *	is not an Timestamp Reply.
 	 */
-	public int loadFromBuffer(byte[] buf, int offset)
+	public final int loadFromBuffer(byte[] buf, int offset)
 	{
 		if(buf.length < (offset + 20))
 			throw new IndexOutOfBoundsException("Insufficient data to load ICMP header");
@@ -195,7 +195,7 @@
 	 * @see java.util.Date#getTime
 	 *
 	 */
-	public void setOriginateTS( )
+	public final void setOriginateTS( )
 	{
 		m_origStamp = (int)((new Date()).getTime() & 0xffffffff);
 	}
@@ -207,7 +207,7 @@
 	 * @param ts The timestamp in milliseconds
 	 *
 	 */
-	public void setOriginateTS(int ts)
+	public final void setOriginateTS(int ts)
 	{
 		m_origStamp = ts;
 	}
@@ -219,7 +219,7 @@
 	 * @return The 32-bit timestamp in milliseconds.
 	 *
 	 */
-	public int getOriginateTS( )
+	public final int getOriginateTS( )
 	{
 		return m_origStamp;
 	}
@@ -232,7 +232,7 @@
 	 * @see java.util.Date#getTime
 	 *
 	 */
-	public void setReceiveTS( )
+	public final void setReceiveTS( )
 	{
 		m_recvStamp = (int)((new Date()).getTime() & 0xffffffff);
 	}
@@ -244,7 +244,7 @@
 	 * @param ts The timestamp in milliseconds
 	 *
 	 */
-	public void setReceiveTS(int ts)
+	public final void setReceiveTS(int ts)
 	{
 		m_recvStamp = ts;
 	}
@@ -256,7 +256,7 @@
 	 * @return The 32-bit timestamp in milliseconds.
 	 *
 	 */
-	public int getReceiveTS( )
+	public final int getReceiveTS( )
 	{
 		return m_recvStamp;
 	}
@@ -269,7 +269,7 @@
 	 * @see java.util.Date#getTime
 	 *
 	 */
-	public void setTransmitTS( )
+	public final void setTransmitTS( )
 	{
 		m_xmitStamp = (int)((new Date()).getTime() & 0xffffffff);
 	}
@@ -281,7 +281,7 @@
 	 * @param ts The timestamp in milliseconds
 	 *
 	 */
-	public void setTransmitTS(int ts)
+	public final void setTransmitTS(int ts)
 	{
 		m_xmitStamp = ts;
 	}
@@ -293,7 +293,7 @@
 	 * @return The 32-bit timestamp in milliseconds.
 	 *
 	 */
-	public int getTransmitTS( )
+	public final int getTransmitTS( )
 	{
 		return m_xmitStamp;
 	}
@@ -302,7 +302,7 @@
 	 * Converts the object to an array of bytes.
 	 *
 	 */
-	public byte[] toBytes()
+	public final byte[] toBytes()
 	{
 		byte[] b = new byte[20];
 		storeToBuffer(b, 0);

Index: TimestampRequest.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/services/org/opennms/protocols/icmp/TimestampRequest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TimestampRequest.java	14 Nov 2002 22:19:39 -0000	1.2
+++ TimestampRequest.java	5 Mar 2003 20:22:40 -0000	1.3
@@ -80,7 +80,7 @@
 	 * the ICMP message.
 	 *
 	 */
-	public void computeChecksum( )
+	public final void computeChecksum( )
 	{
 		OC16ChecksumProducer summer = new OC16ChecksumProducer();
 		super.computeChecksum(summer);
@@ -107,7 +107,7 @@
 	 *	does not have enough storage space.
 	 *
 	 */
-	public int storeToBuffer(byte[] buf, int offset)
+	public final int storeToBuffer(byte[] buf, int offset)
 	{
 		if(buf.length < (offset + 20))
 			throw new IndexOutOfBoundsException("Array index overflow in buffer build");
@@ -151,7 +151,7 @@
 	 * @exception java.lang.IllegalArgumentException Thrown if the ICMP type
 	 *	is not an Timestamp Request.
 	 */
-	public int loadFromBuffer(byte[] buf, int offset)
+	public final int loadFromBuffer(byte[] buf, int offset)
 	{
 		if(buf.length < (offset + 20))
 			throw new IndexOutOfBoundsException("Insufficient data to load ICMP header");
@@ -178,7 +178,7 @@
 	 * @see java.util.Date#getTime
 	 *
 	 */
-	public void setOriginateTS( )
+	public final void setOriginateTS( )
 	{
 		m_origStamp = (int)((new Date()).getTime() & 0xffffffff);
 	}
@@ -190,7 +190,7 @@
 	 * @param ts The timestamp in milliseconds
 	 *
 	 */
-	public void setOriginateTS(int ts)
+	public final void setOriginateTS(int ts)
 	{
 		m_origStamp = ts;
 	}
@@ -202,7 +202,7 @@
 	 * @return The 32-bit timestamp in milliseconds.
 	 *
 	 */
-	public int getOriginateTS( )
+	public final int getOriginateTS( )
 	{
 		return m_origStamp;
 	}
@@ -211,7 +211,7 @@
 	 * Converts the object to an array of bytes.
 	 *
 	 */
-	public byte[] toBytes()
+	public final byte[] toBytes()
 	{
 		byte[] b = new byte[20];
 		storeToBuffer(b, 0);

Update of /cvsroot/opennms/opennms/src/services/org/opennms/netmgt/ping
In directory sc8-pr-cvs1:/tmp/cvs-serv31259/netmgt/ping

Modified Files:
	Packet.java Reply.java ReplyReceiver.java 
Log Message:
Cleaning up some ICMP stuff


Index: Packet.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/services/org/opennms/netmgt/ping/Packet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Packet.java	31 Jan 2003 14:19:01 -0000	1.4
+++ Packet.java	5 Mar 2003 20:22:37 -0000	1.5
@@ -161,7 +161,7 @@
 	/**
 	 * Returns the time the packet was sent.
 	 */
-	public long getSentTime()
+	public final long getSentTime()
 	{
 		return m_sent;
 	}
@@ -171,7 +171,7 @@
 	 *
 	 * @see java.lang.System#currentTimeMillis
 	 */
-	public long setSentTime()
+	public final long setSentTime()
 	{
 		m_sent = System.currentTimeMillis();
 		return m_sent;
@@ -182,7 +182,7 @@
 	 *
 	 * @param time	The new sent time.
 	 */
-	public void setSentTime(long time)
+	public final void setSentTime(long time)
 	{
 		m_sent = time;
 	}
@@ -190,7 +190,7 @@
 	/**
 	 * Gets the currently set received time.
 	 */
-	public long getReceivedTime()
+	public final long getReceivedTime()
 	{
 		return m_recv;
 	}
@@ -200,7 +200,7 @@
 	 *
 	 * @see java.lang.System#currentTimeMillis
 	 */
-	public long setReceivedTime()
+	public final long setReceivedTime()
 	{
 		m_recv = System.currentTimeMillis();
 		return m_recv;
@@ -213,7 +213,7 @@
 	 * @param time	The new received time.
 	 *
 	 */
-	public void setReceivedTime(long time)
+	public final void setReceivedTime(long time)
 	{
 		m_recv = time;
 	}
@@ -221,7 +221,7 @@
         /**
          * Sets the ping Round Trip Time
          */
-        public void setPingRTT(long time)
+        public final void setPingRTT(long time)
         {
                 m_rtt = time;
         }
@@ -229,7 +229,7 @@
         /**
          * Gets the ping Round Trip Time
          */
-        public long getPingRTT()
+        public final long getPingRTT()
         {
                 return m_rtt;
         }
@@ -240,7 +240,7 @@
 	 * This is a combination of the headers size, 
 	 * plus the padding, and the IPHeader size.
 	 */
-	public static int getNetworkSize( )
+	public final static int getNetworkSize( )
 	{
 		return (ICMPHeader.getNetworkSize() + 32 + PAD_SIZE);
 	}
@@ -249,7 +249,7 @@
 	 * Computes and stores the current checksum based upon
 	 * the data currently contained in the object.
 	 */
-	public void computeChecksum( )
+	public final void computeChecksum( )
 	{
 		OC16ChecksumProducer summer = new OC16ChecksumProducer();
 		
@@ -282,7 +282,7 @@
 	/**
 	 * Returns the currently set Thread ID
 	 */
-	public long getTID()
+	public final long getTID()
 	{
 		return m_tid;
 	}
@@ -290,7 +290,7 @@
 	/**
 	 * Sets the current Thread Id
 	 */
-	public void setTID(long tid)
+	public final void setTID(long tid)
 	{
 		m_tid = tid;
 	}
@@ -311,7 +311,7 @@
 	 * 	sufficent set the state of the object
 	 *
 	 */
-	public int loadFromBuffer(byte[] buf, int offset)
+	public final int loadFromBuffer(byte[] buf, int offset)
 	{
 		if((buf.length - offset) < getNetworkSize())
 			throw new IndexOutOfBoundsException("Insufficient Data");
@@ -372,7 +372,7 @@
 	 *	does not have enough storage space.
 	 *
 	 */
-	public int storeToBuffer(byte[] buf, int offset)
+	public final int storeToBuffer(byte[] buf, int offset)
 	{
 		if((buf.length - offset) < getNetworkSize())
 			throw new IndexOutOfBoundsException("Insufficient Buffer Size");
@@ -420,7 +420,7 @@
 	 *
 	 * @return The object as an array of bytes.
 	 */
-	public byte[] toBytes()
+	public final byte[] toBytes()
 	{
 		byte[]	buf = new byte[getNetworkSize()];
 		storeToBuffer(buf, 0);

Index: Reply.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/services/org/opennms/netmgt/ping/Reply.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Reply.java	14 Nov 2002 22:19:28 -0000	1.3
+++ Reply.java	5 Mar 2003 20:22:38 -0000	1.4
@@ -86,7 +86,7 @@
 	/**
 	 * Returns the identity of the packet.
 	 */
-	public short getIdentity()
+	public final short getIdentity()
 	{
 		return m_packet.getIdentity();
 	}
@@ -96,7 +96,7 @@
 	 * that sent the reply.
 	 *
 	 */
-	public InetAddress getAddress()
+	public final InetAddress getAddress()
 	{
 		return m_address;
 	}
@@ -104,7 +104,7 @@
 	/**
 	 * Returns the ICMP packet for the reply.
 	 */
-	public Packet getPacket()
+	public final Packet getPacket()
 	{
 		return m_packet;
 	}

Index: ReplyReceiver.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/services/org/opennms/netmgt/ping/ReplyReceiver.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ReplyReceiver.java	31 Jan 2003 14:19:01 -0000	1.3
+++ ReplyReceiver.java	5 Mar 2003 20:22:38 -0000	1.4
@@ -220,7 +220,7 @@
 	 *	already been started.
 	 *
 	 */
-	public synchronized void start()
+	public final synchronized void start()
 	{
 		if(m_worker != null)
 			throw new IllegalStateException("The Fiber is already running or has run");
@@ -239,7 +239,7 @@
 	 * 	was never started.
 	 *
 	 */
-	public synchronized void stop()
+	public final synchronized void stop()
 	{
 		if(m_worker == null)
 			throw new IllegalStateException("The Fiber has not been started");
@@ -262,7 +262,7 @@
 	 * operating system will continue to deliver them.
 	 *
 	 */
-	public synchronized void pause()
+	public final synchronized void pause()
 	{
 		if(m_worker == null || !m_worker.isAlive())
 			throw new IllegalStateException("The fiber is not running");
@@ -273,7 +273,7 @@
 	 * Resumes the recipt and processing of ICMP messages.
 	 *
 	 */
-	public synchronized void resume()
+	public final synchronized void resume()
 	{
 		if(m_worker == null || !m_worker.isAlive())
 			throw new IllegalStateException("The fiber is not running");
@@ -285,7 +285,7 @@
 	 *
 	 * @return The fiber's name.
 	 */
-	public String getName()
+	public final String getName()
 	{
 		return m_name;
 	}
@@ -295,7 +295,7 @@
 	 *
 	 * @return The fiber's status.
 	 */
-	public synchronized int getStatus()
+	public final synchronized int getStatus()
 	{
 		if(m_status == RUNNING && m_paused)
 			return PAUSED;
@@ -309,7 +309,7 @@
 	 * in the appropoiate queue for use by other threads.
 	 *
 	 */
-	public void run()
+	public final void run()
 	{
 		synchronized(this)
 		{

Update of /cvsroot/opennms/opennms/src/web/web/help
In directory sc8-pr-cvs1:/tmp/cvs-serv17748

Modified Files:
	about.jsp 
Log Message:
Updated copyright info on About page


Index: about.jsp
===================================================================
RCS file: /cvsroot/opennms/opennms/src/web/web/help/about.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- about.jsp	7 Feb 2003 16:50:32 -0000	1.4
+++ about.jsp	3 Mar 2003 16:37:43 -0000	1.5
@@ -57,7 +57,7 @@
     <td>
       <h3>OpenNMS Web Console</h3>
       <p>
-        <a href="http://www.opennms.org/">OpenNMS</a>, Copyright &copy; 2001 Oculan Corp.
+        <a href="http://www.opennms.org/">OpenNMS</a>, Copyright &copy; 2003 <a href="http://www.sortova.com">Sortova Consulting Group, Inc.</a>
       </p>
         
       <p>

Update of /cvsroot/opennms/opennms
In directory sc8-pr-cvs1:/tmp/cvs-serv21959

Modified Files:
	CHANGELOG 
Log Message:
Updated CHANGELOG


Index: CHANGELOG
===================================================================
RCS file: /cvsroot/opennms/opennms/CHANGELOG,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- CHANGELOG	15 Feb 2003 21:25:38 -0000	1.47
+++ CHANGELOG	28 Feb 2003 22:33:51 -0000	1.48
@@ -1,3 +1,9 @@
+1.1.1 to 1.1.2
+----------------------------------------------------------------------
+- Added security roles to web.xml. Bug 715. Thx DJ
+- Corrected issues with last day/week/month/year buttons in webUI.
+- Added check to handle null terminated strings in traps. Thx Dave W.
+
 1.1.0 to 1.1.1
 ----------------------------------------------------------------------
 - Fixed a small bug with RRAs. Bug 707. Thx Volker

Update of /cvsroot/opennms/opennms/src/web/etc
In directory sc8-pr-cvs1:/tmp/cvs-serv20586

Modified Files:
	web.xml 
Log Message:
Added security role tags to web.xml to remove logs in web.log
under Tomcat 4.1. Thx DJ. Bug 715


Index: web.xml
===================================================================
RCS file: /cvsroot/opennms/opennms/src/web/etc/web.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- web.xml	2 Feb 2003 14:42:55 -0000	1.5
+++ web.xml	28 Feb 2003 22:31:25 -0000	1.6
@@ -1226,4 +1226,26 @@
     <auth-method>BASIC</auth-method>
     <realm-name>OpenNMS Web Console</realm-name>
   </login-config>
+
+  <security-role>
+    <description>
+      OpenNMS Administrator
+    </description>
+    <role-name>OpenNMS Administrator</role-name>
+  </security-role>
+
+  <security-role>
+    <description>
+      OpenNMS RTC Daemon
+    </description>
+    <role-name>OpenNMS RTC Daemon</role-name>
+  </security-role>
+
+  <security-role>
+    <description>
+      OpenNMS User
+    </description>
+    <role-name>OpenNMS User</role-name>
+  </security-role>
+
 </web-app>