ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/Windows/router/router.cpp
(Generate patch)

Comparing BasiliskII/src/Windows/router/router.cpp (file contents):
Revision 1.1 by gbeauche, 2004-12-05T16:48:36Z vs.
Revision 1.3 by gbeauche, 2008-01-01T09:40:34Z

# Line 1 | Line 1
1   /*
2   *  router.cpp - ip router
3   *
4 < *  Basilisk II (C) 1997-2001 Christian Bauer
4 > *  Basilisk II (C) 1997-2008 Christian Bauer
5   *
6   *  Windows platform specific code copyright (C) Lauri Pesonen
7   *
# Line 62 | Line 62 | uint32 macos_ip_address = 0;
62   const uint8 router_mac_addr[6] = { '4', '2', '6', '7', '7', '9' };
63   uint32 router_ip_address = 0;
64   bool raw_sockets_available = false;
65 – bool m_router_enabled = true;
65  
66  
67  
# Line 157 | Line 156 | static WINAPI unsigned int router_expire
156          return 0;
157   }
158  
159 < void router_init(void)
159 > bool router_init(void)
160   {
161          InitializeCriticalSection( &router_section );
162  
163 <        m_router_enabled = PrefsFindBool("routerenabled");
165 <        
166 <        if(m_router_enabled && dynsockets_init()) {
163 >        if(dynsockets_init()) {
164                  char me[128];
165                  if( _gethostname(me, sizeof(me)) == SOCKET_ERROR ) {
166                          D(bug("gethostname() failed, error = %d\r\n", _WSAGetLastError()));
# Line 183 | Line 180 | void router_init(void)
180                  init_tcp();
181                  init_udp();
182                  init_ftp();
183 <        } else {
187 <                m_router_enabled = false;
183 >                return true;
184          }
185 +
186 +        return false;
187   }
188  
189   void router_final(void)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines