Refactored previous changes.

Author: RoliSoft

BannerProcessor.cpp

@@ -2,6 +2,18 @@
 
 using namespace std;
 
+void BannerProcessor::Scan(Service* service)
+{
+	if (service->banner == nullptr)
+	{
+		return;
+	}
+
+	auto matches = Scan(string(service->banner, service->banlen));
+
+	service->cpe.insert(service->cpe.end(), matches.begin(), matches.end());
+}
+
 BannerProcessor::~BannerProcessor()
 {
 }

BannerProcessor.h

@@ -14,7 +14,16 @@ class BannerProcessor
 	 * 
 	 * \param service Scanned service.
 	 */
-	virtual void Scan(Service* service) = 0;
+	void Scan(Service* service);
+	
+	/*!
+	 * Processes the specified service banner.
+	 * 
+	 * \param banner Service banner.
+	 * 
+	 * \return Matching CPE entries.
+	 */
+	virtual std::vector<std::string> Scan(const std::string& banner) = 0;
 
 	/*!
 	 * Frees up the resources allocated during the lifetime of this instance.

CpeDictionaryMatcher.cpp

@@ -8,18 +8,6 @@ using namespace boost;
 vector<struct CpeEntry*> CpeDictionaryMatcher::entries = vector<struct CpeEntry*>();
 unordered_map<string, vector<string>*> CpeDictionaryMatcher::aliases = unordered_map<string, vector<string>*>();
 
-void CpeDictionaryMatcher::Scan(Service* service)
-{
-	if (service->banner == nullptr)
-	{
-		return;
-	}
-
-	auto matches = Scan(string(service->banner, service->banlen));
-
-	service->cpe.insert(service->cpe.end(), matches.begin(), matches.end());
-}
-
 vector<string> CpeDictionaryMatcher::Scan(const string& banner)
 {
 	if (entries.size() == 0)

CpeDictionaryMatcher.h

@@ -58,21 +58,14 @@ class CpeDictionaryMatcher : public BannerProcessor
 {
 public:
 
-	/*!
-	 * Processes the banner of a service.
-	 * 
-	 * \param service Scanned service.
-	 */
-	void Scan(Service* service) override;
-	
 	/*!
 	 * Processes the specified service banner.
 	 * 
 	 * \param banner Service banner.
 	 * 
 	 * \return Matching CPE entries.
 	 */
-	std::vector<std::string> Scan(const std::string& banner);
+	std::vector<std::string> Scan(const std::string& banner) override;
 
 	/*!
 	 * Gets the CPE entries.

ServiceRegexMatcher.cpp

@@ -7,18 +7,6 @@ using namespace boost;
 
 vector<struct ServiceRegex*> ServiceRegexMatcher::regexes = vector<struct ServiceRegex*>();
 
-void ServiceRegexMatcher::Scan(Service* service)
-{
-	if (service->banner == nullptr)
-	{
-		return;
-	}
-
-	auto matches = Scan(string(service->banner, service->banlen));
-
-	service->cpe.insert(service->cpe.end(), matches.begin(), matches.end());
-}
-
 vector<string> ServiceRegexMatcher::Scan(const string& banner)
 {
 	if (regexes.size() == 0)

ServiceRegexMatcher.h

@@ -39,21 +39,14 @@ class ServiceRegexMatcher : public BannerProcessor
 {
 public:
 
-	/*!
-	 * Processes the banner of a service.
-	 * 
-	 * \param service Scanned service.
-	 */
-	void Scan(Service* service) override;
-	
 	/*!
 	 * Processes the specified service banner.
 	 * 
 	 * \param banner Service banner.
 	 * 
 	 * \return Matching CPE entries.
 	 */
-	std::vector<std::string> Scan(const std::string& banner);
+	std::vector<std::string> Scan(const std::string& banner) override;
 
 	/*!
 	 * Gets the regular expressions.