[Javanetsim-cvs] javaNetSim/core/protocolsuite/tcp_ip Udp.java,1.14,1.15

[gift <gi...@us...>]

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

Modified Files:
	Udp.java 
Log Message:


Index: Udp.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/Udp.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Udp.java	20 Nov 2005 14:21:58 -0000	1.14
--- Udp.java	20 Nov 2005 14:26:59 -0000	1.15
***************
*** 394,409 ****
                              Elm.connectedtoIP=inDestIPAddress;
                              Elm.connectedtoPort=indestPort;          
- /*<<<<<<< Udp.java
-                             Elm.application = application; //GIFT: UGLY BUG!!!!
-                             //PortTable.remove(new Integer(number+PORT_START_NUMBER)); //delete old element
-                             //PortTable.put(new Integer(number+PORT_START_NUMBER),Elm); //hash table update   
-                             try{
-                             UDP_HashTableElement Elm1 = null;
-                             Elm1 = (UDP_HashTableElement) PortTable.get(new Integer(number+PORT_START_NUMBER));
-                             System.out.println(Elm1.PortStatus);
-                             }catch(Exception e){System.out.println("!!!");}
- =======*/
                              Elm.application = application;                             
- //>>>>>>> 1.9
                      }
                   if (!Reserved) number++;   
--- 394,398 ----
***************
*** 527,533 ****
              UDP_HashTableElement Elm = null;
                 
!             if ( ((UDP_HashTableElement)PortTable.get(inPort)) !=null )
!             {    
!                 Elm =(UDP_HashTableElement)PortTable.get(inPort);                                   
                  switch(Elm.PortStatus)
                      {
--- 516,521 ----
              UDP_HashTableElement Elm = null;
                 
!             if ( (Elm =(UDP_HashTableElement)PortTable.get(inPort)) !=null )
!             {                                        
                  switch(Elm.PortStatus)
                      {
***************
*** 586,605 ****
          public String getApplicationDestIP(int inSrcPort) throws TransportLayerException
          {
!             String dIP=null;/*
! <<<<<<< Udp.java
!             boolean Found=false;
!             Set set = PortTable.keySet();
!             Iterator itr = set.iterator();
!             
!             UDP_HashTableElement ElmDBG = (UDP_HashTableElement)PortTable.get(new Integer(3000));
!             
!             System.out.println(ElmDBG.PortStatus);
!             Enumeration keys = PortTable.elements();
!             
!             //Integer key = Integer.valueOf(keys.nextElement());
!             
!             //System.out.println(key);
! =======
! >>>>>>> 1.12*/
              UDP_HashTableElement Elm = null;
           
--- 574,578 ----
          public String getApplicationDestIP(int inSrcPort) throws TransportLayerException
          {
!             String dIP=null;
              UDP_HashTableElement Elm = null;