Update of /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31831/core/protocolsuite/tcp_ip
Modified Files:
ProtocolStack.java
Log Message:
Corrected LayerInfo for IP
Index: ProtocolStack.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/ProtocolStack.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ProtocolStack.java 20 Nov 2005 13:43:57 -0000 1.10
--- ProtocolStack.java 20 Nov 2005 16:20:56 -0000 1.11
***************
*** 211,215 ****
protocolInfo.setObjectName(getParentNodeName());
! protocolInfo.setDataType(trimClassName(inPacket.getClass().getName()));
protocolInfo.setLayer("Network");
--- 211,218 ----
protocolInfo.setObjectName(getParentNodeName());
! if(!(inPacket instanceof ARP_packet) && !(inPacket instanceof ICMP_packet))
! protocolInfo.setDataType("IP_Packet");
! else
! protocolInfo.setDataType(trimClassName(inPacket.getClass().getName()));
protocolInfo.setLayer("Network");
***************
*** 258,264 ****
protocolInfo.setObjectName(getParentNodeName());
!
! protocolInfo.setDataType(trimClassName(inPacket.getClass().getName()));
!
protocolInfo.setLayer("Network");
--- 261,269 ----
protocolInfo.setObjectName(getParentNodeName());
!
! if(!(inPacket instanceof ARP_packet) && !(inPacket instanceof ICMP_packet))
! protocolInfo.setDataType("IP_Packet");
! else
! protocolInfo.setDataType(trimClassName(inPacket.getClass().getName()));
protocolInfo.setLayer("Network");
***************
*** 361,365 ****
protocolInfo.setObjectName(getParentNodeName());
! protocolInfo.setDataType(trimClassName(inPacket.getClass().getName()));
protocolInfo.setLayer("Network");
--- 366,373 ----
protocolInfo.setObjectName(getParentNodeName());
! if(!(inPacket instanceof ARP_packet) && !(inPacket instanceof ICMP_packet))
! protocolInfo.setDataType("IP_Packet");
! else
! protocolInfo.setDataType(trimClassName(inPacket.getClass().getName()));
protocolInfo.setLayer("Network");
***************
*** 429,433 ****
protocolInfo.setObjectName(getParentNodeName());
! protocolInfo.setDataType(trimClassName(inPacket.getClass().getName()));
protocolInfo.setLayer("Network");
--- 437,444 ----
protocolInfo.setObjectName(getParentNodeName());
! if(!(inPacket instanceof ARP_packet) && !(inPacket instanceof ICMP_packet))
! protocolInfo.setDataType("IP_Packet");
! else
! protocolInfo.setDataType(trimClassName(inPacket.getClass().getName()));
protocolInfo.setLayer("Network");
***************
*** 699,703 ****
protocolInfo.setObjectName(getParentNodeName());
! protocolInfo.setDataType(trimClassName(inPacket.getClass().getName()));
protocolInfo.setLayer("Network");
--- 710,717 ----
protocolInfo.setObjectName(getParentNodeName());
! if(!(inPacket instanceof ARP_packet) && !(inPacket instanceof ICMP_packet))
! protocolInfo.setDataType("IP_Packet");
! else
! protocolInfo.setDataType(trimClassName(inPacket.getClass().getName()));
protocolInfo.setLayer("Network");
***************
*** 723,727 ****
protInfo.setObjectName(getParentNodeName());
! protInfo.setDataType(trimClassName(inPacket.getClass().getName()));
protInfo.setLayer("Network");
--- 737,744 ----
protInfo.setObjectName(getParentNodeName());
! if(!(inPacket instanceof ARP_packet) && !(inPacket instanceof ICMP_packet))
! protInfo.setDataType("IP_Packet");
! else
! protInfo.setDataType(trimClassName(inPacket.getClass().getName()));
protInfo.setLayer("Network");
|
