[Jake2-commits] jake2/src/jake2/sys NET.java,1.5,1.6

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/sys
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2037/src/jake2/sys

Modified Files:
	NET.java 
Log Message:
code cleanup

Index: NET.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/sys/NET.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** NET.java	17 Oct 2004 21:31:32 -0000	1.5
--- NET.java	20 Oct 2004 20:37:31 -0000	1.6
***************
*** 71,76 ****
      private static DatagramSocket[] ip_sockets = { null, null };
  
!     //=============================================================================
! 
      public static boolean CompareAdr(netadr_t a, netadr_t b) {
          return (a.ip[0] == b.ip[0] && a.ip[1] == b.ip[1] && a.ip[2] == b.ip[2]
--- 71,79 ----
      private static DatagramSocket[] ip_sockets = { null, null };
  
!     /*
!      * CompareAdr
!      * 
!      * Compares with the port
!      */
      public static boolean CompareAdr(netadr_t a, netadr_t b) {
          return (a.ip[0] == b.ip[0] && a.ip[1] == b.ip[1] && a.ip[2] == b.ip[2]
***************
*** 79,85 ****
  
      /*
!      * =================== NET_CompareBaseAdr
       * 
!      * Compares without the port ===================
       */
      public static boolean CompareBaseAdr(netadr_t a, netadr_t b) {
--- 82,88 ----
  
      /*
!      * CompareBaseAdr
       * 
!      * Compares without the port
       */
      public static boolean CompareBaseAdr(netadr_t a, netadr_t b) {
***************
*** 97,112 ****
      }
  
      public static String AdrToString(netadr_t a) {
!         return "" + (a.ip[0] & 0xff) + "." + (a.ip[1] & 0xff) + "."
!                 + (a.ip[2] & 0xff) + "." + (a.ip[3] & 0xff) + ":" + a.port;
      }
  
      public static String BaseAdrToString(netadr_t a) {
!         return "" + (a.ip[0] & 0xff) + "." + (a.ip[1] & 0xff) + "."
!                 + (a.ip[2] & 0xff) + "." + (a.ip[3] & 0xff);
      }
  
      public static boolean StringToAdr(String s, netadr_t a) {
!         if (s.equalsIgnoreCase("localhost")) {
              a.set(net_local_adr);
              return true;
--- 100,135 ----
      }
  
+     /*
+      * AdrToString
+      * 
+      * IP address with the port
+      */
      public static String AdrToString(netadr_t a) {
!         StringBuffer sb = new StringBuffer();
!         sb.append(a.ip[0] & 0xFF).append('.').append(a.ip[1] & 0xFF);
!         sb.append('.');
!         sb.append(a.ip[2] & 0xFF).append('.').append(a.ip[3] & 0xFF);
!         sb.append(':').append(a.port);
!         return sb.toString();
      }
  
+     /*
+      * BaseAdrToString
+      * 
+      * IP address without the port
+      */
      public static String BaseAdrToString(netadr_t a) {
!         StringBuffer sb = new StringBuffer();
!         sb.append(a.ip[0] & 0xFF).append('.').append(a.ip[1] & 0xFF);
!         sb.append('.');
!         sb.append(a.ip[2] & 0xFF).append('.').append(a.ip[3] & 0xFF);
!         return sb.toString();
      }
  
+     /*
+      * StringToAdr
+      */
      public static boolean StringToAdr(String s, netadr_t a) {
!         if (s.equalsIgnoreCase("localhost") || s.equalsIgnoreCase("loopback")) {
              a.set(net_local_adr);
              return true;
***************
*** 126,129 ****
--- 149,155 ----
      }
  
+     /*
+      * IsLocalAddress
+      */
      public static boolean IsLocalAddress(netadr_t adr) {
          return CompareAdr(adr, net_local_adr);
***************
*** 131,139 ****
  
      /*
!      * =============================================================================
       * 
       * LOOPBACK BUFFERS FOR LOCAL PLAYER
       * 
!      * =============================================================================
       */
  
--- 157,165 ----
  
      /*
!      * ==================================================
       * 
       * LOOPBACK BUFFERS FOR LOCAL PLAYER
       * 
!      * ==================================================
       */
  
***************
*** 160,163 ****
--- 186,192 ----
      }
  
+     /*
+      * SendLoopPacket
+      */
      public static void SendLoopPacket(int sock, int length, byte[] data,
              netadr_t to) {
***************
*** 175,179 ****
      }
  
!     //=============================================================================
      public static boolean GetPacket(int sock, netadr_t net_from,
              sizebuf_t net_message) {
--- 204,210 ----
      }
  
!     /*
!      * GetPacket
!      */
      public static boolean GetPacket(int sock, netadr_t net_from,
              sizebuf_t net_message) {
***************
*** 218,223 ****
      }
  
!     //	=============================================================================
! 
      public static void SendPacket(int sock, int length, byte[] data, netadr_t to) {
          if (to.type == Defines.NA_LOOPBACK) {
--- 249,255 ----
      }
  
!     /*
!      * SendPacket
!      */
      public static void SendPacket(int sock, int length, byte[] data, netadr_t to) {
          if (to.type == Defines.NA_LOOPBACK) {
***************
*** 245,252 ****
      }
  
-     //=============================================================================
- 
      /*
!      * ==================== NET_OpenIP ====================
       */
      public static void OpenIP() {
--- 277,282 ----
      }
  
      /*
!      * OpenIP
       */
      public static void OpenIP() {
***************
*** 266,270 ****
  
      /*
!      * ==================== NET_Config ====================
       * 
       * A single player game will only use the loopback code
--- 296,300 ----
  
      /*
!      * Config
       * 
       * A single player game will only use the loopback code
***************
*** 285,299 ****
      }
  
-     //===================================================================
- 
      /*
!      * ==================== NET_Init ====================
       */
      public static void Init() {
!         //empty
      }
  
      /*
!      * ==================== NET_Socket ====================
       */
      public static DatagramSocket Socket(int sock, String ip, int port) {
--- 315,327 ----
      }
  
      /*
!      * Init
       */
      public static void Init() {
!         // nothing to do
      }
  
      /*
!      * Socket
       */
      public static DatagramSocket Socket(int sock, String ip, int port) {
***************
*** 330,334 ****
  
      /*
!      * ==================== NET_Shutdown ====================
       */
      public static void Shutdown() {
--- 358,362 ----
  
      /*
!      * Shutdown
       */
      public static void Shutdown() {