Index: CvsProxyWin32.cpp =================================================================== RCS file: /scotty/cvsproxy/CvsProxyWin32.cpp,v retrieving revision 1.10 diff -c -r1.10 CvsProxyWin32.cpp *** CvsProxyWin32.cpp 5 Jun 2012 06:46:43 -0000 1.10 --- CvsProxyWin32.cpp 22 Jun 2012 05:25:24 -0000 *************** *** 248,254 **** --- 248,258 ---- printf("Invalid license key\n"); return -1; } + #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) if((lic.type!=licTrial)&&(lic.type!=licUnlimited)&&(lic.type!=licISV)&&(lic.type!=licMulti)) + #else + if((lic.type!=licTrial)&&(lic.type!=licFull)) + #endif { /* This *should* be caught in CheckLicense, but just in case it slips through.. */ printf("Invalid license type\n"); Index: CvsManager.cpp =================================================================== RCS file: /scotty/cvsmanager/CvsManager.cpp,v retrieving revision 1.71 diff -c -r1.71 CvsManager.cpp *** CvsManager.cpp 7 Jun 2012 07:26:24 -0000 1.71 --- CvsManager.cpp 22 Jun 2012 05:48:59 -0000 *************** *** 46,51 **** --- 46,55 ---- #include #endif + #if !((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) + #define hwinfo_t void + #endif + int g_daysLeft; bool g_bTestMode; bool g_bStop; *************** *** 968,981 **** --- 972,991 ---- { CSocketIO& cvs = *pcvs; CSocketIO& proxy = *pproxy; + #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) hwinfo_t& hwinfo = *phwinfo; + #endif License_t license; #ifdef _WIN32 DWORD lasterr; LPVOID errbuf; #endif + #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) if(!CheckLicense(license,hwinfo)) + #else + if(!CheckLicense(license)) + #endif { if(g_bTestMode) printf("Startup CVS Thread failed - %s license\n",license.type==licExpired?"Expired":"Bad"); *************** *** 1022,1027 **** --- 1032,1038 ---- #endif } } + #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) else if((license.type==licMulti)&&(license.activateId==0)) { if (license.daysLeft<0) *************** *** 1052,1061 **** --- 1063,1076 ---- } } else if((license.type==licUnlimited)||(license.type==licMulti)||(license.type==licISV)) + #else + else if(license.type==licFull) + #endif { #ifdef _WIN32 CGlobalSettings::SetGlobalValue("cvsnt","License","NumberLicenses",license.maxUsers); CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseName",license.company.c_str()); + #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseEmail",license.email.c_str()); CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseRspLine",license.rspline.c_str()); //CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseCPU",license.cpuline.c_str()); *************** *** 1080,1089 **** --- 1095,1106 ---- //CGlobalSettings::SetGlobalValue("cvsnt","License","OSVER",license.osVerId); //CGlobalSettings::SetGlobalValue("cvsnt","License","IDDSIG",license.iddSigId); #endif + #endif if(g_bTestMode) { switch (license.type) { + #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) case licUnlimited: printf("Full version -- unlimited\n"); break; *************** *** 1093,1098 **** --- 1110,1120 ---- case licISV: printf("Full version -- ISV\n"); break; + #else + case licFull: + printf("Full version -- unlimited\n"); + break; + #endif default: printf("Full version -- unknown\n"); } *************** *** 1151,1156 **** --- 1173,1179 ---- rf.addArg(tmp.c_str()); } } + #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) if (1) // this must ALWAYS come before RSP_LINE { rf.addArg("+"); *************** *** 1178,1183 **** --- 1201,1207 ---- rf.addArg("+"); rf.addArg(license.rspline.c_str()); } + #endif time_t rft = time(NULL); if(!rf.run(NULL,false,true)) { *************** *** 1397,1403 **** --- 1421,1429 ---- static void _license_thread_proc(int daysleft, hwinfo_t *phwinfo) { + #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) hwinfo_t& hwinfo = *phwinfo; + #endif License_t license; int lastCheck = getTickCount()/1000; #ifdef _WIN32 *************** *** 1413,1421 **** --- 1439,1455 ---- // GlobalFindAtom is win32 specific if(timeSinceLastCheck>=licenseCheckTime*60) { + #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) if(CheckLicense(license,hwinfo)) + #else + if(CheckLicense(license)) + #endif { + #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) if((license.type==licTrial)||(license.type==licMulti && license.activateId==0)) + #else + if(license.type==licTrial) + #endif { #ifdef _WIN32 if(license.type==licTrial) *************** *** 1486,1491 **** --- 1520,1526 ---- int run_server() { + #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) #ifdef _WIN32 BSTR hwcpuname; unsigned int hwiddsig; *************** *** 1493,1498 **** --- 1528,1534 ---- unsigned int swosver; #endif hwinfo_t hwinfo; + #endif CSocketIO cvs_sock, proxy_sock; int cvs_port_num; int cvs_port_num_mgr; *************** *** 1515,1521 **** srand((unsigned int)global_session_time_t); ! #ifdef _WIN32 if (get_hw_info(hwcpuname, hwiddsig, swosver, hwspeed) == 0) { hwinfo.osVerId=swosver; --- 1551,1557 ---- srand((unsigned int)global_session_time_t); ! #if (defined (_WIN32) && (CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) if (get_hw_info(hwcpuname, hwiddsig, swosver, hwspeed) == 0) { hwinfo.osVerId=swosver; *************** *** 1527,1533 **** --- 1563,1573 ---- char *errmsg=(char *)malloc(sizeof(char)*32764); *errmsg='\0'; + #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) if(!CheckLicense(license,hwinfo,errmsg)) + #else + if(!CheckLicense(license,errmsg)) + #endif { if(g_bTestMode) { *************** *** 1547,1553 **** --- 1587,1597 ---- } free(errmsg); errmsg=NULL; + #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) if((license.type==licTrial)||(license.type==licMulti && license.activateId==0)) + #else + if(license.type==licTrial) + #endif { #ifdef _WIN32 CGlobalSettings::SetGlobalValue("cvsnt","License","LicMsg1","Your trial edition of CVS Suite %s will expire in %d days"); *************** *** 1574,1580 **** --- 1618,1628 ---- return -1; } } + #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) else if((license.type==licUnlimited)||(license.type==licMulti)||(license.type==licISV)) + #else + else if(license.type==licFull) + #endif { #ifdef _WIN32 CGlobalSettings::SetGlobalValue("cvsnt","License","LicMsg1","Your CVS Suite %s must be activated in the next %d days"); *************** *** 1583,1594 **** --- 1631,1645 ---- #endif CGlobalSettings::SetGlobalValue("cvsnt","License","NumberLicenses",license.maxUsers); CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseName",license.company.c_str()); + #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseEmail",license.email.c_str()); CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseRspLine",license.rspline.c_str()); + #endif if(g_bTestMode) { switch (license.type) { + #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) case licUnlimited: printf("Full version -- unlimited\n"); break; *************** *** 1598,1603 **** --- 1649,1659 ---- case licISV: printf("Full version -- ISV\n"); break; + #else + case licFull: + printf("Full version -- unlimited\n"); + break; + #endif default: printf("Full version -- unknown\n"); } *************** *** 1687,1693 **** --- 1743,1753 ---- if (cvs_port_num_mgr==0) cvs_port_num_mgr=2401; cvs_port_num=cvs_port_num_mgr; + #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) if((license.type==licUnlimited)||(license.type==licMulti)||(license.type==licISV)) + #else + if(license.type==licFull) + #endif CGlobalSettings::SetGlobalValue("cvsnt","PServer","PServerPort",cvs_port_num); } *************** *** 1875,1885 **** --- 1935,1953 ---- #endif #ifdef _WIN32 + #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) if((license.type==licTrial)||(license.type==licMulti && license.activateId==0)) + #else + if(license.type==licTrial) + #endif { if(g_bTestMode) printf("Start license check thread\n"); + #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) start_license_thread(license.daysLeft,&hwinfo); + #else + start_license_thread(license.daysLeft,NULL); + #endif } else { *************** *** 1893,1899 **** --- 1961,1971 ---- g_running_servers = 0; for(int n=0; n4135)) start_cvs_thread(&cvs_sock,&proxy_sock,&hwinfo); + #else + start_cvs_thread(&cvs_sock,&proxy_sock,NULL); + #endif cvs::sleep(2000); // Give servers time to start up *************** *** 1939,1945 **** --- 2011,2021 ---- { // If any servers have quit, replace them. This doesn't need to be too exact, provided we just don't run out of them for(int n=g_running_servers; n4135)) start_cvs_thread(&cvs_sock, &proxy_sock, &hwinfo); + #else + start_cvs_thread(&cvs_sock, &proxy_sock, NULL); + #endif cvs::sleep(1000); } Index: CvsMgrService.cpp =================================================================== RCS file: /scotty/cvsmanager/CvsMgrService.cpp,v retrieving revision 1.29 diff -c -r1.29 CvsMgrService.cpp *** CvsMgrService.cpp 11 Jun 2012 04:00:11 -0000 1.29 --- CvsMgrService.cpp 22 Jun 2012 06:22:27 -0000 *************** *** 183,188 **** --- 183,189 ---- lic.maxUsers2 = TRIAL_MAXUSERS2; lic.osType = licAny; + #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) lic.type = licISV; lic.rspline = "SuiteClient2010"; GenerateLicense(lic, licString); *************** *** 197,208 **** --- 198,211 ---- lic.bugLicense=-1; lic.makeLicense=-1; lic.syncLicense=-1; + #endif lic.osType=licWindows; lic.type = licTrial; GenerateLicense(lic, licString); printf("Trial Windows %s\n",licString.c_str()); + #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) lic.type = licMulti; lic.maxUsers = 1; GenerateLicense(lic, licString); *************** *** 218,224 **** --- 221,233 ---- lic.type = licUnlimited; GenerateLicense(lic, licString); printf("Unlimited Windows %s\n",licString.c_str()); + #else + lic.type = licFull; + GenerateLicense(lic, licString); + printf("Unlimited Windows %s\n",licString.c_str()); + #endif + #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) lic.osType=licMacOSX; lic.type = licTrial; *************** *** 244,255 **** --- 253,266 ---- lic.type = licUnlimited; GenerateLicense(lic, licString); printf("Unlimited HPUX/Solaris/Tru64 %s\n",licString.c_str()); + #endif lic.osType=licUnix; lic.type = licTrial; GenerateLicense(lic, licString); printf("Trial Linux %s\n",licString.c_str()); + #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) lic.type = licMulti; lic.maxUsers = TRIAL_MAXUSERS1; GenerateLicense(lic, licString); *************** *** 257,262 **** --- 268,278 ---- lic.type = licUnlimited; GenerateLicense(lic, licString); printf("Unlimited Linux %s\n",licString.c_str()); + #else + lic.type = licFull; + GenerateLicense(lic, licString); + printf("Unlimited Linux %s\n",licString.c_str()); + #endif lic.osType = licAny; lic.type = licTrial; *************** *** 312,319 **** --- 328,339 ---- char *errmsg=(char *)malloc(sizeof(char)*32764); *errmsg='\0'; + #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) hwinfo_t hwinfo; if(!CheckLicense(license,hwinfo,errmsg)) + #else + if(!CheckLicense(license,errmsg)) + #endif { if (errmsg) printf("%s\n",errmsg); printf("Startup failed - %s license\n",license.type==licExpired?"Expired":"Bad"); *************** *** 365,374 **** --- 385,399 ---- { printf("Evaluation\n"); } + #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) else if(license.type==licUnlimited) + #else + else if(license.type==licFull) + #endif { printf("Unlimited\n"); } + #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) else if(license.type==licISV) { printf("ISV\n"); *************** *** 377,382 **** --- 402,408 ---- { printf("Per user\n"); } + #endif else { /* This *should* be caught in CheckLicense, but just in case it slips through.. */ *************** *** 390,403 **** --- 416,432 ---- printf("License days until renewal: %d\n",license.daysLeft); if(license.maxUsers) printf("Licensed users: %d\n",license.maxUsers); + #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) if(license.rspline.size()) printf("Licensed ISV client: %s\n",license.rspline.c_str()); if(license.email.size()) printf("Licensed email: %s\n",license.email.c_str()); + #endif if(license.user.size()) printf("Licensed owner: %s\n",license.user.c_str()); if(license.company.size()) printf("Licensed company: %s\n",license.company.c_str()); + #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==02) && (CVSNT_PRODUCT_BUILD>4135)) if(license.customerId!=0) printf("Licensed customer id: %d\n",license.customerId); if(license.vendorId!=0) *************** *** 406,411 **** --- 435,441 ---- printf("Licensed integration: defect tracking: %s\n",(license.bugLicense)?"yes":"no"); printf("Licensed integration: build: %s\n",(license.makeLicense)?"yes":"no"); printf("Licensed integration: multi-site sync: %s\n",(license.syncLicense)?"yes":"no"); + #endif if(errmsg!=NULL) if (*errmsg!='\0') { printf("Licensed version: %s\n",CVSNT_PRODUCTVERSION_SHORT);