[Javanetsim-cvs] javaNetSim/core Version.java, 1.14, 1.15 WANCorbaClient.java, 1.1, 1.2 WANCorbaServer.java, 1.2, 1.3 WANDatagram.java, 1.1, 1.2 WANNetworkInterface.java, 1.7, 1.8

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

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

Modified Files:
	Version.java WANCorbaClient.java WANCorbaServer.java 
	WANDatagram.java WANNetworkInterface.java 
Log Message:
Minor bugs in WAN interfaces fixed...

Index: WANNetworkInterface.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/WANNetworkInterface.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** WANNetworkInterface.java	19 Nov 2007 18:37:07 -0000	1.7
--- WANNetworkInterface.java	20 Nov 2007 19:17:09 -0000	1.8
***************
*** 188,214 ****
          System.out.println(ptype);
          
!         switch(ptype){
!             case 'M':
!                 ICMP_packet icmp = new ICMP_packet("");
!                 icmp.fromBytes(inPacket);
!                 receivePacket(icmp);
!                 break;
!             case 'I':
!                 IP_packet ip = new IP_packet("");
!                 ip.fromBytes(inPacket);
!                 receivePacket(ip);
!                 break;
!             case 'T':
!                 TCP_packet tcp = new TCP_packet("","",0,0);
!                 tcp.fromBytes(inPacket);
!                 receivePacket(tcp);
!                 break;
!             case 'U':
!                 UDP_packet udp = new UDP_packet("","",0,0);
!                 udp.fromBytes(inPacket);
!                 receivePacket(udp);
!                 break;
          }
-         
      }   
       
--- 188,217 ----
          System.out.println(ptype);
          
!         try{
!             switch(ptype){
!                 case 'M':
!                     ICMP_packet icmp = new ICMP_packet("");
!                     icmp.fromBytes(inPacket);
!                     receivePacket(icmp);
!                     break;
!                 case 'I':
!                     IP_packet ip = new IP_packet("");
!                     ip.fromBytes(inPacket);
!                     receivePacket(ip);
!                     break;
!                 case 'T':
!                     TCP_packet tcp = new TCP_packet("","",0,0);
!                     tcp.fromBytes(inPacket);
!                     receivePacket(tcp);
!                     break;
!                 case 'U':
!                     UDP_packet udp = new UDP_packet("","",0,0);
!                     udp.fromBytes(inPacket);
!                     receivePacket(udp);
!                     break;
!             }
!         }catch(Exception e){
!             //nothing to do....
          }
      }   
       
***************
*** 265,269 ****
                  case RMI:      
                  {
!                     RMIServer = new WANRMIServer(this);  
                      Naming.bind (name, RMIServer);
                      return true;                    
--- 268,272 ----
                  case RMI:      
                  {
!                     RMIServer = new WANRMIServer(this);                      
                      Naming.bind (name, RMIServer);
                      return true;                    
***************
*** 272,276 ****
                  case Corba:
                  {
!                     CORBAServer = new WANCorbaServer(this, name);
                      return true;
                  }
--- 275,279 ----
                  case Corba:
                  {
!                     CORBAServer = new WANCorbaServer(this, Host, port, name);
                      return true;
                  }
***************
*** 311,315 ****
                      RMIClient = null;
                      RMIClient = (WANRMI) Naming.lookup
! 			("rmi://" + Host + "/" + Service);
                      RMIClient.setServiceName(name);
                      
--- 314,318 ----
                      RMIClient = null;
                      RMIClient = (WANRMI) Naming.lookup
! 			("rmi://" + Host + ":" + port + "/" + Service);
                      RMIClient.setServiceName(name);
                      
***************
*** 325,329 ****
                      }
                      CORBAClient = new WANCorbaClient(this);
!                     CORBAClient.Connect(Service);
                      CORBAClient.setServiceName(name);
                      
--- 328,332 ----
                      }
                      CORBAClient = new WANCorbaClient(this);
!                     CORBAClient.Connect(Host, port, Service);
                      CORBAClient.setServiceName(name);
                      

