[Jake2-commits] jake2/src/jake2/server SV_MAIN.java,1.8,1.9

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

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

Modified Files:
	SV_MAIN.java 
Log Message:
NET methods refactored (name cleanup)

Index: SV_MAIN.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/server/SV_MAIN.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** SV_MAIN.java	22 Sep 2004 19:22:12 -0000	1.8
--- SV_MAIN.java	17 Oct 2004 21:31:32 -0000	1.9
***************
*** 258,262 ****
          // see if we already have a challenge for this ip
          for (i = 0; i < Defines.MAX_CHALLENGES; i++) {
!             if (NET.NET_CompareBaseAdr(Globals.net_from,
                      SV_INIT.svs.challenges[i].adr))
                  break;
--- 258,262 ----
          // see if we already have a challenge for this ip
          for (i = 0; i < Defines.MAX_CHALLENGES; i++) {
!             if (NET.CompareBaseAdr(Globals.net_from,
                      SV_INIT.svs.challenges[i].adr))
                  break;
***************
*** 331,335 ****
          if (!NET.IsLocalAddress(adr)) {
              for (i = 0; i < Defines.MAX_CHALLENGES; i++) {
!                 if (NET.NET_CompareBaseAdr(Globals.net_from,
                          SV_INIT.svs.challenges[i].adr)) {
                      if (challenge == SV_INIT.svs.challenges[i].challenge)
--- 331,335 ----
          if (!NET.IsLocalAddress(adr)) {
              for (i = 0; i < Defines.MAX_CHALLENGES; i++) {
!                 if (NET.CompareBaseAdr(Globals.net_from,
                          SV_INIT.svs.challenges[i].adr)) {
                      if (challenge == SV_INIT.svs.challenges[i].challenge)
***************
*** 353,357 ****
              if (cl.state == Defines.cs_free)
                  continue;
!             if (NET.NET_CompareBaseAdr(adr, cl.netchan.remote_address)
                      && (cl.netchan.qport == qport || adr.port == cl.netchan.remote_address.port)) {
                  if (!NET.IsLocalAddress(adr)
--- 353,357 ----
              if (cl.state == Defines.cs_free)
                  continue;
!             if (NET.CompareBaseAdr(adr, cl.netchan.remote_address)
                      && (cl.netchan.qport == qport || adr.port == cl.netchan.remote_address.port)) {
                  if (!NET.IsLocalAddress(adr)
***************
*** 628,632 ****
                  if (cl.state == Defines.cs_free)
                      continue;
!                 if (!NET.NET_CompareBaseAdr(Globals.net_from,
                          cl.netchan.remote_address))
                      continue;
--- 628,632 ----
                  if (cl.state == Defines.cs_free)
                      continue;
!                 if (!NET.CompareBaseAdr(Globals.net_from,
                          cl.netchan.remote_address))
                      continue;
***************
*** 777,781 ****
                  SV_INIT.svs.realtime = SV_INIT.sv.time - 100;
              }
!             NET.NET_Sleep(SV_INIT.sv.time - SV_INIT.svs.realtime);
              return;
          }
--- 777,781 ----
                  SV_INIT.svs.realtime = SV_INIT.sv.time - 100;
              }
!             NET.Sleep(SV_INIT.sv.time - SV_INIT.svs.realtime);
              return;
          }