*** ./nepenthes-core/src/DownloadManager.cpp 2006-11-13 20:40:02.000000000 +0100 --- ./nepenthes-core/src/DownloadManager.cpp 2006-12-05 22:53:43.000000000 +0100 *************** *** 24,30 **** * contact nepenthesdev@users.sourceforge.net * *******************************************************************************/ ! /* $Id: DownloadManager.cpp 505 2006-04-09 16:39:36Z oxff $ */ #include --- 24,30 ---- * contact nepenthesdev@users.sourceforge.net * *******************************************************************************/ ! /* Malformed URL port patch by grospolina.org 12022006 */ /* $Id: DownloadManager.cpp 505 2006-04-09 16:39:36Z oxff $ */ #include *************** bool DownloadManager::downloadUrl(Downlo *** 300,312 **** // this is an event SubmitEvent se(EV_DOWNLOAD,down); g_Nepenthes->getEventMgr()->handleEvent(&se); ! ! if (down->getDownloadUrl()->getPort() <= 0 || down->getDownloadUrl()->getPort() > 65536) ! { ! logWarn("malformed url 0getUrl().c_str()); ! delete down; ! return false; ! } uint32_t ulAddress = inet_addr(down->getDownloadUrl()->getHost().c_str()); --- 300,322 ---- // this is an event SubmitEvent se(EV_DOWNLOAD,down); g_Nepenthes->getEventMgr()->handleEvent(&se); ! bool malport = false; ! // if (down->getDownloadUrl()->getPort() <= 0 || down->getDownloadUrl()->getPort() > 65536) ! if (down->getDownloadUrl()->getPort() <= 0) ! { ! logWarn("malformed url 0getUrl().c_str()); ! delete down; ! return false; ! } ! if (down->getDownloadUrl()->getPort() > 65536) ! { ! logWarn("malformed url port>65536 we should replace it , %s \n",down->getUrl().c_str()); ! int umal_port=(down->getDownloadUrl()->getPort()%65536); ! logWarn("calculated port: %d \n",umal_port); ! down->getDownloadUrl()->setPort((umal_port)); ! malport = true; ! // logWarn("replaced malformed port:, %s \n",down->getUrl().c_str()); ! } uint32_t ulAddress = inet_addr(down->getDownloadUrl()->getHost().c_str()); *************** bool DownloadManager::downloadUrl(Downlo *** 332,338 **** }else { ! if (ulAddress == 0) // replace 0.0.0.0 { bReplaceHost = true; } --- 342,348 ---- }else { ! if ((ulAddress == 0)||(malport == true)) // replace 0.0.0.0 or malport { bReplaceHost = true; }