[Javanetsim-cvs] javaNetSim/core WANDatagram.java, NONE, 1.1 WANNetworkInterface.java, 1.6, 1.7

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

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

Modified Files:
	WANNetworkInterface.java 
Added Files:
	WANDatagram.java 
Log Message:
UDP Transport added for WANs...

Index: WANNetworkInterface.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/WANNetworkInterface.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** WANNetworkInterface.java	19 Nov 2007 15:10:28 -0000	1.6
--- WANNetworkInterface.java	19 Nov 2007 18:37:07 -0000	1.7
***************
*** 61,64 ****
--- 61,65 ----
      
      protected WANSocket s;
+     protected WANDatagram d;
      
      /* Interface properties setup functions */
***************
*** 225,230 ****
                              RMIClient.recievePacket(inPacket.toBytes());
                              break;
-                          case SocketTCP:
                           case SocketUDP:
                              s.sendPacket(inPacket.toBytes());
                              break; 
--- 226,233 ----
                              RMIClient.recievePacket(inPacket.toBytes());
                              break;
                           case SocketUDP:
+                             d.sendPacket(inPacket.toBytes());
+                             break;
+                          case SocketTCP:
                              s.sendPacket(inPacket.toBytes());
                              break; 
***************
*** 273,279 ****
                  }
                  
-                 case SocketTCP:
                  case SocketUDP:
                      if(server){
                          s = new WANSocket(this, Host, port, server);
                          return s.listen();                    
--- 276,288 ----
                  }
                  
                  case SocketUDP:
                      if(server){
+                         d = new WANDatagram(this, Host, port, server);
+                         return d.listen();                    
+                     }else{
+                         return false;
+                     }
+                 case SocketTCP:
+                     if(server){
                          s = new WANSocket(this, Host, port, server);
                          return s.listen();                    
***************
*** 332,337 ****
                      }
                  case SocketUDP:
!                     //nothing to do...
!                     break;
              }
          }catch(Exception e){
--- 341,351 ----
                      }
                  case SocketUDP:
!                     if(!server){
!                         d = new WANDatagram(this, Host, port, server);
!                         connected = d.connect();                    
!                         return connected;
!                     }else{
!                         return false;
!                     }
              }
          }catch(Exception e){
***************
*** 361,366 ****
                      }                    
                      break;
-                 case SocketTCP:
                  case SocketUDP:
                      if(s!= null) s.close();
                      s = null;
--- 375,383 ----
                      }                    
                      break;
                  case SocketUDP:
+                     if(d!= null) d.close();
+                     d = null;
+                     break;                    
+                 case SocketTCP:
                      if(s!= null) s.close();
                      s = null;

--- NEW FILE: WANDatagram.java ---
(This appears to be a binary file; contents omitted.)