Index: Version.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/Version.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Version.java	15 Oct 2007 18:25:54 -0000	1.14
--- Version.java	20 Nov 2007 19:17:09 -0000	1.15
***************
*** 40,48 ****
   */
  public class Version {
! 	public final static String CORE_VERSION = "v0.38";		//version of the simulation core
  	public final static String YEARS = "2005 - 2007";
          
  	public static final String TEAM_MEMBERS[] = { 
!                         "http://sf.net/projects/javanetsim","release date: 03 Nov 2007", "",
                          "fork of jFirewallSim project (http://sf.net/projects/jfirewallsim/)",                        
                          "from 03 Nov 2005","",
--- 40,48 ----
   */
  public class Version {
! 	public final static String CORE_VERSION = "v0.39";		//version of the simulation core
  	public final static String YEARS = "2005 - 2007";
          
  	public static final String TEAM_MEMBERS[] = { 
!                         "http://sf.net/projects/javanetsim","release date: 20 Nov 2007", "",
                          "fork of jFirewallSim project (http://sf.net/projects/jfirewallsim/)",                        
                          "from 03 Nov 2005","",

Index: WANCorbaClient.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/WANCorbaClient.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** WANCorbaClient.java	19 Nov 2007 15:14:07 -0000	1.1
--- WANCorbaClient.java	20 Nov 2007 19:17:09 -0000	1.2
***************
*** 28,34 ****
      }
      
!     public void Connect(String service){
           try{
!             String args[] = {"","-ORBInitialPort","1050","-ORBInitialHost","localhost"};
               
              orb = ORB.init(args, null);
--- 28,34 ----
      }
      
!     public void Connect(String ORBHostname, int ORBPort, String service){
           try{
!             String args[] = {"","-ORBInitialPort",String.valueOf(ORBPort),"-ORBInitialHost",ORBHostname};
               
              orb = ORB.init(args, null);

Index: WANCorbaServer.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/WANCorbaServer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** WANCorbaServer.java	19 Nov 2007 15:10:28 -0000	1.2
--- WANCorbaServer.java	20 Nov 2007 19:17:09 -0000	1.3
***************
*** 47,53 ****
    WANNetworkInterface parentInterface;
  
!   public WANCorbaServer(WANNetworkInterface inParentInterface, String name) {
      parentInterface = inParentInterface;
!     String args[] = {"","-ORBInitialPort","1050","-ORBInitialHost","localhost"};
      parentInterface.addLayerInfo("Wan interface", "Starting CORBA Server...");
      orb = ORB.init(args, null);  
--- 47,53 ----
    WANNetworkInterface parentInterface;
  
!   public WANCorbaServer(WANNetworkInterface inParentInterface, String ORBHostname, int ORBPort, String name) {
      parentInterface = inParentInterface;
!     String args[] = {"","-ORBInitialPort",String.valueOf(ORBPort),"-ORBInitialHost",ORBHostname};
      parentInterface.addLayerInfo("Wan interface", "Starting CORBA Server...");
      orb = ORB.init(args, null);  

Index: WANDatagram.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/WANDatagram.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** WANDatagram.java	19 Nov 2007 18:37:07 -0000	1.1
--- WANDatagram.java	20 Nov 2007 19:17:09 -0000	1.2
***************
*** 49,52 ****
--- 49,53 ----
                  }else{
                      s =  new DatagramSocket(); 
+                     sendPacket("P#");
                  }
              
***************
*** 134,140 ****
  
                      DatagramPacket packet = new DatagramPacket(buf, buf.length);
!                     s.receive(packet);
                      
!                     w.recievePacket(new String(packet.getData()));
                      
                  }                                
--- 135,143 ----
  
                      DatagramPacket packet = new DatagramPacket(buf, buf.length);
!                     s.receive(packet);                    
                      
!                     setClientAddress(packet.getAddress().getHostAddress(), packet.getPort());
!                     
!                     w.recievePacket((new String(packet.getData(),"ascii")).substring(0, packet.getLength()));
                      
                  }