[Javanetsim-cvs] javaNetSim/core/protocolsuite/tcp_ip ProtocolStack.java,1.8,1.9 Udp.java,1.8,1.9

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

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

Modified Files:
	ProtocolStack.java Udp.java 
Log Message:


Index: ProtocolStack.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/ProtocolStack.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ProtocolStack.java	19 Nov 2005 21:53:51 -0000	1.8
--- ProtocolStack.java	20 Nov 2005 10:25:26 -0000	1.9
***************
*** 748,752 ****
  
  					UDP_packet temp = (UDP_packet)inPacket;
! 
                                          try{
                                              mUDPprotocol.receiveUDPPacket(temp);
--- 748,752 ----
  
  					UDP_packet temp = (UDP_packet)inPacket;
!                                                 System.out.println("UDP packet here trying to pass up!!!!");
                                          try{
                                              mUDPprotocol.receiveUDPPacket(temp);
***************
*** 1319,1322 ****
--- 1319,1323 ----
              
              try{
+                 System.out.println("Trying to send!!!!!!!");                
                  DestIPAddress=mUDPprotocol.getApplicationDestIP(application);
                  destPort=mUDPprotocol.getApplicationDestPortNumber(application);

Index: Udp.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/Udp.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Udp.java	20 Nov 2005 07:55:48 -0000	1.8
--- Udp.java	20 Nov 2005 10:25:26 -0000	1.9
***************
*** 207,212 ****
                              Elm.connectedtoPort=inPacket.get_srcPort();
                              
!                             PortTable.remove(inPacket.get_destPort()); //delete old element
!                             PortTable.put(new Integer(inPacket.get_destPort()),Elm); //hash table update
                              
                              //now we decompose UDP datagram
--- 207,212 ----
                              Elm.connectedtoPort=inPacket.get_srcPort();
                              
!                             //PortTable.remove(inPacket.get_destPort()); //delete old element
!                             //PortTable.put(new Integer(inPacket.get_destPort()),Elm); //hash table update
                              
                              //now we decompose UDP datagram
***************
*** 405,411 ****
                              Elm.connectedtoIP=inDestIPAddress;
                              Elm.connectedtoPort=indestPort;          
!                             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                                                  
                      }
                   number++;   
--- 405,409 ----
                              Elm.connectedtoIP=inDestIPAddress;
                              Elm.connectedtoPort=indestPort;          
!                             Elm.application = application;                             
                      }
                   number++;   
***************
*** 505,510 ****
              Elm.connectedtoPort=0;
              
!          PortTable.remove(PortToClose); //delete old element
!          PortTable.put(PortToClose,Elm); //hash table update  
             } else throw new TransportLayerException("UDP Error: port "+ PortToClose +" is not being LISTENED to by the application: \"" + application.toString() + "\".");   
          }
--- 503,508 ----
              Elm.connectedtoPort=0;
              
!          //PortTable.remove(PortToClose); //delete old element
!          //PortTable.put(PortToClose,Elm); //hash table update  
             } else throw new TransportLayerException("UDP Error: port "+ PortToClose +" is not being LISTENED to by the application: \"" + application.toString() + "\".");   
          }
***************
*** 531,536 ****
              Elm.connectedtoPort=0;
              
!          PortTable.remove(PortToFree); //delete old element
!          PortTable.put(PortToFree,Elm); //hash table update  
            } else throw new TransportLayerException("UDP Error: port "+ PortToFree +" is not BUSY by the application: \"" + application.toString() + "\".");   
          }
--- 529,534 ----
              Elm.connectedtoPort=0;
              
!          //PortTable.remove(PortToFree); //delete old element
!          //PortTable.put(PortToFree,Elm); //hash table update  
            } else throw new TransportLayerException("UDP Error: port "+ PortToFree +" is not BUSY by the application: \"" + application.toString() + "\".");   
          }
***************
*** 571,576 ****
                              Elm.connectedtoPort=0;
              
!                             PortTable.remove(inPort); //delete old element
!                             PortTable.put(inPort,Elm); //hash table update  
                              break;
                          case 1: // port is being listened to by whom?
--- 569,574 ----
                              Elm.connectedtoPort=0;
              
!                             //PortTable.remove(inPort); //delete old element
!                             //PortTable.put(inPort,Elm); //hash table update  
                              break;
                          case 1: // port is being listened to by whom?
***************
*** 624,628 ****
                      //key = new Integer((Integer) keys.nextElement());
                      //Elm = (UDP_HashTableElement) PortTable.get(key);
!                     Elm = (UDP_HashTableElement) itr.next();
                  }catch(Exception ex){ System.out.println(ex.toString()); }
                  
--- 622,628 ----
                      //key = new Integer((Integer) keys.nextElement());
                      //Elm = (UDP_HashTableElement) PortTable.get(key);
!                     System.out.println("Getting next itr!!!!!!!");
!                     Elm=(UDP_HashTableElement)itr.next();
!                     System.out.println("GOT ITR!!!!!!!");                
                  }catch(Exception ex){ System.out.println(ex.toString()); }