Update of /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24241/core/protocolsuite/tcp_ip
Modified Files:
ICMP_packet.java IP_packet.java UDP_packet.java
Log Message:
CSU/DSU Unit added; new graphics; wan interface TCP external connection...
Index: ICMP_packet.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/ICMP_packet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ICMP_packet.java 14 Oct 2007 17:19:07 -0000 1.3
--- ICMP_packet.java 15 Oct 2007 18:25:54 -0000 1.4
***************
*** 119,125 ****
return RawtoBytes() + IPtoBytes() + ICMPtoBytes();
}
public String ICMPtoBytes(){
! return "M|" + mMessageCode + "|" + ICMP_message + "#";
}
--- 119,142 ----
return RawtoBytes() + IPtoBytes() + ICMPtoBytes();
}
+
+ public void fromBytes(String str){
+ RawfromBytes(str);
+ IPfromBytes(str);
+ ICMPfromBytes(str);
+ }
public String ICMPtoBytes(){
! return "M|" + mMessageCode + "|" + ICMP_message + "|#";
! }
!
! public void ICMPfromBytes(String str){
! String icmp = str.replaceAll(".*#M\\|", "");
!
! System.out.println(icmp);
!
! String[] fields = icmp.split("\\|");
!
! mMessageCode = Integer.valueOf(fields[0]);
! ICMP_message = fields[1];
}
Index: IP_packet.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/IP_packet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** IP_packet.java 14 Oct 2007 17:19:07 -0000 1.4
--- IP_packet.java 15 Oct 2007 18:25:54 -0000 1.5
***************
*** 251,256 ****
}
public String IPtoBytes(){
! return "I|" + mSourceIPAddress + "|" + mDestIPAddress + "#";
}
--- 251,272 ----
}
+ public void fromBytes(String str){
+ RawfromBytes(str);
+ IPfromBytes(str);
+ }
+
public String IPtoBytes(){
! return "I|" + mSourceIPAddress + "|" + mDestIPAddress + "|#";
! }
!
! public void IPfromBytes(String str){
! String ip = str.replaceAll(".*#I\\|", "");
!
! System.out.println(ip);
!
! String[] fields = ip.split("\\|");
!
! mSourceIPAddress = fields[0];
! mDestIPAddress = fields[1];
}
Index: UDP_packet.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/UDP_packet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** UDP_packet.java 18 Nov 2005 19:41:32 -0000 1.4
--- UDP_packet.java 15 Oct 2007 18:25:54 -0000 1.5
***************
*** 237,240 ****
--- 237,268 ----
}
+ public String toBytes(){
+ return RawtoBytes() + IPtoBytes() + UDPtoBytes();
+ }
+
+ public void fromBytes(String str){
+ RawfromBytes(str);
+ IPfromBytes(str);
+ UDPfromBytes(str);
+ }
+
+ public String UDPtoBytes(){
+ return "U|" + UDP_MessageLength + "|" + UDP_message + "|" + UDP_srcPort + "|" + UDP_destPort + "|#";
+ }
+
+ public void UDPfromBytes(String str){
+ String icmp = str.replaceAll(".*#U\\|", "");
+
+ System.out.println(icmp);
+
+ String[] fields = icmp.split("\\|");
+
+ UDP_MessageLength = Integer.valueOf(fields[0]);
+ UDP_message = fields[1];
+ UDP_srcPort = Integer.valueOf(fields[2]);
+ UDP_destPort = Integer.valueOf(fields[3]);
+ }
+
+
}//EOF
|
