Index: cvsapi/win32/SocketIO.cpp =================================================================== RCS file: /cvs/cvsnt/cvsapi/win32/SocketIO.cpp,v retrieving revision 1.1.2.14.4.9.2.23 diff -c -r1.1.2.14.4.9.2.23 SocketIO.cpp *** cvsapi/win32/SocketIO.cpp 18 Nov 2011 05:47:56 -0000 1.1.2.14.4.9.2.23 --- cvsapi/win32/SocketIO.cpp 20 May 2012 22:43:12 -0000 *************** *** 899,904 **** --- 899,905 ---- CServerIo::trace( 3, "Socket bind failed: errno %d on socket %d (AF %d)", errno, m_sockets[n], addr->ai_family); closesocket(m_sockets[n]); m_sockets[n]=-1; + // or should we just continue to the next socket? return false; } } Index: lockservice/lockservice.cpp =================================================================== RCS file: /cvs/cvsnt/lockservice/lockservice.cpp,v retrieving revision 1.5.2.25.4.4.2.2 diff -c -r1.5.2.25.4.4.2.2 lockservice.cpp *** lockservice/lockservice.cpp 20 Feb 2012 01:00:27 -0000 1.5.2.25.4.4.2.2 --- lockservice/lockservice.cpp 20 May 2012 23:17:08 -0000 *************** *** 3309,3314 **** --- 3309,3315 ---- CServerIo::loglevel(99); } CServerIo::init(lock_output,lock_outerr,lock_outerr,systray_trace); + CServerIo::trace(3,"CVSLOCK trace started."); if(argc==1) { *************** *** 3534,3539 **** --- 3535,3543 ---- DWORD dwTmp,dwType; char szTmp[1024]; + if(dwArgc<997) + server_active = 1; + CServerIo::trace(3,"CVSLOCK ServiceMain"); HANDLE hSem = CreateSemaphore(NULL,0,1,"CVSNT_Lockserver"); *************** *** 3544,3550 **** g_hService=NULL; if(dwArgc<997) { - server_active = 1; CServerIo::trace(3,"CVSLOCK ServiceMain RegisterServiceCtrlHandler"); if (!(g_hService = RegisterServiceCtrlHandler(SERVICE_NAME,ServiceHandler))) { --- 3548,3553 ---- Index: lockservice/server.cpp =================================================================== RCS file: /cvs/cvsnt/lockservice/server.cpp,v retrieving revision 1.6.2.48.6.13 diff -c -r1.6.2.48.6.13 server.cpp *** lockservice/server.cpp 24 Mar 2010 14:36:50 -0000 1.6.2.48.6.13 --- lockservice/server.cpp 20 May 2012 22:43:12 -0000 *************** *** 108,113 **** --- 108,114 ---- int run_server(int port, int seq, int local_only) { + cvs::string errline; CSocketIO listen_sock; char szLockServer[64]; *************** *** 130,135 **** --- 131,137 ---- { printf("Initialising socket...\n"); } + CServerIo::trace(3,"Initialising socket..."); #if defined( __HP_aCC ) && defined ( __ia64 ) local_only = true; // Don't know why this is needed - hpux doesn't support listening on ports??? if(!listen_sock.create("127.0.0.1",szLockServer,local_only?true:false,true,,wrwait,wswait)) *************** *** 137,145 **** if(!listen_sock.create(NULL,szLockServer,local_only?true:false,true,wrwait,wswait)) #endif { if(g_bTestMode) { ! printf("Couldn't create listening socket... %s\n",listen_sock.error()); #if defined( __HP_aCC ) printf("HP: Try and listen on 127.0.0.1 instead\n"); #endif --- 139,148 ---- if(!listen_sock.create(NULL,szLockServer,local_only?true:false,true,wrwait,wswait)) #endif { + errline=listen_sock.error(); if(g_bTestMode) { ! printf("Couldn't create listening socket... %s\n",errline.c_str()); #if defined( __HP_aCC ) printf("HP: Try and listen on 127.0.0.1 instead\n"); #endif *************** *** 148,156 **** CServerIo::log(CServerIo::logError,"HP: Try and listen on 127.0.0.1 instead"); if(!listen_sock.create("127.0.0.1",szLockServer,local_only?true:false,true,wrwait,wswait)) { ! printf("Couldn't create listening socket there either... %s\n",listen_sock.error()); #endif ! CServerIo::log(CServerIo::logError,"Failed to create listening socket: %s",listen_sock.error()); return -1; #if defined( __HP_aCC ) } --- 151,161 ---- CServerIo::log(CServerIo::logError,"HP: Try and listen on 127.0.0.1 instead"); if(!listen_sock.create("127.0.0.1",szLockServer,local_only?true:false,true,wrwait,wswait)) { ! errline=listen_sock.error(); ! printf("Couldn't create listening socket there either... %s\n",errline.c_str()); #endif ! CServerIo::log(CServerIo::logError,"Failed to create listening socket (%s): %s",szLockServer,errline.c_str()); ! CServerIo::trace(3,"Failed to create listening socket (%s): %s",szLockServer,errline.c_str()); return -1; #if defined( __HP_aCC ) } *************** *** 164,175 **** if(g_bTestMode) printf("Starting lock server on port %d/tcp...\n",m_port); if(!listen_sock.bind()) { if(g_bTestMode) printf("Couldn't bind listening socket... %s\n",listen_sock.error()); ! CServerIo::log(CServerIo::logError,"Failed to bind listening socket: %s",listen_sock.error()); #ifdef _WIN32 if(!g_bTestMode) NotifySCM(SERVICE_STOPPED,0,1); --- 169,183 ---- if(g_bTestMode) printf("Starting lock server on port %d/tcp...\n",m_port); + CServerIo::trace(3,"Starting lock server on port %d/tcp...",m_port); if(!listen_sock.bind()) { + errline=listen_sock.error(); if(g_bTestMode) printf("Couldn't bind listening socket... %s\n",listen_sock.error()); ! CServerIo::log(CServerIo::logError,"Failed to bind listening socket (%s): %s",szLockServer,errline.c_str()); ! CServerIo::trace(3,"Failed to bind listening socket (%s): %s",szLockServer,errline.c_str()); #ifdef _WIN32 if(!g_bTestMode) NotifySCM(SERVICE_STOPPED,0,1); *************** *** 188,193 **** --- 196,202 ---- // Process running, wait for closedown CServerIo::log(CServerIo::logNotice,"CVS Lock service initialised successfully"); + CServerIo::trace(3,"CVS Lock service initialised successfully"); #ifdef _WIN32 if(!g_bTestMode) NotifySCM(SERVICE_RUNNING, 0, 0); Index: simcvs/res/simcpl.manifest =================================================================== RCS file: /cvs/cvsnt/simcvs/res/simcpl.manifest,v retrieving revision 1.1.4.1.2.1 diff -c -r1.1.4.1.2.1 simcpl.manifest *** simcvs/res/simcpl.manifest 3 Mar 2011 12:30:16 -0000 1.1.4.1.2.1 --- simcvs/res/simcpl.manifest 20 May 2012 23:33:33 -0000 *************** *** 2,8 **** CVSNT Control Panel (Simple) --- 2,8 ---- CVSNT Control Panel (Simple)