[Javanetsim-cvs] javaNetSim/core/protocolsuite/tcp_ip Echo.java, 1.29, 1.30 ProtocolStack.java, 1.61, 1.62

[Alexander B. <da...@us...>]

Update of /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv11211/core/protocolsuite/tcp_ip

Modified Files:
	Echo.java ProtocolStack.java 
Log Message:
New save file format; import.

Index: ProtocolStack.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/ProtocolStack.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** ProtocolStack.java	15 Oct 2007 12:04:33 -0000	1.61
--- ProtocolStack.java	19 Oct 2007 08:52:27 -0000	1.62
***************
*** 737,740 ****
--- 737,747 ----
                                              Simulation.addLayerInfo(UDP_Info);  
                                             // throw tpe;
+                                         }catch(NullPointerException e){
+                                             LayerInfo UDP_Info = new LayerInfo(getClass().getName());
+                                             UDP_Info.setObjectName(getParentNodeName());
+                                             UDP_Info.setDataType("UDP Packet");
+                                             UDP_Info.setLayer("Transport");
+                                             UDP_Info.setDescription("Transport level doesn't dupport on this device.");                            
+                                             Simulation.addLayerInfo(UDP_Info); 
                                          }
                                          
***************
*** 746,751 ****
                                          }catch(TransportLayerException te){}
                                          catch(NullPointerException e){
!                                               System.out.println("ProtocolStack.java: receivePacket" + e.toString());
!                                               e.printStackTrace();
                                           }
                                           catch (CommunicationException ce) {}
--- 753,762 ----
                                          }catch(TransportLayerException te){}
                                          catch(NullPointerException e){
!                                             LayerInfo UDP_Info = new LayerInfo(getClass().getName());
!                                             UDP_Info.setObjectName(getParentNodeName());
!                                             UDP_Info.setDataType("TCP Packet");
!                                             UDP_Info.setLayer("Transport");
!                                             UDP_Info.setDescription("Transport level doesn't dupport on this device.");                            
!                                             Simulation.addLayerInfo(UDP_Info); 
                                           }
                                           catch (CommunicationException ce) {}
***************
*** 1245,1249 ****
              }                
              return "";            
!        }      
         
        
--- 1256,1264 ----
              }                
              return "";            
!        }     
!         
!         public void intUP(String iface){
!             
!         }
         
        

Index: Echo.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/Echo.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** Echo.java	15 Oct 2007 21:41:42 -0000	1.29
--- Echo.java	19 Oct 2007 08:52:26 -0000	1.30
***************
*** 219,223 ****
                  Simulation.addLayerInfo(protInfo);
  
!                 SendData(Data);        
              } else {
                  LayerInfo protInfo = new LayerInfo(getClass().getName());
--- 219,226 ----
                  Simulation.addLayerInfo(protInfo);
  
!                 SendData(Data);    
!                 //try{
!                 //Thread.sleep(5);
!                 //}catch(Exception e){}
              } else {
                  LayerInfo protInfo = new LayerInfo(getClass().getName());